From 210f479bff5b6cf8483383aa27ad9ded3925326c Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 5 Dec 2015 20:04:20 +0100 Subject: tests: vlan pcp and cfi are located in the first byte Adjust tests to fix wrong payloads, both pcp and cfi are located in the first nibble of the first byte. Signed-off-by: Pablo Neira Ayuso --- tests/regression/bridge/vlan.t.payload | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/regression/bridge/vlan.t.payload b/tests/regression/bridge/vlan.t.payload index 35dc437a..02242d22 100644 --- a/tests/regression/bridge/vlan.t.payload +++ b/tests/regression/bridge/vlan.t.payload @@ -21,7 +21,7 @@ bridge test-bridge input [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 15 => reg 1 ] + [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000000 ] @@ -32,7 +32,7 @@ bridge test-bridge input [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 15 => reg 1 ] + [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] [ cmp neq reg 1 0x00000010 ] @@ -43,7 +43,7 @@ bridge test-bridge input [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 15 => reg 1 ] + [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000010 ] @@ -70,7 +70,7 @@ bridge test-bridge input [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 15 => reg 1 ] + [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000000 ] @@ -81,7 +81,7 @@ bridge test-bridge input [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 15 => reg 1 ] + [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000010 ] @@ -163,10 +163,10 @@ bridge test-bridge input [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 15 => reg 1 ] + [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000010 ] - [ payload load 1b @ link header + 15 => reg 1 ] + [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000000e0 ) ^ 0x00000000 ] [ cmp eq reg 1 0x000000e0 ] @@ -177,10 +177,10 @@ bridge test-bridge input [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 15 => reg 1 ] + [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000010 ] - [ payload load 1b @ link header + 15 => reg 1 ] + [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000000e0 ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000060 ] @@ -194,7 +194,7 @@ bridge test-bridge input [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] [ lookup reg 1 set set%d ] - [ payload load 1b @ link header + 15 => reg 1 ] + [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000000e0 ) ^ 0x00000000 ] [ cmp gte reg 1 0x00000001 ] [ cmp lte reg 1 0x00000003 ] -- cgit v1.2.3