From 03c750c74e2c87b53c6a15e78db8dd6ec3dce5f5 Mon Sep 17 00:00:00 2001 From: Shan Wei Date: Tue, 5 Jul 2011 20:43:12 -0700 Subject: [PATCH] --- yaml --- r: 254685 b: refs/heads/master c: 712ae51afd55b20c04c5383d02ba5d10233313b1 h: refs/heads/master i: 254683: fd71b6c21b8687ca25aa804fe58d03859a59ab21 v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan_dev.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0abd48fc682e..2a3455590ea6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5318d809d7b4975ce5e5303e8508f89a5458c2b6 +refs/heads/master: 712ae51afd55b20c04c5383d02ba5d10233313b1 diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c index 7ea5cf9ea08a..86bff9b1ac47 100644 --- a/trunk/net/8021q/vlan_dev.c +++ b/trunk/net/8021q/vlan_dev.c @@ -586,9 +586,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;