diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2015-01-13 17:13:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-13 23:51:08 +0100 |
| commit | d8b9605d2697c48fb822c821c5751afbb4567003 (patch) | |
| tree | e9c4cbcafae686743acae5cd834086735e31aa7a /net/sched/em_ipset.c | |
| parent | atm: horizon: Remove some unused functions (diff) | |
| download | linux-d8b9605d2697c48fb822c821c5751afbb4567003.tar.xz linux-d8b9605d2697c48fb822c821c5751afbb4567003.zip | |
net: sched: fix skb->protocol use in case of accelerated vlan path
tc code implicitly considers skb->protocol even in case of accelerated
vlan paths and expects vlan protocol type here. However, on rx path,
if the vlan header was already stripped, skb->protocol contains value
of next header. Similar situation is on tx path.
So for skbs that use skb->vlan_tci for tagging, use skb->vlan_proto instead.
Reported-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/em_ipset.c')
| -rw-r--r-- | net/sched/em_ipset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/em_ipset.c b/net/sched/em_ipset.c index 5b4a4efe468c..a3d79c8bf3b8 100644 --- a/net/sched/em_ipset.c +++ b/net/sched/em_ipset.c @@ -59,7 +59,7 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em, struct net_device *dev, *indev = NULL; int ret, network_offset; - switch (skb->protocol) { + switch (tc_skb_protocol(skb)) { case htons(ETH_P_IP): acpar.family = NFPROTO_IPV4; if (!pskb_network_may_pull(skb, sizeof(struct iphdr))) |