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

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

net: amd: 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 0c13b8d1

drivers/net/ethernet/amd/am79c961a.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static void am79c961_timeout(struct net_device *dev) 
/*

 * Transmit a packet

 */

static int

static netdev_tx_t

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

{

	struct dev_priv *priv = netdev_priv(dev);

drivers/net/ethernet/amd/atarilance.c

+4 −2
Original line number Diff line number Diff line
@@ -339,7 +339,8 @@ static unsigned long lance_probe1( struct net_device *dev, struct lance_addr 
                                   *init_rec );

static int lance_open( struct net_device *dev );

static void lance_init_ring( struct net_device *dev );

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

static netdev_tx_t lance_start_xmit(struct sk_buff *skb,

				    struct net_device *dev);

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

static int lance_rx( struct net_device *dev );

static int lance_close( struct net_device *dev );
@@ -769,7 +770,8 @@ static void lance_tx_timeout (struct net_device *dev) 


/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */



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

static netdev_tx_t

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

{

	struct lance_private *lp = netdev_priv(dev);

	struct lance_ioreg	 *IO = lp->iobase;

drivers/net/ethernet/amd/declance.c

+1 −1
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static void lance_tx_timeout(struct net_device *dev) 
	netif_wake_queue(dev);

}



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

static netdev_tx_t lance_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct lance_private *lp = netdev_priv(dev);

	volatile struct lance_regs *ll = lp->ll;

drivers/net/ethernet/amd/sun3lance.c

+4 −2
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ struct lance_private { 
static int lance_probe( struct net_device *dev);

static int lance_open( struct net_device *dev );

static void lance_init_ring( struct net_device *dev );

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

static netdev_tx_t lance_start_xmit(struct sk_buff *skb,

				    struct net_device *dev);

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

static int lance_rx( struct net_device *dev );

static int lance_close( struct net_device *dev );
@@ -511,7 +512,8 @@ static void lance_init_ring( struct net_device *dev ) 
}





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

static netdev_tx_t

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

{

	struct lance_private *lp = netdev_priv(dev);

	int entry, len;

drivers/net/ethernet/amd/sunlance.c

+1 −1
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ static void lance_tx_timeout(struct net_device *dev) 
	netif_wake_queue(dev);

}



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

static netdev_tx_t lance_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct lance_private *lp = netdev_priv(dev);

	int entry, skblen, len;