aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2007-03-26 17:38:53 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:28:14 -0700
commitfa0b2d1d2196dd46527a8d028797e2bca5930a92 (patch)
treef11350b07f1c66fa5b4e1604c618126d500dd0ae
parent2b44368307cd06c5614d7b53801f516c0654020b (diff)
downloadmrst-s0i3-test-fa0b2d1d2196dd46527a8d028797e2bca5930a92.tar.gz
mrst-s0i3-test-fa0b2d1d2196dd46527a8d028797e2bca5930a92.tar.xz
mrst-s0i3-test-fa0b2d1d2196dd46527a8d028797e2bca5930a92.zip
[NET] fib_rules: Add no-operation action
The use of nop rules simplifies the usage of goto rules and adds more flexibility as they allow targets to remain while the actual content of the branches can change easly. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/fib_rules.h2
-rw-r--r--net/core/fib_rules.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index c151273293e..f278ba781d0 100644
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -54,7 +54,7 @@ enum
FR_ACT_UNSPEC,
FR_ACT_TO_TBL, /* Pass to fixed table */
FR_ACT_GOTO, /* Jump to another rule */
- FR_ACT_RES2,
+ FR_ACT_NOP, /* No operation */
FR_ACT_RES3,
FR_ACT_RES4,
FR_ACT_BLACKHOLE, /* Drop without notification */
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 7ac602cc8c8..5824b2644f2 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -146,7 +146,9 @@ jumped:
rule = target;
goto jumped;
}
- } else
+ } else if (rule->action == FR_ACT_NOP)
+ continue;
+ else
err = ops->action(rule, fl, flags, arg);
if (err != -EAGAIN) {