From patchwork Tue Dec 13 00:12:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 705248 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 3td0XW6W4tz9t10 for ; Tue, 13 Dec 2016 11:12:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932652AbcLMAMr (ORCPT ); Mon, 12 Dec 2016 19:12:47 -0500 Received: from rere.qmqm.pl ([84.10.57.10]:50214 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932593AbcLMAMp (ORCPT ); Mon, 12 Dec 2016 19:12:45 -0500 Received: by rere.qmqm.pl (Postfix, from userid 1000) id 9BDA86127; Tue, 13 Dec 2016 01:12:41 +0100 (CET) Message-Id: In-Reply-To: References: From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH net-next 24/27] bpf_test: prepare for VLAN_TAG_PRESENT removal MIME-Version: 1.0 To: netdev@vger.kernel.org Cc: Alexei Starovoitov (supporter:BPF (Safe dynamic programs and tools)), netdev@vger.kernel.org (open list:BPF (Safe dynamic programs and tools)), linux-kernel@vger.kernel.org (open list:BPF (Safe dynamic programs and tools)) Date: Tue, 13 Dec 2016 01:12:41 +0100 (CET) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Michał Mirosław --- lib/test_bpf.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/test_bpf.c b/lib/test_bpf.c index 0362da0..00d3450 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -691,8 +691,13 @@ static struct bpf_test tests[] = { CLASSIC, { }, { +#ifdef VLAN_TAG_PRESENT { 1, SKB_VLAN_TCI & ~VLAN_TAG_PRESENT }, { 10, SKB_VLAN_TCI & ~VLAN_TAG_PRESENT } +#else + { 1, SKB_VLAN_TCI }, + { 10, SKB_VLAN_TCI } +#endif }, }, { @@ -705,8 +710,13 @@ static struct bpf_test tests[] = { CLASSIC, { }, { +#ifdef VLAN_TAG_PRESENT { 1, !!(SKB_VLAN_TCI & VLAN_TAG_PRESENT) }, { 10, !!(SKB_VLAN_TCI & VLAN_TAG_PRESENT) } +#else + { 1, SKB_VLAN_PRESENT }, + { 10, SKB_VLAN_PRESENT } +#endif }, }, { @@ -4773,8 +4783,13 @@ static struct bpf_test tests[] = { CLASSIC, { }, { +#ifdef VLAN_TAG_PRESENT { 1, !!(SKB_VLAN_TCI & VLAN_TAG_PRESENT) }, { 10, !!(SKB_VLAN_TCI & VLAN_TAG_PRESENT) } +#else + { 1, SKB_VLAN_PRESENT }, + { 10, SKB_VLAN_PRESENT } +#endif }, .fill_helper = bpf_fill_maxinsns6, },