queue-5.0/nfp-flower-remove-vlan-cfi-bit-from-push-vlan-action.patch

   1 From foo@baz Sat Apr 20 16:43:09 CEST 2019
   2 From: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
   3 Date: Mon, 1 Apr 2019 19:36:34 -0700
   4 Subject: nfp: flower: remove vlan CFI bit from push vlan action
   5
   6 From: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
   7
   8 [ Upstream commit 42cd5484a22f1a1b947e21e2af65fa7dab09d017 ]
   9
  10 We no longer set CFI when pushing vlan tags, therefore we remove
  11 the CFI bit from push vlan.
  12
  13 Fixes: 1a1e586f54bf ("nfp: add basic action capabilities to flower offloads")
  14 Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
  15 Signed-off-by: Louis Peens <louis.peens@netronome.com>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17 ---
  18  drivers/net/ethernet/netronome/nfp/flower/action.c |    3 +--
  19  drivers/net/ethernet/netronome/nfp/flower/cmsg.h   |    1 -
  20  2 files changed, 1 insertion(+), 3 deletions(-)
  21
  22 --- a/drivers/net/ethernet/netronome/nfp/flower/action.c
  23 +++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
  24 @@ -49,8 +49,7 @@ nfp_fl_push_vlan(struct nfp_fl_push_vlan
  25
  26         tmp_push_vlan_tci =
  27                 FIELD_PREP(NFP_FL_PUSH_VLAN_PRIO, tcf_vlan_push_prio(action)) |
  28 -               FIELD_PREP(NFP_FL_PUSH_VLAN_VID, tcf_vlan_push_vid(action)) |
  29 -               NFP_FL_PUSH_VLAN_CFI;
  30 +               FIELD_PREP(NFP_FL_PUSH_VLAN_VID, tcf_vlan_push_vid(action));
  31         push_vlan->vlan_tci = cpu_to_be16(tmp_push_vlan_tci);
  32  }
  33
  34 --- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
  35 +++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
  36 @@ -82,7 +82,6 @@
  37  #define NFP_FL_OUT_FLAGS_TYPE_IDX      GENMASK(2, 0)
  38
  39  #define NFP_FL_PUSH_VLAN_PRIO          GENMASK(15, 13)
  40 -#define NFP_FL_PUSH_VLAN_CFI           BIT(12)
  41  #define NFP_FL_PUSH_VLAN_VID           GENMASK(11, 0)
  42
  43  #define IPV6_FLOW_LABEL_MASK           cpu_to_be32(0x000fffff)