* [PATCH bug-fix v2] net: vlan: enable soft features regardless of underlying device
@ 2011-07-06 2:08 Shan Wei
2011-07-06 3:43 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Shan Wei @ 2011-07-06 2:08 UTC (permalink / raw)
To: David Miller, 单卫, netdev
If gso/gro feature of underlying device is turned off，
then new created vlan device never can turn gso/gro on.
Although underlying device don't support TSO, we still
should use software segments for vlan device.
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
---
v2: only update changelog and title.
---
net/8021q/vlan_dev.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 1c9aa8c..d8f45ba 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -588,9 +588,14 @@ static void vlan_dev_uninit(struct net_device *dev)
static u32 vlan_dev_fix_features(struct net_device *dev, u32 features)
{
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+ u32 old_features = features;
features &= real_dev->features;
features &= real_dev->vlan_features;
+
+ if (old_features & NETIF_F_SOFT_FEATURES)
+ features |= old_features & NETIF_F_SOFT_FEATURES;
+
if (dev_ethtool_get_rx_csum(real_dev))
features |= NETIF_F_RXCSUM;
features |= NETIF_F_LLTX;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH bug-fix v2] net: vlan: enable soft features regardless of underlying device
2011-07-06 2:08 [PATCH bug-fix v2] net: vlan: enable soft features regardless of underlying device Shan Wei
@ 2011-07-06 3:43 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-07-06 3:43 UTC (permalink / raw)
To: shanwei; +Cc: netdev
From: Shan Wei <shanwei@cn.fujitsu.com>
Date: Wed, 06 Jul 2011 10:08:44 +0800
> If gso/gro feature of underlying device is turned off，
> then new created vlan device never can turn gso/gro on.
>
> Although underlying device don't support TSO, we still
> should use software segments for vlan device.
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Applied to net-2.6, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-06 3:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-06 2:08 [PATCH bug-fix v2] net: vlan: enable soft features regardless of underlying device Shan Wei
2011-07-06 3:43 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).