From patchwork Thu Jun 4 15:33:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 480783 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E64BA140271 for ; Fri, 5 Jun 2015 01:34:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751677AbbFDPeB (ORCPT ); Thu, 4 Jun 2015 11:34:01 -0400 Received: from mail-qk0-f172.google.com ([209.85.220.172]:35565 "EHLO mail-qk0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751956AbbFDPeA (ORCPT ); Thu, 4 Jun 2015 11:34:00 -0400 Received: by qkhq76 with SMTP id q76so25710424qkh.2 for ; Thu, 04 Jun 2015 08:33:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EG9PzN7Zh1BFpd2nXk0Ijpnt08p62rheDBjmFXSlnCY=; b=N//hQ6oPbCNpjwNXv595bkHi7Y9dWehXNhtthFUqiSAIYXksUyZdLnAnRqh+x8BzdT h+E6BloBVClQCVERbyJRBrZ0NgfJhQ8c11PNlAZ/oKH3JmOGb7Wjsc3ay4T90F/dhcg3 mwb/LVgerxaGvuUZ/Kroptrsn7TzFUwxViLePYNx4OAnc0eDfvKrTuzP8U/nOfcmYZZl VPpbsffO6xfZ2HJfUZx80E8jBGzX0L1UqZK3x9okF1TA9d3l906PSGjaWQuzKGzIgLlo 4Fe3jKW1BscrYRYA3cKs/oZHzqGYM0rVHx3AAas1WNQyFY0gAL/NKdCnmv5htE53B1jl HlnQ== X-Gm-Message-State: ALoCoQloFYoWkGueYCT9g81gkTK2/mfcfDNnTsFMun66QTZm4sX57aqFN3I+CyNjEb7iwNRlaLaI X-Received: by 10.140.233.214 with SMTP id e205mr45944242qhc.68.1433432039454; Thu, 04 Jun 2015 08:33:59 -0700 (PDT) Received: from localhost.localdomain ([12.229.56.227]) by mx.google.com with ESMTPSA id w127sm2544710qkw.32.2015.06.04.08.33.58 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Jun 2015 08:33:58 -0700 (PDT) From: Alexei Starovoitov To: "David S. Miller" Cc: Fengguang Wu , Or Gerlitz , Daniel Borkmann , netdev@vger.kernel.org Subject: [PATCH net-next] bpf: fix build due to missing tc_verd Date: Thu, 4 Jun 2015 08:33:48 -0700 Message-Id: <1433432028-7620-1-git-send-email-ast@plumgrid.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Reported-by: Fengguang Wu Signed-off-by: Alexei Starovoitov --- 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 #include #include -#include /** * 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);