Missing CC stable for the fix patches. Qiming
> -----Original Message----- > From: Zhang, Qi Z > Sent: Friday, September 27, 2019 12:17 PM > To: Lu, Wenzhuo <[email protected]>; Yang, Qiming > <[email protected]> > Cc: [email protected]; Ye, Xiaolong <[email protected]>; Zhang, Qi Z > <[email protected]>; Nowlin, Dan <[email protected]>; Stillwell Jr, > Paul M <[email protected]> > Subject: [PATCH 1/8] net/ice/base: fix for adding PPPoE switch rule > > Update VLAN protocol ID to correct value for single VXLAN scenario. > Correct the PPPOE training packet. > > Fixes: d341bdc30290 ("net/ice/base: add support for GTP and PPPoE > protocols") > > Signed-off-by: Dan Nowlin <[email protected]> > Signed-off-by: Paul M Stillwell Jr <[email protected]> > Signed-off-by: Qi Zhang <[email protected]> > --- > drivers/net/ice/base/ice_protocol_type.h | 2 +- > drivers/net/ice/base/ice_switch.c | 12 +++++++----- > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ice/base/ice_protocol_type.h > b/drivers/net/ice/base/ice_protocol_type.h > index f61345a7f..548c9730a 100644 > --- a/drivers/net/ice/base/ice_protocol_type.h > +++ b/drivers/net/ice/base/ice_protocol_type.h > @@ -118,7 +118,7 @@ enum ice_prot_id { > #define ICE_MAC_OFOS_HW 1 > #define ICE_MAC_IL_HW 4 > #define ICE_ETYPE_OL_HW 9 > -#define ICE_VLAN_OL_HW 16 > +#define ICE_VLAN_OL_HW 17 > #define ICE_IPV4_OFOS_HW 32 > #define ICE_IPV4_IL_HW 33 > #define ICE_IPV6_OFOS_HW 40 > diff --git a/drivers/net/ice/base/ice_switch.c > b/drivers/net/ice/base/ice_switch.c > index 80afa74cd..a72f4b430 100644 > --- a/drivers/net/ice/base/ice_switch.c > +++ b/drivers/net/ice/base/ice_switch.c > @@ -433,16 +433,18 @@ dummy_pppoe_packet[] = { > > 0x00, 0x00, 0x88, 0x64, /* ICE_VLAN_OFOS 14 */ > > - 0x11, 0x00, 0x00, 0x01, /* ICE_PPPOE 18 */ > - 0x00, 0x4e, 0x00, 0x21, > + 0x11, 0x00, 0x00, 0x00, /* ICE_PPPOE 18 */ > + 0x00, 0x16, > > - 0x45, 0x00, 0x00, 0x30, /* PDU */ > + 0x00, 0x21, /* PPP Link Layer 24 */ > + > + 0x45, 0x00, 0x00, 0x14, /* ICE_IPV4_IL 26 */ > + 0x00, 0x00, 0x00, 0x00, > 0x00, 0x00, 0x00, 0x00, > - 0x00, 0x11, 0x00, 0x00, > 0x00, 0x00, 0x00, 0x00, > 0x00, 0x00, 0x00, 0x00, > > - 0x00, 0x00, /* 2 bytes for 4 byte alignment */ > + 0x00, 0x00, /* 2 bytes for 4 bytes alignment */ > }; > > /* this is a recipe to profile association bitmap */ > -- > 2.13.6
