Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 9ca15142d8238f512c2b1c444a0b8885c8b1200b..9444c5cb413798f8b620f1a3a6b703a7c413e55e 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5209,7 +5209,7 @@ static void rollback_registered(struct net_device *dev)
        list_del(&single);
 }
 
-u32 netdev_fix_features(struct net_device *dev, u32 features)
+static u32 netdev_fix_features(struct net_device *dev, u32 features)
 {
        /* Fix illegal checksum combinations */
        if ((features & NETIF_F_HW_CSUM) &&
@@ -5268,7 +5268,6 @@ u32 netdev_fix_features(struct net_device *dev, u32 features)
 
        return features;
 }
-EXPORT_SYMBOL(netdev_fix_features);
 
 int __netdev_update_features(struct net_device *dev)
 {
@@ -5488,12 +5487,9 @@ int register_netdevice(struct net_device *dev)
                dev->features |= NETIF_F_NOCACHE_COPY;
        }
 
-       /* Enable GSO, GRO and NETIF_F_HIGHDMA for vlans by default,
-        * vlan_dev_fix_features() will do the features check,
-        * so NETIF_F_HIGHDMA feature is enabled only if supported
-        * by underlying device.
+       /* Make NETIF_F_HIGHDMA inheritable to VLAN devices.
         */
-       dev->vlan_features |= (NETIF_F_SOFT_FEATURES | NETIF_F_HIGHDMA);
+       dev->vlan_features |= NETIF_F_HIGHDMA;
 
        ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);
        ret = notifier_to_errno(ret);