p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: YueHaibing <yuehaibing@huawei.com>
Acked-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YueHaibing 2018-09-19 19:21:32 +08:00 committed by David S. Miller
parent fe72352e37
commit 0e0cc31f69
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/sun/ldmvsw.c
View File

@ -113,7 +113,7 @@ static u16 vsw_select_queue(struct net_device *dev, struct sk_buff *skb,
} }
/* Wrappers to common functions */ /* 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); return sunvnet_start_xmit_common(skb, dev, vsw_tx_port_find);
} }

3
drivers/net/ethernet/sun/sunbmac.c
View File

@ -950,7 +950,8 @@ static void bigmac_tx_timeout(struct net_device *dev)
} }
/* Put a packet on the wire. */ /* 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); struct bigmac *bp = netdev_priv(dev);
int len, entry; int len, entry;

2
drivers/net/ethernet/sun/sunqe.c
View File

@ -570,7 +570,7 @@ static void qe_tx_timeout(struct net_device *dev)
} }
/* Get a packet queued to go onto the wire. */ /* 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 *qep = netdev_priv(dev);
struct sunqe_buffers *qbufs = qep->buffers; struct sunqe_buffers *qbufs = qep->buffers;

2
drivers/net/ethernet/sun/sunvnet.c
View File

@ -247,7 +247,7 @@ static u16 vnet_select_queue(struct net_device *dev, struct sk_buff *skb,
} }
/* Wrappers to common functions */ /* 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); return sunvnet_start_xmit_common(skb, dev, vnet_tx_port_find);
} }

14
drivers/net/ethernet/sun/sunvnet_common.c
View File

@ -1216,9 +1216,10 @@ static inline struct sk_buff *vnet_skb_shape(struct sk_buff *skb, int ncookies)
return skb; return skb;
} }
static int vnet_handle_offloads(struct vnet_port *port, struct sk_buff *skb, static netdev_tx_t
struct vnet_port *(*vnet_tx_port) vnet_handle_offloads(struct vnet_port *port, struct sk_buff *skb,
(struct sk_buff *, struct net_device *)) struct vnet_port *(*vnet_tx_port)
(struct sk_buff *, struct net_device *))
{ {
struct net_device *dev = VNET_PORT_TO_NET_DEVICE(port); struct net_device *dev = VNET_PORT_TO_NET_DEVICE(port);
struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_TX_RING]; struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_TX_RING];
@ -1321,9 +1322,10 @@ static int vnet_handle_offloads(struct vnet_port *port, struct sk_buff *skb,
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
int sunvnet_start_xmit_common(struct sk_buff *skb, struct net_device *dev, netdev_tx_t
struct vnet_port *(*vnet_tx_port) sunvnet_start_xmit_common(struct sk_buff *skb, struct net_device *dev,
(struct sk_buff *, struct net_device *)) struct vnet_port *(*vnet_tx_port)
(struct sk_buff *, struct net_device *))
{ {
struct vnet_port *port = NULL; struct vnet_port *port = NULL;
struct vio_dring_state *dr; struct vio_dring_state *dr;

7
drivers/net/ethernet/sun/sunvnet_common.h
View File

@ -136,9 +136,10 @@ int sunvnet_close_common(struct net_device *dev);
void sunvnet_set_rx_mode_common(struct net_device *dev, struct vnet *vp); void sunvnet_set_rx_mode_common(struct net_device *dev, struct vnet *vp);
int sunvnet_set_mac_addr_common(struct net_device *dev, void *p); int sunvnet_set_mac_addr_common(struct net_device *dev, void *p);
void sunvnet_tx_timeout_common(struct net_device *dev); void sunvnet_tx_timeout_common(struct net_device *dev);
int sunvnet_start_xmit_common(struct sk_buff *skb, struct net_device *dev, netdev_tx_t
struct vnet_port *(*vnet_tx_port) sunvnet_start_xmit_common(struct sk_buff *skb, struct net_device *dev,
(struct sk_buff *, struct net_device *)); struct vnet_port *(*vnet_tx_port)
(struct sk_buff *, struct net_device *));
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
void sunvnet_poll_controller_common(struct net_device *dev, struct vnet *vp); void sunvnet_poll_controller_common(struct net_device *dev, struct vnet *vp);
#endif #endif