Messages in this thread Patch in this message | | | From | Michał Mirosław <> | Subject | [PATCH net-next 24/27] bpf_test: prepare for VLAN_TAG_PRESENT removal | Date | Tue, 13 Dec 2016 01:12:41 +0100 (CET) |
| |
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> --- 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, }, -- 2.10.2
| |