| Message ID | 20210721023439.1018976-1-sukadev@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net,1/1] ibmvnic: Remove the proper scrq flush | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Tue, 20 Jul 2021 19:34:39 -0700 you wrote: > 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. > > [...] Here is the summary with links: - [net,1/1] ibmvnic: Remove the proper scrq flush https://git.kernel.org/netdev/net/c/bb55362bd697 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index d193023b6f30..8ab1b6f9fdde 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1895,7 +1895,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; } @@ -1917,6 +1916,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; }
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> --- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)