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

Commit 5a6b9917 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bonding-next' 



Ding Tianhong says:

====================
bonding: slight optimization and avoid spam for bond xmit path

v1->v2: Add ratelimit for debugging is not a good idea, it will miss some message
	if the user turns the debugging on, so remove the patch 3.
	use net_err_ratelimited instead of pr_err_ratelimited and use __func__ instead of
	bond_xmit_broadcast().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7aceb47a 9152e26d

drivers/net/bonding/bond_main.c

+5 −5
Original line number Diff line number Diff line
@@ -2957,7 +2957,7 @@ static bool bond_flow_dissect(struct bonding *bond, struct sk_buff *skb, 
	fk->ports = 0;

	noff = skb_network_offset(skb);

	if (skb->protocol == htons(ETH_P_IP)) {

		if (!pskb_may_pull(skb, noff + sizeof(*iph)))

		if (unlikely(!pskb_may_pull(skb, noff + sizeof(*iph))))

			return false;

		iph = ip_hdr(skb);

		fk->src = iph->saddr;
@@ -2966,7 +2966,7 @@ static bool bond_flow_dissect(struct bonding *bond, struct sk_buff *skb, 
		if (!ip_is_fragment(iph))

			proto = iph->protocol;

	} else if (skb->protocol == htons(ETH_P_IPV6)) {

		if (!pskb_may_pull(skb, noff + sizeof(*iph6)))

		if (unlikely(!pskb_may_pull(skb, noff + sizeof(*iph6))))

			return false;

		iph6 = ipv6_hdr(skb);

		fk->src = (__force __be32)ipv6_addr_hash(&iph6->saddr);
@@ -3656,8 +3656,8 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev) 
			struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);



			if (!skb2) {

				pr_err("%s: Error: bond_xmit_broadcast(): skb_clone() failed\n",

				       bond_dev->name);

				net_err_ratelimited("%s: Error: %s: skb_clone() failed\n",

						    bond_dev->name, __func__);

				continue;

			}

			/* bond_dev_queue_xmit always returns 0 */
@@ -3768,7 +3768,7 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	 * If we risk deadlock from transmitting this in the

	 * netpoll path, tell netpoll to queue the frame for later tx

	 */

	if (is_netpoll_tx_blocked(dev))

	if (unlikely(is_netpoll_tx_blocked(dev)))

		return NETDEV_TX_BUSY;



	rcu_read_lock();