diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-02-12 00:46:06 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-13 10:42:06 -0800 |
| commit | d59cfde2fb960b5970ccb5a38cea25d38b37a8e8 (patch) | |
| tree | 4ccf7fe4c8cc5a128885e60bd417253d3ec9b24a /net/core | |
| parent | d5e219c3a2389f31b18e4ca55c33a12adaadf565 (diff) | |
| download | blackbird-op-linux-d59cfde2fb960b5970ccb5a38cea25d38b37a8e8.tar.gz blackbird-op-linux-d59cfde2fb960b5970ccb5a38cea25d38b37a8e8.zip | |
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, * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and * ARP on active-backup slaves with arp_validate enabled. */ -int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master) +static int __skb_bond_should_drop(struct sk_buff *skb, + struct net_device *master) { struct net_device *dev = skb->dev; @@ -3139,7 +3140,6 @@ int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master) } return 0; } -EXPORT_SYMBOL(__skb_bond_should_drop); static int __netif_receive_skb(struct sk_buff *skb) { @@ -3177,7 +3177,7 @@ static int __netif_receive_skb(struct sk_buff *skb) if (skb->deliver_no_wcard) null_or_orig = orig_dev; else if (master) { - if (skb_bond_should_drop(skb, master)) { + if (__skb_bond_should_drop(skb, master)) { skb->deliver_no_wcard = 1; null_or_orig = orig_dev; /* deliver only exact match */ } else |
