diff options
| author | Thomas Falcon <tlfalcon@linux.vnet.ibm.com> | 2018-03-12 21:05:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-13 10:26:49 -0400 |
| commit | 7083a45ad0df78546b3a735f0090b075efdf44e3 (patch) | |
| tree | 255b45f298c2cc5fbe3132a5fb9e738944dcc5ad /drivers/net/ethernet/ibm | |
| parent | 8ae74abe78e3742072287317e8a2c324ea5ce7bc (diff) | |
| download | talos-op-linux-7083a45ad0df78546b3a735f0090b075efdf44e3.tar.gz talos-op-linux-7083a45ad0df78546b3a735f0090b075efdf44e3.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/ibm')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index e02d3b9aaf15..6ff43d7e5a72 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; |
