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

Commit d1e2e5cd authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

bonding: make TX_QUEUE_OVERRIDE() macro an inline function 



Also, make it accept bonding as a parameter and change the name a bit to
better reflect its scope.

CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarVeaceslav Falico <vfalico@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent befb903a

drivers/net/bonding/bond_main.c

+3 −4
Original line number Diff line number Diff line
@@ -3788,10 +3788,9 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev 
{

	struct bonding *bond = netdev_priv(dev);



	if (TX_QUEUE_OVERRIDE(bond->params.mode)) {

		if (!bond_slave_override(bond, skb))

	if (bond_should_override_tx_queue(bond) &&

	    !bond_slave_override(bond, skb))

		return NETDEV_TX_OK;

	}



	switch (bond->params.mode) {

	case BOND_MODE_ROUNDROBIN:

drivers/net/bonding/bonding.h

+6 −4
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ 
		 ((mode) == BOND_MODE_TLB)	||	\

		 ((mode) == BOND_MODE_ALB))



#define TX_QUEUE_OVERRIDE(mode)				\

			(((mode) == BOND_MODE_ACTIVEBACKUP) ||	\

			 ((mode) == BOND_MODE_ROUNDROBIN))



#define IS_IP_TARGET_UNUSABLE_ADDRESS(a)	\

	((htonl(INADDR_BROADCAST) == a) ||	\

	 ipv4_is_zeronet(a))
@@ -284,6 +280,12 @@ static inline struct bonding *bond_get_bond_by_slave(struct slave *slave) 
	return slave->bond;

}



static inline bool bond_should_override_tx_queue(struct bonding *bond)

{

	return bond->params.mode == BOND_MODE_ACTIVEBACKUP ||

	       bond->params.mode == BOND_MODE_ROUNDROBIN;

}



static inline bool bond_is_lb(const struct bonding *bond)

{

	return bond->params.mode == BOND_MODE_TLB ||