| From 817278298dabcd9930a62c1d7b1bd72008dce4cb Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 20 Jul 2021 19:34:39 -0700 |
| Subject: ibmvnic: Remove the proper scrq flush |
| |
| From: Sukadev Bhattiprolu <sukadev@linux.ibm.com> |
| |
| [ Upstream commit bb55362bd6976631b662ca712779b6532d8de0a6 ] |
| |
| Commit 65d6470d139a ("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: 65d6470d139a ("ibmvnic: clean pending indirect buffs during reset") |
| Reported-by: Dany Madden <drt@linux.ibm.com> |
| Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/ibm/ibmvnic.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c |
| index efc98903c0b7..5b4a7ef7dffa 100644 |
| --- a/drivers/net/ethernet/ibm/ibmvnic.c |
| +++ b/drivers/net/ethernet/ibm/ibmvnic.c |
| @@ -1707,7 +1707,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; |
| } |
| |
| @@ -1729,6 +1728,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; |
| } |
| -- |
| 2.30.2 |
| |
