diff options
| author |   Yunjian Wang <wangyunjian@huawei.com> | 2020-04-29 18:20:58 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-04-29 11:47:16 -0700 |
| commit | a54776f2c4939bdee084c9ecd00a4a5a25b7c429 (patch) | |
| tree | c240332553bc88fe038d9683ff6daac529814e6e /net/core/netpoll.c | |
| parent | ptp: ptp_ines: convert to devm_platform_ioremap_resource (diff) | |
| download | linux-dev-a54776f2c4939bdee084c9ecd00a4a5a25b7c429.tar.xz linux-dev-a54776f2c4939bdee084c9ecd00a4a5a25b7c429.zip | |
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>
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 849380a622ef..15b366a1a958 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -69,10 +69,11 @@ module_param(carrier_timeout, uint, 0644); #define np_notice(np, fmt, ...) \ pr_notice("%s: " fmt, np->name, ##__VA_ARGS__) -static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev, - struct netdev_queue *txq) +static netdev_tx_t netpoll_start_xmit(struct sk_buff *skb, + struct net_device *dev, + struct netdev_queue *txq) { - int status = NETDEV_TX_OK; + netdev_tx_t status = NETDEV_TX_OK; netdev_features_t features; features = netif_skb_features(skb); @@ -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, struct net_device *dev) { - int status = NETDEV_TX_BUSY; + netdev_tx_t status = NETDEV_TX_BUSY; unsigned long tries; /* It is up to the caller to keep npinfo alive. */ struct netpoll_info *npinfo; |