diff options
| author | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2020-06-28 21:53:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-29 05:52:53 +0200 |
| commit | 4e516a35eb01864b82c7f36fdac94ac9a9b71c3f (patch) | |
| tree | 6f76f93377acdb887427199e8350f050720a8657 /drivers/net/ethernet/oki-semi | |
| parent | net: nfp: fix nfp_net_tx()'s return type (diff) | |
| download | linux-4e516a35eb01864b82c7f36fdac94ac9a9b71c3f.tar.xz linux-4e516a35eb01864b82c7f36fdac94ac9a9b71c3f.zip | |
net: pch_gbe: fix pch_gbe_xmit_frame()'s return type
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, but the implementation in this
driver returns an 'int'.
Fix this by returning 'netdev_tx_t' in this driver too.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/oki-semi')
| -rw-r--r-- | drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 73ec195fbc30..23f7c76737c9 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -2064,7 +2064,7 @@ static int pch_gbe_stop(struct net_device *netdev) * - NETDEV_TX_OK: Normal end * - NETDEV_TX_BUSY: Error end */ -static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev) { struct pch_gbe_adapter *adapter = netdev_priv(netdev); struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring; |