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 /files/examples/sets_and_maps | |
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 'files/examples/sets_and_maps')
-rwxr-xr-x | files/examples/sets_and_maps | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/files/examples/sets_and_maps b/files/examples/sets_and_maps index adfc6884..a05199ae 100755 --- a/files/examples/sets_and_maps +++ b/files/examples/sets_and_maps @@ -25,13 +25,13 @@ table filter { type ifindex } - # named map of type ifindex => ipv4_address + # named map of type ifindex : ipv4_address map nat_map { - type ifindex => ipv4_address + type ifindex : ipv4_address } map jump_map { - type ifindex => verdict + type ifindex : verdict } chain input_1 { counter; } @@ -48,6 +48,6 @@ table filter { meta iif @local_ifs counter meta iif vmap @jump_map - #meta iif vmap { eth0 => jump input1, eth1 => jump input2 } + #meta iif vmap { eth0 : jump input1, eth1 : jump input2 } } } |