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

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

net: broadcom: 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 81255af8

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+3 −2
Original line number Diff line number Diff line
@@ -568,12 +568,13 @@ static irqreturn_t bcm_enet_isr_dma(int irq, void *dev_id) 
/*

 * tx request callback

 */

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

static netdev_tx_t

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

{

	struct bcm_enet_priv *priv;

	struct bcm_enet_desc *desc;

	u32 len_stat;

	int ret;

	netdev_tx_t ret;



	priv = netdev_priv(dev);

drivers/net/ethernet/broadcom/sb1250-mac.c

+2 −2
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static enum sbmac_state sbmac_set_channel_state(struct sbmac_softc *, 
static void sbmac_promiscuous_mode(struct sbmac_softc *sc, int onoff);

static uint64_t sbmac_addr2reg(unsigned char *ptr);

static irqreturn_t sbmac_intr(int irq, void *dev_instance);

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

static netdev_tx_t sbmac_start_tx(struct sk_buff *skb, struct net_device *dev);

static void sbmac_setmulti(struct sbmac_softc *sc);

static int sbmac_init(struct platform_device *pldev, long long base);

static int sbmac_set_speed(struct sbmac_softc *s, enum sbmac_speed speed);
@@ -2028,7 +2028,7 @@ static irqreturn_t sbmac_intr(int irq,void *dev_instance) 
 *  Return value:

 *  	   nothing

 ********************************************************************* */

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

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

{

	struct sbmac_softc *sc = netdev_priv(dev);

	unsigned long flags;