diff options
| author |   Yunjian Wang <wangyunjian@huawei.com> | 2020-05-05 10:49:20 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-05-05 11:14:40 -0700 |
| commit | 09f6c44aaae0f1bdb8b983d7762676d5018c53bc (patch) | |
| tree | 6faaacaad62630e8ad03da18822c82da19c8d1b1 /drivers/net | |
| parent | Merge branch 'net-reduce-dynamic-lockdep-keys' (diff) | |
| download | wireguard-linux-09f6c44aaae0f1bdb8b983d7762676d5018c53bc.tar.xz wireguard-linux-09f6c44aaae0f1bdb8b983d7762676d5018c53bc.zip | |
net: allwinner: Fix use correct return type for ndo_start_xmit()
The method ndo_start_xmit() returns a value of type netdev_tx_t. Fix
the ndo function to use the correct type. And emac_start_xmit() can
leak one skb if 'channel' == 3.
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/allwinner/sun4i-emac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index 18d3b4340bd4..b3b8a8010142 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -417,7 +417,7 @@ static void emac_timeout(struct net_device *dev, unsigned int txqueue) /* Hardware start transmission. * Send a packet to media from the upper layer. */ -static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t emac_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct emac_board_info *db = netdev_priv(dev); unsigned long channel; @@ -425,7 +425,7 @@ static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev) channel = db->tx_fifo_stat & 3; if (channel == 3) - return 1; + return NETDEV_TX_BUSY; channel = (channel == 1 ? 1 : 0); |