summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@plumgrid.com>2015-06-04 08:33:48 -0700
committerDavid S. Miller <davem@davemloft.net>2015-06-04 11:45:59 -0700
commit94db13fe5ff144ea5afcfa3a3daf38a239090acf (patch)
tree3678b8a8862df453af41b1baf106683e71083c26
parentc39c4c6abb89d24454b63798ccbae12b538206a5 (diff)
downloadlinux-94db13fe5ff144ea5afcfa3a3daf38a239090acf.tar.bz2
bpf: fix build due to missing tc_verd
fix build error: net/core/filter.c: In function 'bpf_clone_redirect': net/core/filter.c:1429:18: error: 'struct sk_buff' has no member named 'tc_verd' if (G_TC_AT(skb2->tc_verd) & AT_INGRESS) Fixes: 3896d655f4d4 ("bpf: introduce bpf_clone_redirect() helper") Reported-by: Or Gerlitz <gerlitz.or@gmail.com> Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Alexei Starovoitov <ast@plumgrid.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/filter.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index 64c121c09655..09b2062eb5b8 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -46,7 +46,6 @@
#include <linux/seccomp.h>
#include <linux/if_vlan.h>
#include <linux/bpf.h>
-#include <net/sch_generic.h>
/**
* sk_filter - run a packet through a socket filter
@@ -1426,8 +1425,7 @@ static u64 bpf_clone_redirect(u64 r1, u64 ifindex, u64 flags, u64 r4, u64 r5)
if (unlikely(!skb2))
return -ENOMEM;
- if (G_TC_AT(skb2->tc_verd) & AT_INGRESS)
- skb_push(skb2, skb2->mac_len);
+ skb_push(skb2, skb2->data - skb_mac_header(skb2));
if (BPF_IS_REDIRECT_INGRESS(flags))
return dev_forward_skb(dev, skb2);