diff options
| author |   YueHaibing <yuehaibing@huawei.com> | 2018-09-18 14:35:47 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-09-18 20:03:37 -0700 |
| commit | 94b2bb28dbb43fcb943d5275ab19fd5a4972bedb (patch) | |
| tree | f8dd66e645c8799199cb3c75c5394da5eaa04b00 /drivers/net/ethernet/ibm/ibmvnic.c | |
| parent | net: cavium: fix return type of ndo_start_xmit function (diff) | |
| download | linux-dev-94b2bb28dbb43fcb943d5275ab19fd5a4972bedb.tar.xz linux-dev-94b2bb28dbb43fcb943d5275ab19fd5a4972bedb.zip | |
net: ibm: fix return type of ndo_start_xmit function
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, so make sure the implementation in
this driver has returns 'netdev_tx_t' value, and change the function
return type to netdev_tx_t.
Found by coccinelle.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmvnic.c')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 4f0daf67b18d..a8369addfe68 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1428,7 +1428,7 @@ static int ibmvnic_xmit_workarounds(struct sk_buff *skb, return 0; } -static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) { struct ibmvnic_adapter *adapter = netdev_priv(netdev); int queue_num = skb_get_queue_mapping(skb); @@ -1452,7 +1452,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) u64 *handle_array; int index = 0; u8 proto = 0; - int ret = 0; + netdev_tx_t ret = NETDEV_TX_OK; if (adapter->resetting) { if (!netif_subqueue_stopped(netdev, skb)) |