korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 13:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

net/flow_dissector: Save vlan ethertype from headers

Browse Source 
Change vlan dissector key to save vlan tpid to support both 802.1Q
and 802.1AD ethertype.

Signed-off-by: Jianbo Liu <jianbol@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jianbo Liu 2018-07-06 05:38:12 +00:00 committed by David S. Miller
parent 94c7635134
commit 2064c3d4c0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/flow_dissector.h
View File

@ -47,7 +47,7 @@ struct flow_dissector_key_tags {
struct flow_dissector_key_vlan { struct flow_dissector_key_vlan {
u16 vlan_id:12, u16 vlan_id:12,
vlan_priority:3; vlan_priority:3;
u16 padding; __be16 vlan_tpid;
}; };
struct flow_dissector_key_mpls { struct flow_dissector_key_mpls {

2
net/core/flow_dissector.c
View File

@ -751,6 +751,7 @@ proto_again:
const struct vlan_hdr *vlan; const struct vlan_hdr *vlan;
struct vlan_hdr _vlan; struct vlan_hdr _vlan;
bool vlan_tag_present = skb && skb_vlan_tag_present(skb); bool vlan_tag_present = skb && skb_vlan_tag_present(skb);
__be16 saved_vlan_tpid = proto;
if (vlan_tag_present) if (vlan_tag_present)
proto = skb->protocol; proto = skb->protocol;
@ -789,6 +790,7 @@ proto_again:
(ntohs(vlan->h_vlan_TCI) & (ntohs(vlan->h_vlan_TCI) &
VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT; VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
} }
key_vlan->vlan_tpid = saved_vlan_tpid;
} }
fdret = FLOW_DISSECT_RET_PROTO_AGAIN; fdret = FLOW_DISSECT_RET_PROTO_AGAIN;