Commit bb55362b authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by David S. Miller
Browse files

ibmvnic: Remove the proper scrq flush 



Commit 65d6470d ("ibmvnic: clean pending indirect buffs during reset")
intended to remove the call to ibmvnic_tx_scrq_flush() when the
->resetting flag is true and was tested that way. But during the final
rebase to net-next, the hunk got applied to a block few lines below
(which happened to have the same diff context) and the wrong call to
ibmvnic_tx_scrq_flush() got removed.

Fix that by removing the correct ibmvnic_tx_scrq_flush() and restoring
the one that was incorrectly removed.

Fixes: 65d6470d ("ibmvnic: clean pending indirect buffs during reset")
Reported-by: default avatarDany Madden <drt@linux.ibm.com>
Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ddaed6b

drivers/net/ethernet/ibm/ibmvnic.c

+1 −1
Original line number Diff line number Diff line
@@ -1731,7 +1731,6 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) 
		tx_send_failed++;

		tx_dropped++;

		ret = NETDEV_TX_OK;

		ibmvnic_tx_scrq_flush(adapter, tx_scrq);

		goto out;

	}
@@ -1753,6 +1752,7 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) 
		dev_kfree_skb_any(skb);

		tx_send_failed++;

		tx_dropped++;

		ibmvnic_tx_scrq_flush(adapter, tx_scrq);

		ret = NETDEV_TX_OK;

		goto out;

	}