Re: [PATCH net-next] bpf: fix build due to missing tc_verd

2015-06-04 Thread David Miller
From: Alexei Starovoitov a...@plumgrid.com
Date: Thu,  4 Jun 2015 08:33:48 -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...@gmail.com
 Reported-by: Fengguang Wu fengguang...@intel.com
 Signed-off-by: Alexei Starovoitov a...@plumgrid.com

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


[PATCH net-next] bpf: fix build due to missing tc_verd

2015-06-04 Thread Alexei Starovoitov
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...@gmail.com
Reported-by: Fengguang Wu fengguang...@intel.com
Signed-off-by: Alexei Starovoitov a...@plumgrid.com
---
 net/core/filter.c |4 +---
 1 file changed, 1 insertion(+), 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);
-- 
1.7.9.5

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