UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: toshiba: 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: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YueHaibing 2018-09-19 18:23:39 +08:00 committed by David S. Miller
parent f03508ce3f
commit bacade8225
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/toshiba/ps3_gelic_net.c
View File

@ -845,9 +845,9 @@ static int gelic_card_kick_txdma(struct gelic_card *card,
* @skb: packet to send out * @skb: packet to send out
* @netdev: interface device structure * @netdev: interface device structure
* *
* returns 0 on success, <0 on failure * returns NETDEV_TX_OK on success, NETDEV_TX_BUSY on failure
*/ */
int gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev) netdev_tx_t gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
{ {
struct gelic_card *card = netdev_card(netdev); struct gelic_card *card = netdev_card(netdev);
struct gelic_descr *descr; struct gelic_descr *descr;

2
drivers/net/ethernet/toshiba/ps3_gelic_net.h
View File

@ -370,7 +370,7 @@ void gelic_card_up(struct gelic_card *card);
void gelic_card_down(struct gelic_card *card); void gelic_card_down(struct gelic_card *card);
int gelic_net_open(struct net_device *netdev); int gelic_net_open(struct net_device *netdev);
int gelic_net_stop(struct net_device *netdev); int gelic_net_stop(struct net_device *netdev);
int gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev); netdev_tx_t gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev);
void gelic_net_set_multi(struct net_device *netdev); void gelic_net_set_multi(struct net_device *netdev);
void gelic_net_tx_timeout(struct net_device *netdev); void gelic_net_tx_timeout(struct net_device *netdev);
int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card); int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card);

4
drivers/net/ethernet/toshiba/spider_net.c
View File

@ -880,9 +880,9 @@ out:
* @skb: packet to send out * @skb: packet to send out
* @netdev: interface device structure * @netdev: interface device structure
* *
* returns 0 on success, !0 on failure * returns NETDEV_TX_OK on success, NETDEV_TX_BUSY on failure
*/ */
static int static netdev_tx_t
spider_net_xmit(struct sk_buff *skb, struct net_device *netdev) spider_net_xmit(struct sk_buff *skb, struct net_device *netdev)
{ {
int cnt; int cnt;

6
drivers/net/ethernet/toshiba/tc35815.c
View File

@ -474,7 +474,8 @@ static void free_rxbuf_skb(struct pci_dev *hwdev, struct sk_buff *skb, dma_addr_
/* Index to functions, as function prototypes. */ /* Index to functions, as function prototypes. */
static int tc35815_open(struct net_device *dev); static int tc35815_open(struct net_device *dev);
static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t tc35815_send_packet(struct sk_buff *skb,
struct net_device *dev);
static irqreturn_t tc35815_interrupt(int irq, void *dev_id); static irqreturn_t tc35815_interrupt(int irq, void *dev_id);
static int tc35815_rx(struct net_device *dev, int limit); static int tc35815_rx(struct net_device *dev, int limit);
static int tc35815_poll(struct napi_struct *napi, int budget); static int tc35815_poll(struct napi_struct *napi, int budget);
@ -1248,7 +1249,8 @@ tc35815_open(struct net_device *dev)
* invariant will hold if you make sure that the netif_*_queue() * invariant will hold if you make sure that the netif_*_queue()
* calls are done at the proper times. * calls are done at the proper times.
*/ */
static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t
tc35815_send_packet(struct sk_buff *skb, struct net_device *dev)
{ {
struct tc35815_local *lp = netdev_priv(dev); struct tc35815_local *lp = netdev_priv(dev);
struct TxFD *txfd; struct TxFD *txfd;