| Message ID | 1520906726-5565-1-git-send-email-tlfalcon@linux.vnet.ibm.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] ibmvnic: Fix recent errata commit | expand |
From: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> Date: Mon, 12 Mar 2018 21:05:26 -0500 > Sorry, one of the patches I sent in an earlier series > has some dumb mistakes. One was that I had changed the > parameter for the errata workaround function but forgot > to make that change in the code that called it. > > The second mistake was a forgotten return value at the end > of the function in case the workaround was not needed. > > Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> Applied, thanks Thomas.
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index e02d3b9..6ff43d7 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1351,6 +1351,8 @@ static int ibmvnic_xmit_workarounds(struct sk_buff *skb, */ if (skb->len < netdev->min_mtu) return skb_put_padto(skb, netdev->min_mtu); + + return 0; } static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) @@ -1390,7 +1392,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) goto out; } - if (ibmvnic_xmit_workarounds(skb, adapter)) { + if (ibmvnic_xmit_workarounds(skb, netdev)) { tx_dropped++; tx_send_failed++; ret = NETDEV_TX_OK;
Sorry, one of the patches I sent in an earlier series has some dumb mistakes. One was that I had changed the parameter for the errata workaround function but forgot to make that change in the code that called it. The second mistake was a forgotten return value at the end of the function in case the workaround was not needed. Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> --- drivers/net/ethernet/ibm/ibmvnic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)