diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-02-11 19:46:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-13 13:42:06 -0500 |
commit | d59cfde2fb960b5970ccb5a38cea25d38b37a8e8 (patch) | |
tree | 4ccf7fe4c8cc5a128885e60bd417253d3ec9b24a /net/core | |
parent | d5e219c3a2389f31b18e4ca55c33a12adaadf565 (diff) |
net: remove the unnecessary dance around skb_bond_should_drop
No need to check (master) twice and to drive in and out the header file.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Reviewed-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 |