Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 648c361a authored by YueHaibing's avatar YueHaibing Committed by David S. Miller
Browse files

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: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0f25516

drivers/net/ethernet/i825xx/ether1.c

+3 −2
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ static unsigned int net_debug = NET_DEBUG; 
#define RX_AREA_END	0x0fc00



static int ether1_open(struct net_device *dev);

static int ether1_sendpacket(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t ether1_sendpacket(struct sk_buff *skb,

				     struct net_device *dev);

static irqreturn_t ether1_interrupt(int irq, void *dev_id);

static int ether1_close(struct net_device *dev);

static void ether1_setmulticastlist(struct net_device *dev);
@@ -667,7 +668,7 @@ ether1_timeout(struct net_device *dev) 
	netif_wake_queue(dev);

}



static int

static netdev_tx_t

ether1_sendpacket (struct sk_buff *skb, struct net_device *dev)

{

	int tmp, tst, nopaddr, txaddr, tbdaddr, dataddr;

drivers/net/ethernet/i825xx/lib82596.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/i825xx/sun3_82586.c

+4 −2
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@ static int sun3_82586_probe1(struct net_device *dev,int ioaddr); 
static irqreturn_t sun3_82586_interrupt(int irq,void *dev_id);

static int     sun3_82586_open(struct net_device *dev);

static int     sun3_82586_close(struct net_device *dev);

static int     sun3_82586_send_packet(struct sk_buff *,struct net_device *);

static netdev_tx_t     sun3_82586_send_packet(struct sk_buff *,

					      struct net_device *);

static struct  net_device_stats *sun3_82586_get_stats(struct net_device *dev);

static void    set_multicast_list(struct net_device *dev);

static void    sun3_82586_timeout(struct net_device *dev);
@@ -1002,7 +1003,8 @@ static void sun3_82586_timeout(struct net_device *dev) 
 * send frame

 */



static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t

sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)

{

	int len,i;

#ifndef NO_NOPCOMMANDS