aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/netdevice.h1
-rw-r--r--net/core/dev.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5ccc0cb8352b..f84dfd25c431 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2529,7 +2529,6 @@ static inline u32 netdev_get_wanted_features(struct net_device *dev)
2529 return (dev->features & ~dev->hw_features) | dev->wanted_features; 2529 return (dev->features & ~dev->hw_features) | dev->wanted_features;
2530} 2530}
2531u32 netdev_increment_features(u32 all, u32 one, u32 mask); 2531u32 netdev_increment_features(u32 all, u32 one, u32 mask);
2532u32 netdev_fix_features(struct net_device *dev, u32 features);
2533int __netdev_update_features(struct net_device *dev); 2532int __netdev_update_features(struct net_device *dev);
2534void netdev_update_features(struct net_device *dev); 2533void netdev_update_features(struct net_device *dev);
2535void netdev_change_features(struct net_device *dev); 2534void netdev_change_features(struct net_device *dev);
diff --git a/net/core/dev.c b/net/core/dev.c
index e57be0262051..9444c5cb4137 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5209,7 +5209,7 @@ static void rollback_registered(struct net_device *dev)
5209 list_del(&single); 5209 list_del(&single);
5210} 5210}
5211 5211
5212u32 netdev_fix_features(struct net_device *dev, u32 features) 5212static u32 netdev_fix_features(struct net_device *dev, u32 features)
5213{ 5213{
5214 /* Fix illegal checksum combinations */ 5214 /* Fix illegal checksum combinations */
5215 if ((features & NETIF_F_HW_CSUM) && 5215 if ((features & NETIF_F_HW_CSUM) &&
@@ -5268,7 +5268,6 @@ u32 netdev_fix_features(struct net_device *dev, u32 features)
5268 5268
5269 return features; 5269 return features;
5270} 5270}
5271EXPORT_SYMBOL(netdev_fix_features);
5272 5271
5273int __netdev_update_features(struct net_device *dev) 5272int __netdev_update_features(struct net_device *dev)
5274{ 5273{