diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2018-09-18 14:19:05 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-18 20:02:29 -0700 |
| commit | ac1172dea10b6ba51de9346d3130db688b5196c5 (patch) | |
| tree | d930d2a5ca8e1545ff3f38083acb4f8b46b57530 /drivers/net/ethernet/cavium/octeon | |
| parent | c9c3941186c5637caed131c4f4064411d6882299 (diff) | |
| download | linux-ac1172dea10b6ba51de9346d3130db688b5196c5.tar.bz2 | |
net: cavium: 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/cavium/octeon')
| -rw-r--r-- | drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c index bb43ddb7539e..4b3aecf98f2a 100644 --- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c @@ -1268,12 +1268,13 @@ static int octeon_mgmt_stop(struct net_device *netdev) return 0; } -static int octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t +octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev) { struct octeon_mgmt *p = netdev_priv(netdev); union mgmt_port_ring_entry re; unsigned long flags; - int rv = NETDEV_TX_BUSY; + netdev_tx_t rv = NETDEV_TX_BUSY; re.d64 = 0; re.s.tstamp = ((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) != 0); |