Skip to content

Commit 7083a45

Browse files
tlfalcondavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 8ae74ab commit 7083a45

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1351,6 +1351,8 @@ static int ibmvnic_xmit_workarounds(struct sk_buff *skb,
13511351
*/
13521352
if (skb->len < netdev->min_mtu)
13531353
return skb_put_padto(skb, netdev->min_mtu);
1354+
1355+
return 0;
13541356
}
13551357

13561358
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)
13901392
goto out;
13911393
}
13921394

1393-
if (ibmvnic_xmit_workarounds(skb, adapter)) {
1395+
if (ibmvnic_xmit_workarounds(skb, netdev)) {
13941396
tx_dropped++;
13951397
tx_send_failed++;
13961398
ret = NETDEV_TX_OK;

0 commit comments

Comments
 (0)