diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-16 20:39:20 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-16 20:39:20 +0000 |
| commit | 807b936bb3d9bb2c924c742a0548337089494968 (patch) | |
| tree | 61198b487730ad1b434db66ec2f1e002b66d18c2 /tests/loop-detect.4 | |
| parent | 0dbced3615ffdbb212ba4f791475a7c65a525309 (diff) | |
| parent | bea7aab38f305bb8c2e400d575e6bd0a3c6bbc1f (diff) | |
Merge remote-tracking branch 'origin/master' into next-3.14
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/nftables.h
src/main.c
Diffstat (limited to 'tests/loop-detect.4')
| -rw-r--r-- | tests/loop-detect.4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/loop-detect.4 b/tests/loop-detect.4 index f6f4d572..acd9a342 100644 --- a/tests/loop-detect.4 +++ b/tests/loop-detect.4 @@ -3,5 +3,5 @@ # Circular jump with an intermediate anonymous verdict map: chain1 -> chain2 -> chain3 -> chain1 flush table filter add filter chain1 jump chain2 -add filter chain2 ip daddr vmap { 10.0.0.1 => continue, 192.168.0.1 => jump chain3 } +add filter chain2 ip daddr vmap { 10.0.0.1 : continue, 192.168.0.1 : jump chain3 } add filter chain3 jump chain1 |