summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/i825xx/lib82596.c
diff options
context:
space:
mode:
authorYueHaibing2018-09-21 05:44:05 +0200
committerDavid S. Miller2018-09-22 04:15:15 +0200
commit648c361a568dcd098a3496c6c66bca4c8473e52b (patch)
tree9820aedde867c61a66dc6c4c2009ca5e3aaa1d56 /drivers/net/ethernet/i825xx/lib82596.c
parentnet: wiznet: fix return type of ndo_start_xmit function (diff)
downloadkernel-qcow2-linux-648c361a568dcd098a3496c6c66bca4c8473e52b.tar.gz
kernel-qcow2-linux-648c361a568dcd098a3496c6c66bca4c8473e52b.tar.xz
kernel-qcow2-linux-648c361a568dcd098a3496c6c66bca4c8473e52b.zip
net: i825xx: 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/i825xx/lib82596.c')
-rw-r--r--drivers/net/ethernet/i825xx/lib82596.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c
index f00a1dc2128c..2f7ae118217f 100644
--- a/drivers/net/ethernet/i825xx/lib82596.c
+++ b/drivers/net/ethernet/i825xx/lib82596.c
@@ -347,7 +347,7 @@ static const char init_setup[] =
0x7f /* *multi IA */ };
static int i596_open(struct net_device *dev);
-static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t i596_start_xmit(struct sk_buff *skb, struct net_device *dev);
static irqreturn_t i596_interrupt(int irq, void *dev_id);
static int i596_close(struct net_device *dev);
static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd);
@@ -966,7 +966,7 @@ static void i596_tx_timeout (struct net_device *dev)
}
-static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct i596_private *lp = netdev_priv(dev);
struct tx_cmd *tx_cmd;