releases/4.14.112/nfp-validate-the-return-code-from-dev_queue_xmit.patch

   1 From foo@baz Mon Apr 15 07:47:06 CEST 2019
   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 From: Jakub Kicinski <jakub.kicinski@netronome.com>
   7
   8 [ Upstream commit c8ba5b91a04e3e2643e48501c114108802f21cda ]
   9
  10 dev_queue_xmit() may return error codes as well as netdev_tx_t,
  11 and it always consumes the skb.  Make sure we always return a
  12 correct netdev_tx_t value.
  13
  14 Fixes: eadfa4c3be99 ("nfp: add stats and xmit helpers for representors")
  15 Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
  16 Reviewed-by: John Hurley <john.hurley@netronome.com>
  17 Reviewed-by: Simon Horman <simon.horman@netronome.com>
  18 Signed-off-by: David S. Miller <davem@davemloft.net>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20 ---
  21  drivers/net/ethernet/netronome/nfp/nfp_net_repr.c |    2 +-
  22  1 file changed, 1 insertion(+), 1 deletion(-)
  23
  24 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
  25 +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
  26 @@ -200,7 +200,7 @@ static netdev_tx_t nfp_repr_xmit(struct
  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)