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

Commit acbbc071 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: uninline skb_bond_should_drop() 



skb_bond_should_drop() is too big to be inlined.

This patch reduces kernel text size, and its compilation time as well
(shrinking include/linux/netdevice.h)

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 829e0015

include/linux/netdevice.h

+4 −44
Original line number Diff line number Diff line
@@ -2089,54 +2089,14 @@ static inline void netif_set_gso_max_size(struct net_device *dev, 
	dev->gso_max_size = size;

}



static inline void skb_bond_set_mac_by_master(struct sk_buff *skb,

					      struct net_device *master)

{

	if (skb->pkt_type == PACKET_HOST) {

		u16 *dest = (u16 *) eth_hdr(skb)->h_dest;



		memcpy(dest, master->dev_addr, ETH_ALEN);

	}

}

extern int __skb_bond_should_drop(struct sk_buff *skb,

				  struct net_device *master);



/* On bonding slaves other than the currently active slave, suppress

 * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and

 * ARP on active-backup slaves with arp_validate enabled.

 */

static inline int skb_bond_should_drop(struct sk_buff *skb,

				       struct net_device *master)

{

	if (master) {

		struct net_device *dev = skb->dev;



		if (master->priv_flags & IFF_MASTER_ARPMON)

			dev->last_rx = jiffies;



		if ((master->priv_flags & IFF_MASTER_ALB) && master->br_port) {

			/* Do address unmangle. The local destination address

			 * will be always the one master has. Provides the right

			 * functionality in a bridge.

			 */

			skb_bond_set_mac_by_master(skb, master);

		}



		if (dev->priv_flags & IFF_SLAVE_INACTIVE) {

			if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&

			    skb->protocol == __cpu_to_be16(ETH_P_ARP))

				return 0;



			if (master->priv_flags & IFF_MASTER_ALB) {

				if (skb->pkt_type != PACKET_BROADCAST &&

				    skb->pkt_type != PACKET_MULTICAST)

					return 0;

			}

			if (master->priv_flags & IFF_MASTER_8023AD &&

			    skb->protocol == __cpu_to_be16(ETH_P_SLOW))

				return 0;



			return 1;

		}

	}

	if (master)

		return __skb_bond_should_drop(skb, master);

	return 0;

}

net/core/dev.c

+49 −0
Original line number Diff line number Diff line
@@ -2646,6 +2646,55 @@ void netif_nit_deliver(struct sk_buff *skb) 
	rcu_read_unlock();

}



static inline void skb_bond_set_mac_by_master(struct sk_buff *skb,

					      struct net_device *master)

{

	if (skb->pkt_type == PACKET_HOST) {

		u16 *dest = (u16 *) eth_hdr(skb)->h_dest;



		memcpy(dest, master->dev_addr, ETH_ALEN);

	}

}



/* On bonding slaves other than the currently active slave, suppress

 * 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)

{

	struct net_device *dev = skb->dev;



	if (master->priv_flags & IFF_MASTER_ARPMON)

		dev->last_rx = jiffies;



	if ((master->priv_flags & IFF_MASTER_ALB) && master->br_port) {

		/* Do address unmangle. The local destination address

		 * will be always the one master has. Provides the right

		 * functionality in a bridge.

		 */

		skb_bond_set_mac_by_master(skb, master);

	}



	if (dev->priv_flags & IFF_SLAVE_INACTIVE) {

		if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&

		    skb->protocol == __cpu_to_be16(ETH_P_ARP))

			return 0;



		if (master->priv_flags & IFF_MASTER_ALB) {

			if (skb->pkt_type != PACKET_BROADCAST &&

			    skb->pkt_type != PACKET_MULTICAST)

				return 0;

		}

		if (master->priv_flags & IFF_MASTER_8023AD &&

		    skb->protocol == __cpu_to_be16(ETH_P_SLOW))

			return 0;



		return 1;

	}

	return 0;

}

EXPORT_SYMBOL(__skb_bond_should_drop);



static int __netif_receive_skb(struct sk_buff *skb)

{

	struct packet_type *ptype, *pt_prev;