* Re: [PATCH 11/36] ixgbe, rcu: convert call_rcu(ring_free_rcu) to kfree_rcu()
From: David Miller @ 2011-03-18 19:36 UTC (permalink / raw)
To: laijs
Cc: e1000-devel, bruce.w.allan, jesse.brandeburg, linux-kernel,
john.ronciak, netdev, mingo, paulmck
In-Reply-To: <4D82D821.1070101@cn.fujitsu.com>
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 11:57:21 +0800
>
>
> The rcu callback ring_free_rcu() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(ring_free_rcu).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply
* Re: [PATCH 14/36] macvlan,rcu: convert call_rcu(macvlan_port_rcu_free) to kfree_rcu()
From: David Miller @ 2011-03-18 19:36 UTC (permalink / raw)
To: laijs; +Cc: paulmck, mingo, kaber, netdev, linux-kernel
In-Reply-To: <4D82D8C7.3040608@cn.fujitsu.com>
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 12:00:07 +0800
>
>
> The rcu callback macvlan_port_rcu_free() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(macvlan_port_rcu_free).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH 16/36] net,rcu: convert call_rcu(rps_map_release) to kfree_rcu()
From: David Miller @ 2011-03-18 19:36 UTC (permalink / raw)
To: laijs
Cc: paulmck, mingo, eric.dumazet, therbert, ebiederm, gregkh, netdev,
linux-kernel
In-Reply-To: <4D82D91B.1080102@cn.fujitsu.com>
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 12:01:31 +0800
>
>
> The rcu callback rps_map_release() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(rps_map_release).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH 17/36] net,rcu: convert call_rcu(xps_map_release) to kfree_rcu()
From: David Miller @ 2011-03-18 19:36 UTC (permalink / raw)
To: laijs
Cc: paulmck, mingo, eric.dumazet, therbert, ebiederm, gregkh, netdev,
linux-kernel
In-Reply-To: <4D82D94C.2090507@cn.fujitsu.com>
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 12:02:20 +0800
>
>
> The rcu callback xps_map_release() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(xps_map_release).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH 28/36] net,rcu: convert call_rcu(phonet_device_rcu_free) to kfree_rcu()
From: David Miller @ 2011-03-18 19:37 UTC (permalink / raw)
To: laijs; +Cc: paulmck, mingo, remi.denis-courmont, netdev, linux-kernel
In-Reply-To: <4D82DADF.4010802@cn.fujitsu.com>
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 12:09:03 +0800
>
>
> The rcu callback phonet_device_rcu_free() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(phonet_device_rcu_free).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH 30/36] net,rcu: convert call_rcu(wq_free_rcu) to kfree_rcu()
From: David Miller @ 2011-03-18 19:37 UTC (permalink / raw)
To: laijs; +Cc: paulmck, mingo, netdev, linux-kernel
In-Reply-To: <4D82DB31.7050007@cn.fujitsu.com>
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 12:10:25 +0800
>
>
> The rcu callback wq_free_rcu() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(wq_free_rcu).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH 20/36] net,rcu: convert call_rcu(netlbl_unlhsh_free_addr4) to kfree_rcu()
From: David Miller @ 2011-03-18 19:36 UTC (permalink / raw)
To: laijs; +Cc: paulmck, mingo, paul.moore, netdev, linux-kernel
In-Reply-To: <4D82D9AC.30205@cn.fujitsu.com>
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 12:03:56 +0800
>
>
> The rcu callback netlbl_unlhsh_free_addr4() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(netlbl_unlhsh_free_addr4).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH 24/36] net,rcu: convert call_rcu(net_generic_release) to kfree_rcu()
From: David Miller @ 2011-03-18 19:37 UTC (permalink / raw)
To: laijs; +Cc: paulmck, mingo, jpirko, eric.dumazet, netdev, linux-kernel
In-Reply-To: <4D82DA48.2070305@cn.fujitsu.com>
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 12:06:32 +0800
>
>
> The rcu callback net_generic_release() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(net_generic_release).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH 25/36] net,rcu: convert call_rcu(__nf_ct_ext_free_rcu) to kfree_rcu()
From: David Miller @ 2011-03-18 19:37 UTC (permalink / raw)
To: laijs
Cc: paulmck, mingo, kaber, netfilter-devel, netfilter, coreteam,
netdev, linux-kernel
In-Reply-To: <4D82DA6D.7030100@cn.fujitsu.com>
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 12:07:09 +0800
>
>
> The rcu callback __nf_ct_ext_free_rcu() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(__nf_ct_ext_free_rcu).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH 36/36] net,rcu: convert call_rcu(xt_osf_finger_free_rcu) to kfree_rcu()
From: David Miller @ 2011-03-18 19:37 UTC (permalink / raw)
To: laijs
Cc: paulmck, mingo, kaber, netfilter-devel, netfilter, coreteam,
netdev, linux-kernel
In-Reply-To: <4D82DC46.5010905@cn.fujitsu.com>
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 12:15:02 +0800
>
>
> The rcu callback xt_osf_finger_free_rcu() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(xt_osf_finger_free_rcu).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: patch for format issues and header bug in net/ipv4/icmp.c
From: Ben Hutchings @ 2011-03-18 19:41 UTC (permalink / raw)
To: Jeffrin Jose; +Cc: David S. Miller, Alexey Kuznetsov, linux-kernel, netdev
In-Reply-To: <20110318183529.GA3617@debian.Jeff>
On Sat, 2011-03-19 at 00:05 +0530, Jeffrin Jose wrote:
> hello ,
>
> I have created a patch for net/ipv4/icmp.c
> using checkpatch.pl script to fix several warnings
> and an error.
You need to learn C programming before trying to correct C programs.
You should not just do what it takes to make checkpatch.pl happy.
Ben.
> I have attached the patch along with this mail.
>
> /Thanks
>
--
Ben Hutchings, Senior Software Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: [PATCH] net: implement dev_disable_lro() hw_features compatibility
From: David Miller @ 2011-03-18 19:43 UTC (permalink / raw)
To: bhutchings; +Cc: mirq-linux, netdev
In-Reply-To: <1300471986.2589.26.camel@bwh-desktop>
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 18 Mar 2011 18:13:06 +0000
> Local function declarations are a very bad idea, as they are not checked
> against the function definition. Please declare the function in
> <linux/ethtool.h>; that does not oblige us to export it.
Agreed.
^ permalink raw reply
* Re: [PATCH] net: ipv4: add IPPROTO_ICMP socket kind
From: David Miller @ 2011-03-18 19:47 UTC (permalink / raw)
To: segoon
Cc: linux-kernel, netdev, peak, solar, kees.cook, dan.j.rosenberg,
eugene, nelhage, kuznet, pekkas, jmorris, yoshfuji, kaber
In-Reply-To: <20110318180002.GA30912@albatros>
From: Vasiliy Kulikov <segoon@openwall.com>
Date: Fri, 18 Mar 2011 21:00:02 +0300
> This patch adds IPPROTO_ICMP socket kind.
I kindly asked the other day for people to not submit new feature
patches while we are amidst the merge window:
http://marc.info/?l=linux-netdev&m=130023005214910&w=2
Please, if you want to do networking development, pay attention to
such important announcements which decreases the burdon upon me and
makes everything operate more smoothly.
Thanks.
^ permalink raw reply
* [PATCH] net: drop NETIF_F_GSO from hw_features without NETIF_F_SG
From: Roger Luethi @ 2011-03-18 19:50 UTC (permalink / raw)
To: netdev; +Cc: mirqus
register_netdevice() removes NETIF_F_GSO from dev->features and
dev->wanted_features for hardware without NETIF_F_SG to "avoid warning from
netdev_fix_features()".
However, as the flag remains set in dev->hw_features, users trying to
enable GSO via ethtool will still end up with NETIF_F_GSO stuck in
wanted_features, resulting in a warning every time they try to change any
feature (until they use ethtool to "disable" GSO):
# ethtool -K eth2 gso on
via-rhine 0000:03:00.0: eth2: Dropping NETIF_F_GSO since no SG feature.
# ethtool -K eth2 rx on
via-rhine 0000:03:00.0: eth2: Dropping NETIF_F_GSO since no SG feature.
via-rhine 0000:03:00.0: eth2: Features changed: 0x00004380 -> 0x20004380
# ethtool -K eth2 rx off
via-rhine 0000:03:00.0: eth2: Dropping NETIF_F_GSO since no SG feature.
via-rhine 0000:03:00.0: eth2: Features changed: 0x20004380 -> 0x00004380
# ethtool -K eth2 gso off
#
With NETIF_F_GSO depending on NETIF_F_SG, it seems we should not
advertise the former as a changeable option if the latter is missing.
---
net/core/dev.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 0d39032..122d4ca 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5433,6 +5433,7 @@ int register_netdevice(struct net_device *dev)
/* Avoid warning from netdev_fix_features() for GSO without SG */
if (!(dev->wanted_features & NETIF_F_SG)) {
+ dev->hw_features &= ~NETIF_F_GSO;
dev->wanted_features &= ~NETIF_F_GSO;
dev->features &= ~NETIF_F_GSO;
}
--
1.7.3.4
^ permalink raw reply related
* Re: LRO disable warnings on kernel 2.6.38
From: David Miller @ 2011-03-18 19:52 UTC (permalink / raw)
To: shemminger
Cc: eric.dumazet, bhutchings, jdb, netdev, nhorman, alexander.h.duyck
In-Reply-To: <20110318081524.42d18bd2@nehalam>
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 18 Mar 2011 08:15:24 -0700
> On Fri, 18 Mar 2011 15:33:04 +0100
> Eric Dumazet <eric.dumazet@gmail.com> wrote:
>
>> Le vendredi 18 mars 2011 à 14:17 +0000, Ben Hutchings a écrit :
>>
>> > WARN is correct as this is a driver bug. But I agree that the
>> > device/driver ID should be included.
>>
>> stack trace gives absolutely no useful indication here.
>>
>> Bug is in driver, yet we dump information on core network stack ?
>>
>> pr_err() is an error indication, not a warning by the way ;)
>
> The advantage of WARN is that it doesn't get ignored and shows
> up in kernel oops. But agreed it should print out as much device
> info as possible to finger the broken device driver.
Infrastructure is not static, therefore we could add a WARN_ON_NETDEV()
or similar. An in fact such things would probably be very useful.
^ permalink raw reply
* Re: patch for format issues and header bug in net/ipv4/icmp.c
From: David Miller @ 2011-03-18 19:57 UTC (permalink / raw)
To: bhutchings; +Cc: ahiliation, kuznet, linux-kernel, netdev
In-Reply-To: <1300477261.2589.28.camel@bwh-desktop>
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 18 Mar 2011 19:41:01 +0000
> On Sat, 2011-03-19 at 00:05 +0530, Jeffrin Jose wrote:
>> hello ,
>>
>> I have created a patch for net/ipv4/icmp.c
>> using checkpatch.pl script to fix several warnings
>> and an error.
>
> You need to learn C programming before trying to correct C programs.
> You should not just do what it takes to make checkpatch.pl happy.
I completely agree, and I absolutely refuse to apply this patch.
^ permalink raw reply
* Re: LRO disable warnings on kernel 2.6.38
From: Ben Hutchings @ 2011-03-18 19:58 UTC (permalink / raw)
To: David Miller
Cc: shemminger, eric.dumazet, jdb, netdev, nhorman, alexander.h.duyck
In-Reply-To: <20110318.125221.212667543.davem@davemloft.net>
On Fri, 2011-03-18 at 12:52 -0700, David Miller wrote:
> From: Stephen Hemminger <shemminger@vyatta.com>
> Date: Fri, 18 Mar 2011 08:15:24 -0700
>
> > On Fri, 18 Mar 2011 15:33:04 +0100
> > Eric Dumazet <eric.dumazet@gmail.com> wrote:
> >
> >> Le vendredi 18 mars 2011 à 14:17 +0000, Ben Hutchings a écrit :
> >>
> >> > WARN is correct as this is a driver bug. But I agree that the
> >> > device/driver ID should be included.
> >>
> >> stack trace gives absolutely no useful indication here.
> >>
> >> Bug is in driver, yet we dump information on core network stack ?
> >>
> >> pr_err() is an error indication, not a warning by the way ;)
> >
> > The advantage of WARN is that it doesn't get ignored and shows
> > up in kernel oops. But agreed it should print out as much device
> > info as possible to finger the broken device driver.
>
> Infrastructure is not static, therefore we could add a WARN_ON_NETDEV()
> or similar. An in fact such things would probably be very useful.
You mean like netdev_WARN()? :-)
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: LRO disable warnings on kernel 2.6.38
From: David Miller @ 2011-03-18 19:59 UTC (permalink / raw)
To: bhutchings
Cc: shemminger, eric.dumazet, jdb, netdev, nhorman, alexander.h.duyck
In-Reply-To: <1300478286.2589.29.camel@bwh-desktop>
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 18 Mar 2011 19:58:06 +0000
> You mean like netdev_WARN()? :-)
Perfect, but it's be nice if we had a variant where the condition were
embedded into the macro as well.
^ permalink raw reply
* Re: [PATCH] net: ipv4: add IPPROTO_ICMP socket kind
From: Vasiliy Kulikov @ 2011-03-18 19:59 UTC (permalink / raw)
To: David Miller
Cc: linux-kernel, netdev, peak, solar, kees.cook, dan.j.rosenberg,
eugene, nelhage, kuznet, pekkas, jmorris, yoshfuji, kaber
In-Reply-To: <20110318.124711.116396341.davem@davemloft.net>
On Fri, Mar 18, 2011 at 12:47 -0700, David Miller wrote:
> I kindly asked the other day for people to not submit new feature
> patches while we are amidst the merge window:
Sorry, I should have grepped the archives before sending the patch
(I'm not a subscriber of netdev@). I'll wait for .39-rc1.
Thanks,
--
Vasiliy Kulikov
http://www.openwall.com - bringing security into open computing environments
^ permalink raw reply
* Re: [PATCH net-2.6] ethtool: Compat handling for struct ethtool_rxnfc
From: Alexander Duyck @ 2011-03-18 20:01 UTC (permalink / raw)
To: Ben Hutchings; +Cc: David Miller, netdev@vger.kernel.org, Santwona Behera
In-Reply-To: <1300383272.2569.13.camel@bwh-desktop>
On 3/17/2011 10:34 AM, Ben Hutchings wrote:
> This structure was accidentally defined such that its layout can
> differ between 32-bit and 64-bit processes. Add compat structure
> definitions and an ioctl wrapper function.
>
> Signed-off-by: Ben Hutchings<bhutchings@solarflare.com>
> Cc: stable@kernel.org [2.6.30+]
> ---
> David,
>
> I still haven't received any response on whether the ETHTOOL_GRXCLSRLALL
> wrapping works with a real driver, but perhaps you could test it against
> niu? I think sparc32 and sparc64 have the same alignment for u64 so
> this wrapper isn't strictly necessary, but it would still be used. (Or
> we can arrange to disable the conversion when compat_ethtool_rxnfc is
> equivalent to ethtool_rxnfc.)
>
> Ben.
I've done a bit of testing this morning and verified GRXRINGS,
GRCLSRLCNT, GRXCLSRULE, SRXCLSRLDEL, and SRXCLSRLINS all seem to be
working for 32bit and 64bit ethtool user space on a x86_64 kernel with
the patch. I also verified the original issue was present by running
32bit ethtool on a x86_64 kernel without the patch applied.
In order to support flow extensions there will end up being a couple of
minor changes needed to the patch but I will just make sure to add them
when flow extensions are added.
Thanks,
Alex
Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
^ permalink raw reply
* Re: [PATCH 20/36] net,rcu: convert call_rcu(netlbl_unlhsh_free_addr4) to kfree_rcu()
From: Paul Moore @ 2011-03-18 20:05 UTC (permalink / raw)
To: David Miller; +Cc: laijs, paulmck, mingo, netdev, linux-kernel
In-Reply-To: <20110318.123651.245394297.davem@davemloft.net>
On Friday, March 18, 2011 3:36:51 PM David Miller wrote:
> From: Lai Jiangshan <laijs@cn.fujitsu.com>
> Date: Fri, 18 Mar 2011 12:03:56 +0800
>
> > The rcu callback netlbl_unlhsh_free_addr4() just calls a kfree(),
> > so we use kfree_rcu() instead of the call_rcu(netlbl_unlhsh_free_addr4).
> >
> > Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
>
> Acked-by: David S. Miller <davem@davemloft.net>
Me too ...
Acked-by: Paul Moore <paul.moore@hp.com>
--
paul moore
linux @ hp
^ permalink raw reply
* Re: [PATCH 21/36] net,rcu: convert call_rcu(netlbl_unlhsh_free_addr6) to kfree_rcu()
From: Paul Moore @ 2011-03-18 20:06 UTC (permalink / raw)
To: Lai Jiangshan
Cc: Paul E. McKenney, Ingo Molnar, David S. Miller, netdev,
linux-kernel
In-Reply-To: <4D82D9E2.4000408@cn.fujitsu.com>
On Friday, March 18, 2011 12:04:50 AM Lai Jiangshan wrote:
> The rcu callback netlbl_unlhsh_free_addr6() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(netlbl_unlhsh_free_addr6).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: Paul Moore <paul.moore@hp.com>
> ---
> net/netlabel/netlabel_unlabeled.c | 22 +---------------------
> 1 files changed, 1 insertions(+), 21 deletions(-)
>
> diff --git a/net/netlabel/netlabel_unlabeled.c
> b/net/netlabel/netlabel_unlabeled.c index 4e5ad90..9c38658 100644
> --- a/net/netlabel/netlabel_unlabeled.c
> +++ b/net/netlabel/netlabel_unlabeled.c
> @@ -153,26 +153,6 @@ static const struct nla_policy
> netlbl_unlabel_genl_policy[NLBL_UNLABEL_A_MAX + 1 * Unlabeled Connection
> Hash Table Functions
> */
>
> -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
> -/**
> - * netlbl_unlhsh_free_addr6 - Frees an IPv6 address entry from the hash
> table - * @entry: the entry's RCU field
> - *
> - * Description:
> - * This function is designed to be used as a callback to the call_rcu()
> - * function so that memory allocated to a hash table address entry can be
> - * released safely.
> - *
> - */
> -static void netlbl_unlhsh_free_addr6(struct rcu_head *entry)
> -{
> - struct netlbl_unlhsh_addr6 *ptr;
> -
> - ptr = container_of(entry, struct netlbl_unlhsh_addr6, rcu);
> - kfree(ptr);
> -}
> -#endif /* IPv6 */
> -
> /**
> * netlbl_unlhsh_free_iface - Frees an interface entry from the hash table
> * @entry: the entry's RCU field
> @@ -611,7 +591,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
> if (entry == NULL)
> return -ENOENT;
>
> - call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6);
> + kfree_rcu(entry, rcu);
> return 0;
> }
> #endif /* IPv6 */
--
paul moore
linux @ hp
^ permalink raw reply
* Re: [PATCH net-next-2.6 2/6] be2net: fix to not drop unfiltered vlan pkts
From: Jesse Gross @ 2011-03-18 20:35 UTC (permalink / raw)
To: Sathya Perla; +Cc: netdev
In-Reply-To: <e340379d-68e1-42af-b7b7-94e07e729884@exht1.ad.emulex.com>
On Fri, Mar 18, 2011 at 6:20 AM, Sathya Perla <sathya.perla@emulex.com> wrote:
> When the device is in promiscuous mode, the driver can receive vlan packets
> (tag is always stripped by card) even when there is no vlan configuration.
> Such packets must be sent to the stack and not dropped.
>
> Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
> ---
> drivers/net/benet/be_main.c | 9 ++-------
> 1 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
> index 97c5167..18c6da4 100644
> --- a/drivers/net/benet/be_main.c
> +++ b/drivers/net/benet/be_main.c
> @@ -1013,15 +1013,10 @@ static void be_rx_compl_process(struct be_adapter *adapter,
> skb->truesize = skb->len + sizeof(struct sk_buff);
> skb->protocol = eth_type_trans(skb, adapter->netdev);
>
> - if (unlikely(rxcp->vlanf)) {
> - if (!adapter->vlan_grp || adapter->vlans_added == 0) {
> - kfree_skb(skb);
> - return;
> - }
> + if (unlikely(rxcp->vlanf))
> vlan_hwaccel_receive_skb(skb, adapter->vlan_grp, rxcp->vid);
It would be better to use __vlan_hwaccel_put_tag() here - it's
equivalent but at least moves in the right direction. Under the old
vlan model (which vlan_hwaccel_receive_skb() is left over from)
passing in a NULL vlan group is illegal, so it's inconsistent anyways.
Of course even better would be to fully convert over to the new vlan
model. A quick skim through the code shows that there might be
similar issue with vlan_gro_frags() as above, so it could help catch
some of that.
^ permalink raw reply
* Re: [PATCH] net: drop NETIF_F_GSO from hw_features without NETIF_F_SG
From: Michał Mirosław @ 2011-03-18 20:43 UTC (permalink / raw)
To: Roger Luethi; +Cc: netdev
In-Reply-To: <20110318195030.GA22350@core.hellgate.ch>
2011/3/18 Roger Luethi <rl@hellgate.ch>:
> register_netdevice() removes NETIF_F_GSO from dev->features and
> dev->wanted_features for hardware without NETIF_F_SG to "avoid warning from
> netdev_fix_features()".
>
> However, as the flag remains set in dev->hw_features, users trying to
> enable GSO via ethtool will still end up with NETIF_F_GSO stuck in
> wanted_features, resulting in a warning every time they try to change any
> feature (until they use ethtool to "disable" GSO):
That's expected, as it allows the user to debug why his request didn't
work as expected. I think that those messages should get demoted to
DEBUG if that's too noisy. The network core imposed conditions could
be explained in Documentation/ or ethtool manpage instead.
Best Regards,
Michał Mirosław
^ permalink raw reply
* [RFC] ethtool: Display reg dump length via get driver info.
From: Ajit Khaparde @ 2011-03-18 21:06 UTC (permalink / raw)
To: netdev; +Cc: bhutchings, ajit.khaparde
Devices like BE store Reg Dump Data in the hardware.
This change will allow to just peek into the hardware
to see if any data is available for a dump and analysis,
without actually dumping the register data.
Patch:
----
Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
---
ethtool.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ethtool.c b/ethtool.c
index e9cb2c9..a0c7c99 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -1423,11 +1423,13 @@ static int dump_drvinfo(struct ethtool_drvinfo *info)
"driver: %s\n"
"version: %s\n"
"firmware-version: %s\n"
- "bus-info: %s\n",
+ "bus-info: %s\n"
+ "regdump-len: %d\n",
info->driver,
info->version,
info->fw_version,
- info->bus_info);
+ info->bus_info,
+ info->regdump_len);
return 0;
}
--
1.7.1
^ permalink raw reply related
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