| From e0b1d83bba66914de74ca25b415d284ad561b0ef Mon Sep 17 00:00:00 2001 |
| From: Jakub Kicinski <jakub.kicinski@netronome.com> |
| Date: Wed, 27 Mar 2019 11:38:38 -0700 |
| Subject: nfp: validate the return code from dev_queue_xmit() |
| |
| [ Upstream commit c8ba5b91a04e3e2643e48501c114108802f21cda ] |
| |
| dev_queue_xmit() may return error codes as well as netdev_tx_t, |
| and it always consumes the skb. Make sure we always return a |
| correct netdev_tx_t value. |
| |
| Fixes: eadfa4c3be99 ("nfp: add stats and xmit helpers for representors") |
| Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> |
| Reviewed-by: John Hurley <john.hurley@netronome.com> |
| Reviewed-by: Simon Horman <simon.horman@netronome.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c |
| index 69d7aebda09b..7d62e3698f08 100644 |
| --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c |
| +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c |
| @@ -196,7 +196,7 @@ static netdev_tx_t nfp_repr_xmit(struct sk_buff *skb, struct net_device *netdev) |
| ret = dev_queue_xmit(skb); |
| nfp_repr_inc_tx_stats(netdev, len, ret); |
| |
| - return ret; |
| + return NETDEV_TX_OK; |
| } |
| |
| static int nfp_repr_stop(struct net_device *netdev) |
| -- |
| 2.19.1 |
| |
