packet-solutions: Change struct name and improve some comments

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>

Author: netoptimizer

common/parsing_helpers.h

@@ -60,7 +60,8 @@ struct icmphdr_common {
 #endif
 
 #define VLAN_VID_MASK		0x0fff /* VLAN Identifier */
-struct vlans {
+/* Struct for collecting VLANs after parsing via parse_ethhdr_vlan */
+struct collect_vlans {
 	__u16 id[VLAN_MAX_DEPTH];
 };
 
@@ -78,7 +79,7 @@ static __always_inline int proto_is_vlan(__u16 h_proto)
 static __always_inline int parse_ethhdr_vlan(struct hdr_cursor *nh,
 					     void *data_end,
 					     struct ethhdr **ethhdr,
-					     struct vlans *vlans)
+					     struct collect_vlans *vlans)
 {
 	struct ethhdr *eth = nh->pos;
 	int hdrsize = sizeof(*eth);
@@ -124,7 +125,7 @@ static __always_inline int parse_ethhdr(struct hdr_cursor *nh,
 					void *data_end,
 					struct ethhdr **ethhdr)
 {
-	/* Expect compiler to remove collect VLAN ids */
+	/* Expect compiler removes the code that collects VLAN ids */
 	return parse_ethhdr_vlan(nh, data_end, ethhdr, NULL);
 }
 

packet-solutions/xdp_vlan02_kern.c

@@ -12,7 +12,7 @@
 
 #if 0
 #define VLAN_VID_MASK		0x0fff /* VLAN Identifier */
-struct vlans {
+struct collect_vlans {
 	__u16 id[VLAN_MAX_DEPTH];
 };
 #endif
@@ -22,7 +22,7 @@ struct vlans {
 static __always_inline int __parse_ethhdr_vlan(struct hdr_cursor *nh,
 					       void *data_end,
 					       struct ethhdr **ethhdr,
-					       struct vlans *vlans)
+					       struct collect_vlans *vlans)
 {
 	struct ethhdr *eth = nh->pos;
 	int hdrsize = sizeof(*eth);
@@ -76,7 +76,7 @@ int xdp_vlan_02(struct xdp_md *ctx)
 	int eth_type;
 	nh.pos = data;
 
-	struct vlans vlans;
+	struct collect_vlans vlans;
 
 	struct ethhdr *eth;
 	eth_type = parse_ethhdr_vlan(&nh, data_end, &eth, &vlans);