[dpdk-dev] [PATCH v3 01/12] net/ice/base: fix for adding PPPoE switch rule
Qi Zhang
qi.z.zhang at intel.com
Tue Oct 8 03:50:07 CEST 2019
Update VLAN protocol ID to correct value for single VXLAN scenario.
Fix the missing ethertype offset for PPPoE dummy packet offset to
allow matching the corresponding field.
Fixes: d341bdc30290 ("net/ice/base: add support for GTP and PPPoE protocols")
Signed-off-by: Dan Nowlin <dan.nowlin at intel.com>
Signed-off-by: Junfeng Guo <junfeng.guo at intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
drivers/net/ice/base/ice_protocol_type.h | 2 +-
drivers/net/ice/base/ice_switch.c | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 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..71d7f0737 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -419,6 +419,7 @@ dummy_udp_gtp_packet[] = {
static const
struct ice_dummy_pkt_offsets dummy_pppoe_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
+ { ICE_ETYPE_OL, 12 },
{ ICE_VLAN_OFOS, 14},
{ ICE_PPPOE, 18 },
{ ICE_PROTOCOL_LAST, 0 },
@@ -429,20 +430,23 @@ dummy_pppoe_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
- 0x81, 0x00,
+
+ 0x81, 0x00, /* ICE_ETYPE_OL 12 */
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,
+
+ 0x00, 0x21, /* PPP Link Layer 24 */
- 0x45, 0x00, 0x00, 0x30, /* PDU */
+ 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
More information about the dev
mailing list