Commit 7083a45a authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller

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: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ae74abe
...@@ -1351,6 +1351,8 @@ static int ibmvnic_xmit_workarounds(struct sk_buff *skb, ...@@ -1351,6 +1351,8 @@ static int ibmvnic_xmit_workarounds(struct sk_buff *skb,
*/ */
if (skb->len < netdev->min_mtu) if (skb->len < netdev->min_mtu)
return skb_put_padto(skb, 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) 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) ...@@ -1390,7 +1392,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
goto out; goto out;
} }
if (ibmvnic_xmit_workarounds(skb, adapter)) { if (ibmvnic_xmit_workarounds(skb, netdev)) {
tx_dropped++; tx_dropped++;
tx_send_failed++; tx_send_failed++;
ret = NETDEV_TX_OK; ret = NETDEV_TX_OK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment