[1/8] net/ice/base: fix for adding PPPoE switch rule
diff mbox series

Message ID 20190927041646.34712-2-qi.z.zhang@intel.com
State Superseded, archived
Delegated to: xiaolong ye
Headers show
Series
  • net/ice: base code update
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Qi Zhang Sept. 27, 2019, 4:16 a.m. UTC
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 <dan.nowlin@intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/base/ice_protocol_type.h |  2 +-
 drivers/net/ice/base/ice_switch.c        | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

Comments

Yang, Qiming Sept. 27, 2019, 5:30 a.m. UTC | #1
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 <wenzhuo.lu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Ye, Xiaolong <xiaolong.ye@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Nowlin, Dan <dan.nowlin@intel.com>; Stillwell Jr,
> Paul M <paul.m.stillwell.jr@intel.com>
> 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 <dan.nowlin@intel.com>
> Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> ---
>  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
Zhao1, Wei Sept. 27, 2019, 6:01 a.m. UTC | #2
Tested-by: Wei Zhao <wei.zhao1@intel.com>

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Qi Zhang
> Sent: Friday, September 27, 2019 12:17 PM
> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Ye, Xiaolong <xiaolong.ye@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Nowlin, Dan <dan.nowlin@intel.com>; Stillwell Jr,
> Paul M <paul.m.stillwell.jr@intel.com>
> Subject: [dpdk-dev] [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 <dan.nowlin@intel.com>
> Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> ---
>  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
Qi Zhang Sept. 27, 2019, 6:18 a.m. UTC | #3
> -----Original Message-----
> From: Yang, Qiming
> Sent: Friday, September 27, 2019 1:31 PM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Lu, Wenzhuo <wenzhuo.lu@intel.com>
> Cc: dev@dpdk.org; Ye, Xiaolong <xiaolong.ye@intel.com>; Nowlin, Dan
> <dan.nowlin@intel.com>; Stillwell Jr, Paul M <paul.m.stillwell.jr@intel.com>
> Subject: RE: [PATCH 1/8] net/ice/base: fix for adding PPPoE switch rule
> 
> Missing CC stable for the fix patches.

This fix on the patch from current release, no need to CC stable


> 
> Qiming
> 
> > -----Original Message-----
> > From: Zhang, Qi Z
> > Sent: Friday, September 27, 2019 12:17 PM
> > To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Yang, Qiming
> > <qiming.yang@intel.com>
> > Cc: dev@dpdk.org; Ye, Xiaolong <xiaolong.ye@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>; Nowlin, Dan <dan.nowlin@intel.com>; Stillwell
> > Jr, Paul M <paul.m.stillwell.jr@intel.com>
> > 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 <dan.nowlin@intel.com>
> > Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
> > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> > ---
> >  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

Patch
diff mbox series

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 */