git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/ice: fix GTP-U rule conflict
[dpdk.git]
/
drivers
/
net
/
ice
/
base
/
ice_protocol_type.h
diff --git
a/drivers/net/ice/base/ice_protocol_type.h
b/drivers/net/ice/base/ice_protocol_type.h
index
98185c9
..
fdcbb2c
100644
(file)
--- 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_MAC_OFOS_HW 1
#define ICE_MAC_IL_HW 4
#define ICE_ETYPE_OL_HW 9
-#define ICE_VLAN_OL_HW 1
6
+#define ICE_VLAN_OL_HW 1
7
#define ICE_IPV4_OFOS_HW 32
#define ICE_IPV4_IL_HW 33
#define ICE_IPV6_OFOS_HW 40
#define ICE_IPV4_OFOS_HW 32
#define ICE_IPV4_IL_HW 33
#define ICE_IPV6_OFOS_HW 40
@@
-155,38
+155,47
@@
struct ice_ether_hdr {
};
struct ice_ethtype_hdr {
};
struct ice_ethtype_hdr {
-
u
16 ethtype_id;
+
__be
16 ethtype_id;
};
struct ice_ether_vlan_hdr {
u8 dst_addr[ETH_ALEN];
u8 src_addr[ETH_ALEN];
};
struct ice_ether_vlan_hdr {
u8 dst_addr[ETH_ALEN];
u8 src_addr[ETH_ALEN];
-
u
32 vlan_id;
+
__be
32 vlan_id;
};
struct ice_vlan_hdr {
};
struct ice_vlan_hdr {
-
u
16 vlan;
-
u
16 type;
+
__be
16 vlan;
+
__be
16 type;
};
struct ice_ipv4_hdr {
u8 version;
u8 tos;
};
struct ice_ipv4_hdr {
u8 version;
u8 tos;
-
u
16 total_length;
-
u
16 id;
-
u
16 frag_off;
+
__be
16 total_length;
+
__be
16 id;
+
__be
16 frag_off;
u8 time_to_live;
u8 protocol;
u8 time_to_live;
u8 protocol;
- u16 check;
- u32 src_addr;
- u32 dst_addr;
+ __be16 check;
+ __be32 src_addr;
+ __be32 dst_addr;
+};
+
+struct ice_le_ver_tc_flow {
+ union {
+ struct {
+ u32 flow_label : 20;
+ u32 tc : 8;
+ u32 version : 4;
+ } fld;
+ u32 val;
+ } u;
};
struct ice_ipv6_hdr {
};
struct ice_ipv6_hdr {
- u8 version;
- u8 tc;
- u16 flow_label;
- u16 payload_len;
+ __be32 be_ver_tc_flow;
+ __be16 payload_len;
u8 next_hdr;
u8 hop_limit;
u8 src_addr[ICE_IPV6_ADDR_LENGTH];
u8 next_hdr;
u8 hop_limit;
u8 src_addr[ICE_IPV6_ADDR_LENGTH];
@@
-194,32
+203,32
@@
struct ice_ipv6_hdr {
};
struct ice_sctp_hdr {
};
struct ice_sctp_hdr {
-
u
16 src_port;
-
u
16 dst_port;
-
u
32 verification_tag;
-
u
32 check;
+
__be
16 src_port;
+
__be
16 dst_port;
+
__be
32 verification_tag;
+
__be
32 check;
};
struct ice_l4_hdr {
};
struct ice_l4_hdr {
-
u
16 src_port;
-
u
16 dst_port;
-
u
16 len;
-
u
16 check;
+
__be
16 src_port;
+
__be
16 dst_port;
+
__be
16 len;
+
__be
16 check;
};
struct ice_udp_tnl_hdr {
};
struct ice_udp_tnl_hdr {
-
u
16 field;
-
u
16 proto_type;
-
u32 vni;
/* only use lower 24-bits */
+
__be
16 field;
+
__be
16 proto_type;
+
__be32 vni;
/* only use lower 24-bits */
};
#pragma pack(1)
struct ice_udp_gtp_hdr {
u8 flags;
u8 msg_type;
};
#pragma pack(1)
struct ice_udp_gtp_hdr {
u8 flags;
u8 msg_type;
-
u
16 rsrvd_len;
-
u
32 teid;
-
u
16 rsrvd_seq_nbr;
+
__be
16 rsrvd_len;
+
__be
32 teid;
+
__be
16 rsrvd_seq_nbr;
u8 rsrvd_n_pdu_nbr;
u8 rsrvd_next_ext;
u8 rsvrd_ext_len;
u8 rsrvd_n_pdu_nbr;
u8 rsrvd_next_ext;
u8 rsvrd_ext_len;
@@
-230,17
+239,17
@@
struct ice_udp_gtp_hdr {
struct ice_pppoe_hdr {
u8 rsrvd_ver_type;
struct ice_pppoe_hdr {
u8 rsrvd_ver_type;
- u8 rsrv
e
d_code;
-
u
16 session_id;
-
u
16 length;
-
u
16 ppp_prot_id; /* control and data only */
+ u8 rsrvd_code;
+
__be
16 session_id;
+
__be
16 length;
+
__be
16 ppp_prot_id; /* control and data only */
};
#pragma pack()
struct ice_nvgre {
};
#pragma pack()
struct ice_nvgre {
-
u
16 flags;
-
u
16 protocol;
-
u
32 tni_flow;
+
__be
16 flags;
+
__be
16 protocol;
+
__be
32 tni_flow;
};
union ice_prot_hdr {
};
union ice_prot_hdr {