* Re: [PATCH] connector: add module alias
From: Evgeniy Polyakov @ 2010-12-10 20:44 UTC (permalink / raw)
To: David Miller; +Cc: shemminger, netdev
In-Reply-To: <20101210.122813.229758283.davem@davemloft.net>
On Fri, Dec 10, 2010 at 12:28:13PM -0800, David Miller (davem@davemloft.net) wrote:
> >> Since connector can be built as a module and uses netlink socket
> >> to communicate. The module should have an alias to autoload when socket
> >> of NETLINK_CONNECTOR type is requested.
> >
> > Ack, thank you.
>
> Please use formalized "Acked-by: " tags so that the automated tools do
> all the work for me and I don't have to type it in by hand.
Will do, thanks.
--
Evgeniy Polyakov
^ permalink raw reply
* Re: [PATCH 1/2] via-velocity: set sleep speed to 10Mbps for powersaving.
From: David Miller @ 2010-12-10 20:47 UTC (permalink / raw)
To: romieu; +Cc: netdev, DavidLv, ShirleyHu, AndersMa
In-Reply-To: <20101209092656.GA4064@electric-eye.fr.zoreil.com>
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Thu, 9 Dec 2010 10:26:56 +0100
> Signed-off-by: David Lv <DavidLv@viatech.com.cn>
> Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Please, no new module parameters that only have obscure meanings
on specific device types.
This is terrible for users.
I'm not applying these two patches, sorry.
I know it already has the 1000M one, and if I was handling driver patches
directly when that got in I apologize for not catching it, it's wrong too.
There is nothing that prevents adding ethtool facilities for this issue.
In fact looking at the via velocity driver options, many of them
completely duplicate existing ethtool mechanisms. It's beyond a mess.
So I'm putting the line in the sand and will not allow new such options
to be added, sorry.
^ permalink raw reply
* Re: [PATCH] ipv6: fix nl group when advertising a new link
From: David Miller @ 2010-12-10 20:49 UTC (permalink / raw)
To: tgraf; +Cc: nicolas.dichtel, netdev
In-Reply-To: <20101208100454.GA7638@canuck.infradead.org>
From: Thomas Graf <tgraf@infradead.org>
Date: Wed, 8 Dec 2010 05:04:54 -0500
> On Wed, Dec 08, 2010 at 10:38:31AM +0100, Nicolas Dichtel wrote:
>> >From d2ed52e7fcb639470c89045f7b0ce31eb681896a Mon Sep 17 00:00:00 2001
>> From: Wang Xuefu <xuefu.wang@6wind.com>
>> Date: Wed, 8 Dec 2010 10:24:48 +0100
>> Subject: [PATCH] ipv6: fix nl group when advertising a new link
>>
>> New idev are advertised with NL group RTNLGRP_IPV6_IFADDR, but
>> should use RTNLGRP_IPV6_IFINFO.
>> Bug was introduced by commit 8d7a76c9.
>>
>> Signed-off-by: Wang Xuefu <xuefu.wang@6wind.com>
>> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
>
> Acked-by: Thomas Graf <tgraf@infradead.org>
Applied to net-2.6, thanks.
^ permalink raw reply
* Re: pull request: wireless-2.6 2010-12-10
From: David Miller @ 2010-12-10 20:52 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, netdev, linux-kernel
In-Reply-To: <20101210202902.GG4296@tuxdriver.com>
From: "John W. Linville" <linville@tuxdriver.com>
Date: Fri, 10 Dec 2010 15:29:03 -0500
> Here is the latest round of wireless bits intended for 2.6.37...
>
> Included are some orinoco fixes, one to avoid the crash in bug 23932 and
> two others that render TKIP countermeasures ineffective (i.e. decreased
> security). Helmut has provided us a fix to avoid a BUG when using
> shared skbs. The ath9k team gives us a fix for failed resumes on
> ath9k_htc, a fix for detecting broadcast frames with a MIC failure, a
> fix for a null pointer access when generating beacons, and a DMA issue
> that can lead to memory corruption. Matteo Croce pitches-in with a fix
> to prevent transmitting with too much power. Finally, Javier Cardona
> provides a trio of ath5k fixes that restore mesh function on those
> devices.
>
> Please let me know if there are problems!
Pulled, thanks John.
^ permalink raw reply
* Re: [PATCH] Sysctl interface to UNIX_INFLIGHT_TRIGGER_GC v.3
From: David Miller @ 2010-12-10 20:56 UTC (permalink / raw)
To: eric.dumazet; +Cc: pavel, shanwei, netdev
In-Reply-To: <1291986273.3580.16.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 10 Dec 2010 14:04:33 +0100
> Le vendredi 10 décembre 2010 à 15:48 +0300, Pavel Vasilyev a écrit :
>> On 10.12.2010 06:45, Shan Wei wrote:
>> > Pavel Vasilyev wrote, at 12/10/2010 01:26 AM:
>> >> Sysctl interface to UNIX_INFLIGHT_TRIGGER_GC.
>> >> IMHO convenient for testing.
>> >>
>> >> +inflight_trigger_gc - INTEGER
>> >> + The maximal number of inflight sockets for force garbage collect.
>> >> +
>> >> + Default: 16000
>> >
>> > 1) For lower payload and enough memory, it's not necessary to force garbage collection.
>> > So set it to 0, disable gc.
>>
>>
>> May be, set default to 2000, and zero to disable
>>
>
> zero to disable ?
>
> Maybe you missed commit 9915672d41273f5b77 intent.
>
> If you have no limit (like old kernels), you can freeze your machine,
> even if it has terabytes of ram, running a single program, even as a non
> root user.
>
> When we discussed about the fix, we said a limit was needed, obviously.
>
> Now you'll have to prove we need to make it a sysctl (yet
> another /proc/sys/net parameter, yet another documentation to add...)
>
> Even changing default from 16000 to 2000 must be for a valid reason (a
> real use case)
I don't want to add this sysctl. Exactly because there is no reason
to believe that the current value could even need to be changed by
anyone.
Once a demonstratable need can be proven and shown beyond a shadow
of a doubt, we can consider adding the sysctl.
We have too many damn sysctls as-is.
^ permalink raw reply
* Re: [PATCH v2] bridge: Fix return values of br_multicast_add_group/br_multicast_new_group
From: David Miller @ 2010-12-10 21:01 UTC (permalink / raw)
To: tklauser; +Cc: shemminger, bridge, netdev
In-Reply-To: <1291987084-27302-1-git-send-email-tklauser@distanz.ch>
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 10 Dec 2010 14:18:04 +0100
> If br_multicast_new_group returns NULL, we would return 0 (no error) to
> the caller of br_multicast_add_group, which is not what we want. Instead
> br_multicast_new_group should return ERR_PTR(-ENOMEM) in this case.
> Also propagate the error number returned by br_mdb_rehash properly.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Looks good, applied to net-next-2.6
Please in the future make is clear, in your subject line, which
tree this patch is meant for.
I had to figure it out by trial and error, because this patch
does not apply properly to net-2.6
^ permalink raw reply
* Re: PCI: make pci_restore_state return void
From: Jesse Barnes @ 2010-12-10 21:07 UTC (permalink / raw)
To: Jon Mason
Cc: linux-pci, Jonathan Corbet, linux-media, Andrew Gallatin,
Brice Goglin, netdev, Solarflare linux maintainers, Steve Hodgson,
Ben Hutchings, Stephen Hemminger, Ivo van Doorn,
Gertjan van Wingerde, linux-wireless, Brian King,
Anil Ravindranath, linux-scsi, Jaya Kumar, boyod.yang
In-Reply-To: <1291160606-31494-1-git-send-email-jon.mason@exar.com>
On Tue, 30 Nov 2010 17:43:26 -0600
Jon Mason <jon.mason@exar.com> wrote:
> pci_restore_state only ever returns 0, thus there is no benefit in
> having it return any value. Also, a large majority of the callers do
> not check the return code of pci_restore_state. Make the
> pci_restore_state a void return and avoid the overhead.
>
> Signed-off-by: Jon Mason <jon.mason@exar.com>
> ---
Applied to linux-next, thanks.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply
* [PATCH net-next-2.6] ipv6: Fix 'release_it' logic in tcp_v6_get_peer()
From: David Miller @ 2010-12-10 21:17 UTC (permalink / raw)
To: netdev
We accidently set it to "true" for the case where we
are using a route bound peer.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/ipv6/tcp_ipv6.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 3194585..fee0768 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1877,7 +1877,7 @@ static struct inet_peer *tcp_v6_get_peer(struct sock *sk, bool *release_it)
if (!rt->rt6i_peer)
rt6_bind_peer(rt, 1);
peer = rt->rt6i_peer;
- *release_it = true;
+ *release_it = false;
}
return peer;
--
1.7.3.2
^ permalink raw reply related
* Please promote b1d670f10e80 to 2.6.37/stable to fix gcc mainline build
From: Andi Kleen @ 2010-12-10 21:18 UTC (permalink / raw)
To: davem; +Cc: gregory.v.rose, jeffrey.t.kirsher, netdev
Without this patch a gcc mainline kernel build fails. This is currently only
fixed in net-next. Could the patch please be promoted to 2.6.37 and
ideally for stable too?
Thanks,
-Andi
commit b1d670f10e8078485884f0cf7e384d890909aeaa
Author: Greg Rose <gregory.v.rose@intel.com>
Date: Tue Nov 16 19:41:36 2010 -0800
Remove extra struct page member from the buffer info structure
declaration.
Reported-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
--
ak@linux.intel.com -- Speaking for myself only.
^ permalink raw reply
* Re: unable to handle kernel NULL pointer dereference in skb_dequeue
From: Jarek Poplawski @ 2010-12-10 21:30 UTC (permalink / raw)
To: David Miller
Cc: nuclearcat, eric.dumazet, andrej, linux-kernel, gvs, ramirose,
netdev
In-Reply-To: <20101210.121845.70177370.davem@davemloft.net>
David Miller wrote:
> From: Denys Fedoryshchenko <nuclearcat@nuclearcat.com>
> Date: Fri, 10 Dec 2010 21:51:04 +0200
...
>> Is there any plans to queue any patch to stable?
>> pppoe is almost dead in 2.6.36.*
>
> I'll deal with it for -stable once I evaluate this patch for upstream,
> which I haven't even gotten to yet.
This patch is here:
http://patchwork.ozlabs.org/patch/75095/
But IMHO it's buggy for the reason I mentioned. Since Andrej
didn't respond yet I'd suggest reverting of the offending
commit 55c95e738da85. If you agree with that but e.g. too busy,
let me know.
Jarek P.
^ permalink raw reply
* Re: ctnetlink loop
From: David Miller @ 2010-12-10 22:01 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel, netdev, linux-kernel
In-Reply-To: <4D00B5CD.3050406@netfilter.org>
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 09 Dec 2010 11:56:13 +0100
> netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack()
>
> From: Pablo Neira Ayuso <pablo@netfilter.org>
>
> This patch fixes a loop in ctnetlink_get_conntrack() that can be
> triggered if you use the same socket to receive events and to
> perform a GET operation. Under heavy load, netlink_unicast()
> may return -EAGAIN, this error code is reserved in nfnetlink for
> the module load-on-demand. Instead, we return -ENOBUFS which is
> the appropriate error code that has to be propagated to
> user-space.
>
> Reported-by: Holger Eitzenberger <holger@eitzenberger.org>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Since Patrick seems to be inactive I have applied this directly
to net-2.6, thanks guys!
^ permalink raw reply
* [net-next-2.6 PATCH] enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type
From: Roopa Prabhu @ 2010-12-10 22:02 UTC (permalink / raw)
To: davem; +Cc: netdev
From: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: Christian Benvenuti <benve@cisco.com>
---
drivers/net/enic/enic.h | 2 +-
drivers/net/enic/enic_main.c | 33 +++++++++++++++++++++++----------
drivers/net/enic/vnic_vic.h | 31 +++++++++++++++++++++++--------
3 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 577067e..a937f49 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -32,7 +32,7 @@
#define DRV_NAME "enic"
#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION "1.4.1.9"
+#define DRV_VERSION "1.4.1.10"
#define DRV_COPYRIGHT "Copyright 2008-2010 Cisco Systems, Inc"
#define ENIC_BARS_MAX 6
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 21be989..9befd54 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1252,7 +1252,10 @@ static int enic_set_port_profile(struct enic *enic, u8 *mac)
{
struct vic_provinfo *vp;
u8 oui[3] = VIC_PROVINFO_CISCO_OUI;
+ u16 os_type = VIC_GENERIC_PROV_OS_TYPE_LINUX;
char uuid_str[38];
+ char client_mac_str[18];
+ u8 *client_mac;
int err;
err = enic_vnic_dev_deinit(enic);
@@ -1270,37 +1273,47 @@ static int enic_set_port_profile(struct enic *enic, u8 *mac)
return -EADDRNOTAVAIL;
vp = vic_provinfo_alloc(GFP_KERNEL, oui,
- VIC_PROVINFO_LINUX_TYPE);
+ VIC_PROVINFO_GENERIC_TYPE);
if (!vp)
return -ENOMEM;
vic_provinfo_add_tlv(vp,
- VIC_LINUX_PROV_TLV_PORT_PROFILE_NAME_STR,
+ VIC_GENERIC_PROV_TLV_PORT_PROFILE_NAME_STR,
strlen(enic->pp.name) + 1, enic->pp.name);
if (!is_zero_ether_addr(enic->pp.mac_addr))
- vic_provinfo_add_tlv(vp,
- VIC_LINUX_PROV_TLV_CLIENT_MAC_ADDR,
- ETH_ALEN, enic->pp.mac_addr);
+ client_mac = enic->pp.mac_addr;
else
- vic_provinfo_add_tlv(vp,
- VIC_LINUX_PROV_TLV_CLIENT_MAC_ADDR,
- ETH_ALEN, mac);
+ client_mac = mac;
+
+ vic_provinfo_add_tlv(vp,
+ VIC_GENERIC_PROV_TLV_CLIENT_MAC_ADDR,
+ ETH_ALEN, client_mac);
+
+ sprintf(client_mac_str, "%pM", client_mac);
+ vic_provinfo_add_tlv(vp,
+ VIC_GENERIC_PROV_TLV_CLUSTER_PORT_UUID_STR,
+ sizeof(client_mac_str), client_mac_str);
if (enic->pp.set & ENIC_SET_INSTANCE) {
sprintf(uuid_str, "%pUB", enic->pp.instance_uuid);
vic_provinfo_add_tlv(vp,
- VIC_LINUX_PROV_TLV_CLIENT_UUID_STR,
+ VIC_GENERIC_PROV_TLV_CLIENT_UUID_STR,
sizeof(uuid_str), uuid_str);
}
if (enic->pp.set & ENIC_SET_HOST) {
sprintf(uuid_str, "%pUB", enic->pp.host_uuid);
vic_provinfo_add_tlv(vp,
- VIC_LINUX_PROV_TLV_HOST_UUID_STR,
+ VIC_GENERIC_PROV_TLV_HOST_UUID_STR,
sizeof(uuid_str), uuid_str);
}
+ os_type = htons(os_type);
+ vic_provinfo_add_tlv(vp,
+ VIC_GENERIC_PROV_TLV_OS_TYPE,
+ sizeof(os_type), &os_type);
+
err = enic_dev_init_prov(enic, vp);
vic_provinfo_free(vp);
if (err)
diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/enic/vnic_vic.h
index 7e46e5e..f700f5d 100644
--- a/drivers/net/enic/vnic_vic.h
+++ b/drivers/net/enic/vnic_vic.h
@@ -24,14 +24,29 @@
/* Note: String field lengths include null char */
#define VIC_PROVINFO_CISCO_OUI { 0x00, 0x00, 0x0c }
-#define VIC_PROVINFO_LINUX_TYPE 0x2
-
-enum vic_linux_prov_tlv_type {
- VIC_LINUX_PROV_TLV_PORT_PROFILE_NAME_STR = 0,
- VIC_LINUX_PROV_TLV_CLIENT_MAC_ADDR = 1, /* u8[6] */
- VIC_LINUX_PROV_TLV_CLIENT_NAME_STR = 2,
- VIC_LINUX_PROV_TLV_HOST_UUID_STR = 8,
- VIC_LINUX_PROV_TLV_CLIENT_UUID_STR = 9,
+#define VIC_PROVINFO_GENERIC_TYPE 0x4
+
+enum vic_generic_prov_tlv_type {
+ VIC_GENERIC_PROV_TLV_PORT_PROFILE_NAME_STR = 0,
+ VIC_GENERIC_PROV_TLV_CLIENT_MAC_ADDR = 1,
+ VIC_GENERIC_PROV_TLV_CLIENT_NAME_STR = 2,
+ VIC_GENERIC_PROV_TLV_CLUSTER_PORT_NAME_STR = 3,
+ VIC_GENERIC_PROV_TLV_CLUSTER_PORT_UUID_STR = 4,
+ VIC_GENERIC_PROV_TLV_CLUSTER_UUID_STR = 5,
+ VIC_GENERIC_PROV_TLV_CLUSTER_NAME_STR = 7,
+ VIC_GENERIC_PROV_TLV_HOST_UUID_STR = 8,
+ VIC_GENERIC_PROV_TLV_CLIENT_UUID_STR = 9,
+ VIC_GENERIC_PROV_TLV_INCARNATION_NUMBER = 10,
+ VIC_GENERIC_PROV_TLV_OS_TYPE = 11,
+ VIC_GENERIC_PROV_TLV_OS_VENDOR = 12,
+ VIC_GENERIC_PROV_TLV_CLIENT_TYPE = 15,
+};
+
+enum vic_generic_prov_os_type {
+ VIC_GENERIC_PROV_OS_TYPE_UNKNOWN = 0,
+ VIC_GENERIC_PROV_OS_TYPE_ESX = 1,
+ VIC_GENERIC_PROV_OS_TYPE_LINUX = 2,
+ VIC_GENERIC_PROV_OS_TYPE_WINDOWS = 3,
};
struct vic_provinfo {
^ permalink raw reply related
* Re: [PATCH net-2.6] net/ipv6/udp.c: fix typo in flush_stack()
From: David Miller @ 2010-12-10 22:05 UTC (permalink / raw)
To: eric.dumazet; +Cc: jpirko, netdev
In-Reply-To: <1291902488.4063.28.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 09 Dec 2010 14:48:08 +0100
> Le jeudi 09 décembre 2010 à 14:40 +0100, Jiri Pirko a écrit :
>> skb1 should be passed as parameter to sk_rcvqueues_full() here.
>>
>> Signed-off-by: Jiri Pirko <jpirko@redhat.com>
>>
>> diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
>> index 91def93..d2b268e 100644
>> --- a/net/ipv6/udp.c
>> +++ b/net/ipv6/udp.c
>> @@ -602,7 +602,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
>>
>> sk = stack[i];
>> if (skb1) {
>> - if (sk_rcvqueues_full(sk, skb)) {
>> + if (sk_rcvqueues_full(sk, skb1)) {
>> kfree_skb(skb1);
>> goto drop;
>> }
>
> net-2.6 ? Its the same truesize anyway...
>
> So it's not a bug, but a cosmetic change.
> (I am ok with it, but for net-next-2.6)
Agreed, applied to net-next-2.6, thanks.
^ permalink raw reply
* Re: [net-next 2/8] bnx2x: add select queue callback
From: David Miller @ 2010-12-10 22:11 UTC (permalink / raw)
To: dmitry; +Cc: netdev, eilong
In-Reply-To: <1291896556.8745.7.camel@lb-tlvb-dmitry>
From: "Dmitry Kravkov" <dmitry@broadcom.com>
Date: Thu, 9 Dec 2010 14:09:16 +0200
> +#endif
> + /* Select queue (if defined) adjust for fcoe */
> + fp_index = skb_tx_hash(dev, skb) - FCOE_CONTEXT_USE;
> +
> + return (fp_index >= 0 ? fp_index : 0);
This doesn't make any sense, and it's one of the reasons I really
hate the fact that drivers sometimes need to override the
select_queue method.
Because 9 times out of 10 they get it wrong.
You're mapping queues 0 --> FCOE_CONTEXT_USE to zero.
But that's not what you actually want.
You're actually trying to make non-FCOE traffic hash only amongst the
non-FCOE queues.
So make your code actually do that instead of screwing up the
distribution of the hash result.
^ permalink raw reply
* Re: [patch 0/4] s390: qeth patches for net-next
From: David Miller @ 2010-12-10 22:29 UTC (permalink / raw)
To: frank.blaschka; +Cc: netdev, linux-s390
In-Reply-To: <20101208125757.726629855@de.ibm.com>
From: frank.blaschka@de.ibm.com
Date: Wed, 08 Dec 2010 13:57:57 +0100
> here is another patch set for net-next.
All applied, thank you.
^ permalink raw reply
* Re: [PATCH 3/3 v2] ifb: use the lockless variants of skb_queue
From: David Miller @ 2010-12-10 22:35 UTC (permalink / raw)
To: hadi; +Cc: xiaosuo, netdev, jarkao2
In-Reply-To: <1291559180.2159.683.camel@mojatatu>
From: jamal <hadi@cyberus.ca>
Date: Sun, 05 Dec 2010 09:26:20 -0500
> On Sun, 2010-12-05 at 09:01 +0800, Changli Gao wrote:
>> rq and tq are both protected by tx queue lock, so we can simply use
>> the lockless variants of skb_queue.
>>
>> skb_queue_splice_tail_init() is used instead of the open coded and slow
>> one.
>>
>> Signed-off-by: Changli Gao <xiaosuo@gmail.com>
>
> Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
I've applied the most up to date versions of all 3 of
Changli's IFB patches, thanks!
^ permalink raw reply
* Re: [PATCH 0/3] xfrm: ESP Traffic Flow Confidentiality padding (v3)
From: David Miller @ 2010-12-10 22:44 UTC (permalink / raw)
To: herbert; +Cc: martin, linux-crypto, netdev
In-Reply-To: <20101209124732.GA28931@gondor.apana.org.au>
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 9 Dec 2010 20:47:32 +0800
> On Wed, Dec 08, 2010 at 03:37:48PM +0100, Martin Willi wrote:
>> The following patchset adds Traffic Flow Confidentiality padding. The
>> first patch introduces a new Netlink XFRM attribute to configure TFC via
>> userspace. Patch two and three implement the padding logic in IPv4 and
>> IPv6 ESP. Padding is always done using the RFC4303 format an is clamped
>> to the PMTU.
>>
>> Changes from v2:
>> - Remove unused flag field in attribute, use a plain u32 as attribute payload
>> - Reject installation of TFC padding on non-tunnel SAs
>
> Looks good to me. Thanks for the hard work Martin!
>
> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
All applied, thanks everyone!
^ permalink raw reply
* Re: [PATCH v2] bridge: Fix return values of br_multicast_add_group/br_multicast_new_group
From: Tobias Klauser @ 2010-12-10 22:52 UTC (permalink / raw)
To: David Miller; +Cc: shemminger, bridge, netdev
In-Reply-To: <20101210.130125.233714141.davem@davemloft.net>
On 2010-12-10 at 22:01:25 +0100, David Miller <davem@davemloft.net> wrote:
> From: Tobias Klauser <tklauser@distanz.ch>
> Date: Fri, 10 Dec 2010 14:18:04 +0100
>
> > If br_multicast_new_group returns NULL, we would return 0 (no error) to
> > the caller of br_multicast_add_group, which is not what we want. Instead
> > br_multicast_new_group should return ERR_PTR(-ENOMEM) in this case.
> > Also propagate the error number returned by br_mdb_rehash properly.
> >
> > Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
>
> Looks good, applied to net-next-2.6
>
> Please in the future make is clear, in your subject line, which
> tree this patch is meant for.
>
> I had to figure it out by trial and error, because this patch
> does not apply properly to net-2.6
Sorry about that. I'll do so in the future.
Thanks
^ permalink raw reply
* Re: [PATCH] inet6: Remove redundant unlikely()
From: David Miller @ 2010-12-10 22:57 UTC (permalink / raw)
To: tklauser
Cc: kuznet, pekkas, jmorris, yoshfuji, kaber, netdev, kernel-janitors
In-Reply-To: <1291905468-32174-1-git-send-email-tklauser@distanz.ch>
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 9 Dec 2010 15:37:48 +0100
> IS_ERR() already implies unlikely(), so it can be omitted here.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Applied.
^ permalink raw reply
* Re: [PATCH] stmmac: Remove redundant unlikely()
From: David Miller @ 2010-12-10 22:57 UTC (permalink / raw)
To: tklauser; +Cc: peppe.cavallaro, netdev, kernel-janitors
In-Reply-To: <1291906222-575-1-git-send-email-tklauser@distanz.ch>
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 9 Dec 2010 15:50:22 +0100
> IS_ERR() already implies unlikely(), so it can be omitted here.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Applied.
^ permalink raw reply
* Re: [PATCH] ipv6: slightly simplify keeping IPv6 addresses on link down
From: Lorenzo Colitti @ 2010-12-10 23:00 UTC (permalink / raw)
To: David Miller; +Cc: shemminger, netdev
In-Reply-To: <20101210.124339.242120993.davem@davemloft.net>
On Fri, Dec 10, 2010 at 12:43 PM, David Miller <davem@davemloft.net> wrote:
> Lorenzo you've already added serious bugs to this code with your
> previous address handling changes (which had reference counting bugs),
> so I'm going to heavily scrutinize any "cleanup" or other kind of
> change you try to make here.
By all means. Apologies for introducing the bug. Needless to say, I'll
let this one lie.
> In fact I really wish you would just leave this code as-is instead
> of trying to make such pointless tweaks to it.
My intention was to make the code a little more readable, and I did
test this by running it, but yes, a bug is a bug. As you can probably
tell, my expertise is in networking, not in writing kernel code. But I
do think that this code does the wrong thing in some areas, so I
wanted to try to fix it. In particular, keeping invalid autoconfig
addresses and routes configured on interfaces is guaranteed to break
connectivity.
I have two other patches that I think will improve the behaviour of
the stack from a networking perspective. One of them makes the kernel
properly update the lifetime of temporary addresses (this changed
between RFC 3041 and RFC 4941). The other deprecates addresses when
link goes down, which will do pretty much the same as my original
patch to delete the addresses, but will not cause the loss of any
privacy addresses configured.
My plan was to let these soak on my laptop (which I have been doing
for a few weeks), show them to colleagues who write kernel code (which
I have done), and submit them to this list. Is there anything else I
should be doing?
Thanks,
Lorenzo
^ permalink raw reply
* Re: [net-2.6 PATCH] enic: Bug Fix: Pass napi reference to the isr that services receive queue
From: David Miller @ 2010-12-10 23:01 UTC (permalink / raw)
To: vkolluri; +Cc: netdev, roprabhu, dwang2
In-Reply-To: <20101208230545.24082.48614.stgit@savbu-pc100.cisco.com>
From: Vasanthy Kolluri <vkolluri@cisco.com>
Date: Wed, 08 Dec 2010 15:05:45 -0800
> From: Vasanthy Kolluri <vkolluri@cisco.com>
>
> Pass reference to napi instead of enic device to the isr that services receive queue.
>
> Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
> Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
> Signed-off-by: David Wang <dwang2@cisco.com>
Applied, thank you.
^ permalink raw reply
* Re: [PATCH] SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address
From: David Miller @ 2010-12-10 23:01 UTC (permalink / raw)
To: yjwei; +Cc: vladislav.yasevich, linux-sctp, netdev
In-Reply-To: <4CFEF74D.7020704@cn.fujitsu.com>
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Wed, 08 Dec 2010 11:11:09 +0800
> SCTP_SET_PEER_PRIMARY_ADDR does not accpet v4mapped address, using
> v4mapped address in SCTP_SET_PEER_PRIMARY_ADDR socket option will
> get -EADDRNOTAVAIL error if v4map is enabled. This patch try to
> fix it by mapping v4mapped address to v4 address if allowed.
>
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Vlad and other SCTP folks, please review this patch.
^ permalink raw reply
* Re: Misuse of LRO, how widespread
From: David Miller @ 2010-12-10 23:03 UTC (permalink / raw)
To: bhutchings; +Cc: shemminger, olof, divy, netdev
In-Reply-To: <1291674912.5405.24.camel@bwh-desktop>
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 06 Dec 2010 22:35:12 +0000
> On Mon, 2010-12-06 at 14:33 -0800, Stephen Hemminger wrote:
>> How about this?
>>
>> Subject: sfc: convert references to LRO to GRO
>>
>> This driver now uses Generic Receive Offload, not the older LRO.
>> Change references to LRO in names and comments.
>>
>> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
> Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Applied to net-next-2.6, thanks!
^ permalink raw reply
* Re: [PATCH] SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address
From: Vladislav Yasevich @ 2010-12-10 23:13 UTC (permalink / raw)
To: Wei Yongjun; +Cc: David Miller, linux-sctp, netdev@vger.kernel.org
In-Reply-To: <4CFEF74D.7020704@cn.fujitsu.com>
On 12/07/2010 10:11 PM, Wei Yongjun wrote:
> SCTP_SET_PEER_PRIMARY_ADDR does not accpet v4mapped address, using
> v4mapped address in SCTP_SET_PEER_PRIMARY_ADDR socket option will
> get -EADDRNOTAVAIL error if v4map is enabled. This patch try to
> fix it by mapping v4mapped address to v4 address if allowed.
>
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Looks good.
Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
-vlad
> ---
> net/sctp/socket.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 6bd5543..0b9ee34 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -2932,6 +2932,7 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva
> struct sctp_association *asoc = NULL;
> struct sctp_setpeerprim prim;
> struct sctp_chunk *chunk;
> + struct sctp_af *af;
> int err;
>
> sp = sctp_sk(sk);
> @@ -2959,6 +2960,13 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva
> if (!sctp_state(asoc, ESTABLISHED))
> return -ENOTCONN;
>
> + af = sctp_get_af_specific(prim.sspp_addr.ss_family);
> + if (!af)
> + return -EINVAL;
> +
> + if (!af->addr_valid((union sctp_addr *)&prim.sspp_addr, sp, NULL))
> + return -EADDRNOTAVAIL;
> +
> if (!sctp_assoc_lookup_laddr(asoc, (union sctp_addr *)&prim.sspp_addr))
> return -EADDRNOTAVAIL;
>
>
>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox