bpf: fix build due to missing tc_verd
authorAlexei Starovoitov <ast@plumgrid.com>
Thu, 4 Jun 2015 15:33:48 +0000 (08:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Jun 2015 18:45:59 +0000 (11:45 -0700)
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>
net/core/filter.c

index 64c121c0965520529c0813ed6d81356b8469afa2..09b2062eb5b83594291d6ab861b8c01765fd1dde 100644 (file)
@@ -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);