]>
Commit | Line | Data |
---|---|---|
6b6035bf SL |
1 | From e0b1d83bba66914de74ca25b415d284ad561b0ef Mon Sep 17 00:00:00 2001 |
2 | From: Jakub Kicinski <jakub.kicinski@netronome.com> | |
3 | Date: Wed, 27 Mar 2019 11:38:38 -0700 | |
4 | Subject: nfp: validate the return code from dev_queue_xmit() | |
5 | ||
6 | [ Upstream commit c8ba5b91a04e3e2643e48501c114108802f21cda ] | |
7 | ||
8 | dev_queue_xmit() may return error codes as well as netdev_tx_t, | |
9 | and it always consumes the skb. Make sure we always return a | |
10 | correct netdev_tx_t value. | |
11 | ||
12 | Fixes: eadfa4c3be99 ("nfp: add stats and xmit helpers for representors") | |
13 | Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> | |
14 | Reviewed-by: John Hurley <john.hurley@netronome.com> | |
15 | Reviewed-by: Simon Horman <simon.horman@netronome.com> | |
16 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
17 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
18 | --- | |
19 | drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 2 +- | |
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
21 | ||
22 | diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | |
23 | index 69d7aebda09b..7d62e3698f08 100644 | |
24 | --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | |
25 | +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | |
26 | @@ -196,7 +196,7 @@ static netdev_tx_t nfp_repr_xmit(struct sk_buff *skb, struct net_device *netdev) | |
27 | ret = dev_queue_xmit(skb); | |
28 | nfp_repr_inc_tx_stats(netdev, len, ret); | |
29 | ||
30 | - return ret; | |
31 | + return NETDEV_TX_OK; | |
32 | } | |
33 | ||
34 | static int nfp_repr_stop(struct net_device *netdev) | |
35 | -- | |
36 | 2.19.1 | |
37 |