diff options
-rw-r--r-- | include/linux/netdevice.h | 11 | ||||
-rw-r--r-- | net/core/dev.c | 6 |
2 files changed, 3 insertions, 14 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c7d707452228..5a5baeaaa50f 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -2437,17 +2437,6 @@ static inline void netif_set_gso_max_size(struct net_device *dev, | |||
2437 | dev->gso_max_size = size; | 2437 | dev->gso_max_size = size; |
2438 | } | 2438 | } |
2439 | 2439 | ||
2440 | extern int __skb_bond_should_drop(struct sk_buff *skb, | ||
2441 | struct net_device *master); | ||
2442 | |||
2443 | static inline int skb_bond_should_drop(struct sk_buff *skb, | ||
2444 | struct net_device *master) | ||
2445 | { | ||
2446 | if (master) | ||
2447 | return __skb_bond_should_drop(skb, master); | ||
2448 | return 0; | ||
2449 | } | ||
2450 | |||
2451 | extern struct pernet_operations __net_initdata loopback_net_ops; | 2440 | extern struct pernet_operations __net_initdata loopback_net_ops; |
2452 | 2441 | ||
2453 | static inline int dev_ethtool_get_settings(struct net_device *dev, | 2442 | static inline int dev_ethtool_get_settings(struct net_device *dev, |
diff --git a/net/core/dev.c b/net/core/dev.c index 6392ea0a5910..d874fd1baf49 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -3105,7 +3105,8 @@ static inline void skb_bond_set_mac_by_master(struct sk_buff *skb, | |||
3105 | * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and | 3105 | * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and |
3106 | * ARP on active-backup slaves with arp_validate enabled. | 3106 | * ARP on active-backup slaves with arp_validate enabled. |
3107 | */ | 3107 | */ |
3108 | int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master) | 3108 | static int __skb_bond_should_drop(struct sk_buff *skb, |
3109 | struct net_device *master) | ||
3109 | { | 3110 | { |
3110 | struct net_device *dev = skb->dev; | 3111 | struct net_device *dev = skb->dev; |
3111 | 3112 | ||
@@ -3139,7 +3140,6 @@ int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master) | |||
3139 | } | 3140 | } |
3140 | return 0; | 3141 | return 0; |
3141 | } | 3142 | } |
3142 | EXPORT_SYMBOL(__skb_bond_should_drop); | ||
3143 | 3143 | ||
3144 | static int __netif_receive_skb(struct sk_buff *skb) | 3144 | static int __netif_receive_skb(struct sk_buff *skb) |
3145 | { | 3145 | { |
@@ -3177,7 +3177,7 @@ static int __netif_receive_skb(struct sk_buff *skb) | |||
3177 | if (skb->deliver_no_wcard) | 3177 | if (skb->deliver_no_wcard) |
3178 | null_or_orig = orig_dev; | 3178 | null_or_orig = orig_dev; |
3179 | else if (master) { | 3179 | else if (master) { |
3180 | if (skb_bond_should_drop(skb, master)) { | 3180 | if (__skb_bond_should_drop(skb, master)) { |
3181 | skb->deliver_no_wcard = 1; | 3181 | skb->deliver_no_wcard = 1; |
3182 | null_or_orig = orig_dev; /* deliver only exact match */ | 3182 | null_or_orig = orig_dev; /* deliver only exact match */ |
3183 | } else | 3183 | } else |