Commit a54776f2 authored by Yunjian Wang's avatar Yunjian Wang Committed by David S. Miller

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: default avatarYunjian Wang <wangyunjian@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 00b5aac5
...@@ -69,10 +69,11 @@ module_param(carrier_timeout, uint, 0644); ...@@ -69,10 +69,11 @@ module_param(carrier_timeout, uint, 0644);
#define np_notice(np, fmt, ...) \ #define np_notice(np, fmt, ...) \
pr_notice("%s: " fmt, np->name, ##__VA_ARGS__) pr_notice("%s: " fmt, np->name, ##__VA_ARGS__)
static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev, static netdev_tx_t netpoll_start_xmit(struct sk_buff *skb,
struct netdev_queue *txq) struct net_device *dev,
struct netdev_queue *txq)
{ {
int status = NETDEV_TX_OK; netdev_tx_t status = NETDEV_TX_OK;
netdev_features_t features; netdev_features_t features;
features = netif_skb_features(skb); features = netif_skb_features(skb);
...@@ -307,7 +308,7 @@ static int netpoll_owner_active(struct net_device *dev) ...@@ -307,7 +308,7 @@ static int netpoll_owner_active(struct net_device *dev)
void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
{ {
int status = NETDEV_TX_BUSY; netdev_tx_t status = NETDEV_TX_BUSY;
unsigned long tries; unsigned long tries;
/* It is up to the caller to keep npinfo alive. */ /* It is up to the caller to keep npinfo alive. */
struct netpoll_info *npinfo; struct netpoll_info *npinfo;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment