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

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

net: sun: 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, but the implementation in this
driver returns an 'int'.

Found by coccinelle.

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Acked-by: default avatarShannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe72352e

drivers/net/ethernet/sun/ldmvsw.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static u16 vsw_select_queue(struct net_device *dev, struct sk_buff *skb, 
}



/* Wrappers to common functions */

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

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

{

	return sunvnet_start_xmit_common(skb, dev, vsw_tx_port_find);

}

drivers/net/ethernet/sun/sunbmac.c

+2 −1
Original line number Diff line number Diff line
@@ -950,7 +950,8 @@ static void bigmac_tx_timeout(struct net_device *dev) 
}



/* Put a packet on the wire. */

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

static netdev_tx_t

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

{

	struct bigmac *bp = netdev_priv(dev);

	int len, entry;

drivers/net/ethernet/sun/sunqe.c

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ static void qe_tx_timeout(struct net_device *dev) 
}



/* Get a packet queued to go onto the wire. */

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

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

{

	struct sunqe *qep = netdev_priv(dev);

	struct sunqe_buffers *qbufs = qep->buffers;

drivers/net/ethernet/sun/sunvnet.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static u16 vnet_select_queue(struct net_device *dev, struct sk_buff *skb, 
}



/* Wrappers to common functions */

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

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

{

	return sunvnet_start_xmit_common(skb, dev, vnet_tx_port_find);

}

drivers/net/ethernet/sun/sunvnet_common.c

+8 −6
Original line number Diff line number Diff line
@@ -1216,7 +1216,8 @@ static inline struct sk_buff *vnet_skb_shape(struct sk_buff *skb, int ncookies) 
	return skb;

}



static int vnet_handle_offloads(struct vnet_port *port, struct sk_buff *skb,

static netdev_tx_t

vnet_handle_offloads(struct vnet_port *port, struct sk_buff *skb,

		     struct vnet_port *(*vnet_tx_port)

		     (struct sk_buff *, struct net_device *))

{
@@ -1321,7 +1322,8 @@ static int vnet_handle_offloads(struct vnet_port *port, struct sk_buff *skb, 
	return NETDEV_TX_OK;

}



int sunvnet_start_xmit_common(struct sk_buff *skb, struct net_device *dev,

netdev_tx_t

sunvnet_start_xmit_common(struct sk_buff *skb, struct net_device *dev,

			  struct vnet_port *(*vnet_tx_port)

			  (struct sk_buff *, struct net_device *))

{