---

yaml --- r: 256309 b: refs/heads/master c: fec30c3 h: refs/heads/master i: 256307: c48bf08 v: v3
git-mirror · Jul 14, 2011 · 7b57e29 · 7b57e29
1 parent 189a2d4
commit 7b57e29
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1180e7d6599c1fb0c56a23a649a3eb37d877b9d0
+refs/heads/master: fec30c33819b442fd618b10f405248ee7cbb51d8
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
@@ -2529,7 +2529,6 @@ static inline u32 netdev_get_wanted_features(struct net_device *dev)
 	return (dev->features & ~dev->hw_features) | dev->wanted_features;
 }
 u32 netdev_increment_features(u32 all, u32 one, u32 mask);
-u32 netdev_fix_features(struct net_device *dev, u32 features);
 int __netdev_update_features(struct net_device *dev);
 void netdev_update_features(struct net_device *dev);
 void netdev_change_features(struct net_device *dev);

diff --git a/trunk/net/core/dev.c b/trunk/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)
 {