xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: remove the unnecessary dance around skb_bond_should_drop

Browse Source 
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>
This commit is contained in:
Jiri Pirko
2011-02-12 00:46:06 +00:00
committed by David S. Miller
parent d5e219c3a2
commit d59cfde2fb
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/netdevice.h
View File

@@ -2437,17 +2437,6 @@ static inline void netif_set_gso_max_size(struct net_device *dev,
dev->gso_max_size = size; dev->gso_max_size = size;
} }
extern int __skb_bond_should_drop(struct sk_buff *skb,
struct net_device *master);
static inline int skb_bond_should_drop(struct sk_buff *skb,
struct net_device *master)
{
if (master)
return __skb_bond_should_drop(skb, master);
return 0;
}
extern struct pernet_operations __net_initdata loopback_net_ops; extern struct pernet_operations __net_initdata loopback_net_ops;
static inline int dev_ethtool_get_settings(struct net_device *dev, static inline int dev_ethtool_get_settings(struct net_device *dev,

6
net/core/dev.c
View File

@@ -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 * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and
* ARP on active-backup slaves with arp_validate enabled. * 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; 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; return 0;
} }
EXPORT_SYMBOL(__skb_bond_should_drop);
static int __netif_receive_skb(struct sk_buff *skb) 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) if (skb->deliver_no_wcard)
null_or_orig = orig_dev; null_or_orig = orig_dev;
else if (master) { else if (master) {
if (skb_bond_should_drop(skb, master)) { if (__skb_bond_should_drop(skb, master)) {
skb->deliver_no_wcard = 1; skb->deliver_no_wcard = 1;
null_or_orig = orig_dev; /* deliver only exact match */ null_or_orig = orig_dev; /* deliver only exact match */
} else } else