Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netpoll: Fix use correct return type for ndo_start_xmit()

The method ndo_start_xmit() returns a value of type netdev_tx_t. Fix
the ndo function to use the correct type.

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Yunjian Wang and committed by
David S. Miller
a54776f2 00b5aac5

+5 -4
+5 -4
net/core/netpoll.c
··· 69 69 #define np_notice(np, fmt, ...) \ 70 70 pr_notice("%s: " fmt, np->name, ##__VA_ARGS__) 71 71 72 - static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev, 73 - struct netdev_queue *txq) 72 + static netdev_tx_t netpoll_start_xmit(struct sk_buff *skb, 73 + struct net_device *dev, 74 + struct netdev_queue *txq) 74 75 { 75 - int status = NETDEV_TX_OK; 76 + netdev_tx_t status = NETDEV_TX_OK; 76 77 netdev_features_t features; 77 78 78 79 features = netif_skb_features(skb); ··· 308 307 void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, 309 308 struct net_device *dev) 310 309 { 311 - int status = NETDEV_TX_BUSY; 310 + netdev_tx_t status = NETDEV_TX_BUSY; 312 311 unsigned long tries; 313 312 /* It is up to the caller to keep npinfo alive. */ 314 313 struct netpoll_info *npinfo;