Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d59cfde2 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jpirko@redhat.com>
Reviewed-by: default avatarNicolas de Pesloüan <nicolas.2p.debian@free.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5e219c3

include/linux/netdevice.h

+0 −11
Original line number Diff line number Diff line
@@ -2437,17 +2437,6 @@ static inline void netif_set_gso_max_size(struct net_device *dev, 
	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;



static inline int dev_ethtool_get_settings(struct net_device *dev,

net/core/dev.c

+3 −3
Original line number Diff line number Diff line
@@ -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