mirror of
https://github.com/torvalds/linux.git
synced 2024-12-11 21:52:04 +00:00
ibmvnic: Fix recent errata commit
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> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
8ae74abe78
commit
7083a45ad0
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user