summaryrefslogtreecommitdiffstats
path: root/lib/test_bpf.c
diff options
context:
space:
mode:
authorJakub Kicinski <jakub.kicinski@netronome.com>2016-09-12 13:04:57 +0100
committerDavid S. Miller <davem@davemloft.net>2016-09-15 19:17:15 -0400
commit5c0ca3f566d7a19e9bf9671dfc2108fad1b7b9b2 (patch)
treee56e587e2b2dcb7ced86a3a002a792f6ff281d93 /lib/test_bpf.c
parentd560846e40fefd7b6e5c29d115f1d8f73db7f5e6 (diff)
downloadlinux-stable-5c0ca3f566d7a19e9bf9671dfc2108fad1b7b9b2.tar.gz
linux-stable-5c0ca3f566d7a19e9bf9671dfc2108fad1b7b9b2.tar.bz2
linux-stable-5c0ca3f566d7a19e9bf9671dfc2108fad1b7b9b2.zip
test_bpf: fix the dummy skb after dissector changes
Commit d5709f7ab776 ("flow_dissector: For stripped vlan, get vlan info from skb->vlan_tci") made flow dissector look at vlan_proto when vlan is present. Since test_bpf sets skb->vlan_tci to ~0 (including VLAN_TAG_PRESENT) we have to populate skb->vlan_proto. Fixes false negative on test #24: test_bpf: #24 LD_PAYLOAD_OFF jited:0 175 ret 0 != 42 FAIL (1 times) Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com> Acked-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/test_bpf.c')
-rw-r--r--lib/test_bpf.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index 93f45011a59d..94346b4d8984 100644
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -5485,6 +5485,7 @@ static struct sk_buff *populate_skb(char *buf, int size)
skb->hash = SKB_HASH;
skb->queue_mapping = SKB_QUEUE_MAP;
skb->vlan_tci = SKB_VLAN_TCI;
+ skb->vlan_proto = htons(ETH_P_IP);
skb->dev = &dev;
skb->dev->ifindex = SKB_DEV_IFINDEX;
skb->dev->type = SKB_DEV_TYPE;