packet-solutions: xdp_vlan02_kern VLAN extraction missed bpf_ntohs()

netoptimizer · netoptimizer · commit ffba6492e0a9 · 2020-11-15T12:44:59.000+01:00
Signed-off-by: Jesper Dangaard Brouer &lt;brouer@redhat.com&gt;
diff --git a/packet-solutions/xdp_vlan02_kern.c b/packet-solutions/xdp_vlan02_kern.c
@@ -51,7 +51,8 @@ static __always_inline int __parse_ethhdr_vlan(struct hdr_cursor *nh,
 
 		h_proto = vlh->h_vlan_encapsulated_proto;
 		if (vlans) {
-			vlans->id[i] =  vlh->h_vlan_TCI & VLAN_VID_MASK;
+			vlans->id[i] =
+				bpf_ntohs(vlh->h_vlan_TCI) & VLAN_VID_MASK;
 		}
 		vlh++;
 	}

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ static __always_inline int __parse_ethhdr_vlan(struct hdr_cursor *nh,`
`51`	`51`
`52`	`52`	`h_proto = vlh->h_vlan_encapsulated_proto;`
`53`	`53`	`if (vlans) {`
`54`		`- vlans->id[i] = vlh->h_vlan_TCI & VLAN_VID_MASK;`
	`54`	`+ vlans->id[i] =`
	`55`	`+ bpf_ntohs(vlh->h_vlan_TCI) & VLAN_VID_MASK;`
`55`	`56`	`}`
`56`	`57`	`vlh++;`
`57`	`58`	`}`