Patchwork net: flow_dissector: add 802.1ad support

login
register
mail settings
Submitter Eric Dumazet
Date Aug. 6, 2013, 11:35 a.m.
Message ID <1375788906.4457.86.camel@edumazet-glaptop>
Download mbox | patch
Permalink /patch/265024/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Aug. 6, 2013, 11:35 a.m.
From: Eric Dumazet <edumazet@google.com>

Same behavior than 802.1q : finds the encapsulated protocol and
skip 32bit header.

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 net/core/flow_dissector.c |    1 +
 1 file changed, 1 insertion(+)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Aug. 9, 2013, 6:06 p.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 06 Aug 2013 04:35:06 -0700

> From: Eric Dumazet <edumazet@google.com>
> 
> Same behavior than 802.1q : finds the encapsulated protocol and
> skip 32bit header.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>

Applied, thanks Eric.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index ade9ff1..159737c 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -65,6 +65,7 @@  ipv6:
 		nhoff += sizeof(struct ipv6hdr);
 		break;
 	}
+	case __constant_htons(ETH_P_8021AD):
 	case __constant_htons(ETH_P_8021Q): {
 		const struct vlan_hdr *vlan;
 		struct vlan_hdr _vlan;