提交 712ae51a 编写于 作者: S Shan Wei 提交者: David S. Miller

net: vlan: enable soft features regardless of underlying device

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: NShan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 5318d809
...@@ -586,9 +586,14 @@ static void vlan_dev_uninit(struct net_device *dev) ...@@ -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) static u32 vlan_dev_fix_features(struct net_device *dev, u32 features)
{ {
struct net_device *real_dev = vlan_dev_info(dev)->real_dev; struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
u32 old_features = features;
features &= real_dev->features; features &= real_dev->features;
features &= real_dev->vlan_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)) if (dev_ethtool_get_rx_csum(real_dev))
features |= NETIF_F_RXCSUM; features |= NETIF_F_RXCSUM;
features |= NETIF_F_LLTX; features |= NETIF_F_LLTX;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册