aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/em_meta.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-07-22 17:43:52 -0400
committerDavid S. Miller <davem@davemloft.net>2005-07-22 17:43:52 -0400
commit261688d01ec07d3a265b8ace6ec68310fbd96a96 (patch)
treec068cd8f4a1cf545ea4bfb68d3becc051b964d56 /net/sched/em_meta.c
parentd3984a6b6abac6203868f0e9095c0ed9e33ece03 (diff)
[PKT_SCHED]: em_meta: Kill TCF_META_ID_{INDEV,SECURITY,TCVERDICT}
More unusable TCF_META_* match types that need to get eliminated before 2.6.13 goes out the door. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Thomas Graf <tgraf@suug.ch>
Diffstat (limited to 'net/sched/em_meta.c')
-rw-r--r--net/sched/em_meta.c28
1 files changed, 3 insertions, 25 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 179efb5bc9b3..a18b924743d9 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -27,17 +27,17 @@
27 * lvalue rvalue 27 * lvalue rvalue
28 * +-----------+ +-----------+ 28 * +-----------+ +-----------+
29 * | type: INT | | type: INT | 29 * | type: INT | | type: INT |
30 * def | id: INDEV | | id: VALUE | 30 * def | id: DEV | | id: VALUE |
31 * | data: | | data: 3 | 31 * | data: | | data: 3 |
32 * +-----------+ +-----------+ 32 * +-----------+ +-----------+
33 * | | 33 * | |
34 * ---> meta_ops[INT][INDEV](...) | 34 * ---> meta_ops[INT][DEV](...) |
35 * | | 35 * | |
36 * ----------- | 36 * ----------- |
37 * V V 37 * V V
38 * +-----------+ +-----------+ 38 * +-----------+ +-----------+
39 * | type: INT | | type: INT | 39 * | type: INT | | type: INT |
40 * obj | id: INDEV | | id: VALUE | 40 * obj | id: DEV | | id: VALUE |
41 * | data: 2 |<--data got filled out | data: 3 | 41 * | data: 2 |<--data got filled out | data: 3 |
42 * +-----------+ +-----------+ 42 * +-----------+ +-----------+
43 * | | 43 * | |
@@ -170,16 +170,6 @@ META_COLLECTOR(var_dev)
170 *err = var_dev(skb->dev, dst); 170 *err = var_dev(skb->dev, dst);
171} 171}
172 172
173META_COLLECTOR(int_indev)
174{
175 *err = int_dev(skb->input_dev, dst);
176}
177
178META_COLLECTOR(var_indev)
179{
180 *err = var_dev(skb->input_dev, dst);
181}
182
183/************************************************************************** 173/**************************************************************************
184 * skb attributes 174 * skb attributes
185 **************************************************************************/ 175 **************************************************************************/
@@ -235,13 +225,6 @@ META_COLLECTOR(int_tcindex)
235 dst->value = skb->tc_index; 225 dst->value = skb->tc_index;
236} 226}
237 227
238#ifdef CONFIG_NET_CLS_ACT
239META_COLLECTOR(int_tcverd)
240{
241 dst->value = skb->tc_verd;
242}
243#endif
244
245/************************************************************************** 228/**************************************************************************
246 * Routing 229 * Routing
247 **************************************************************************/ 230 **************************************************************************/
@@ -490,7 +473,6 @@ struct meta_ops
490static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = { 473static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = {
491 [TCF_META_TYPE_VAR] = { 474 [TCF_META_TYPE_VAR] = {
492 [META_ID(DEV)] = META_FUNC(var_dev), 475 [META_ID(DEV)] = META_FUNC(var_dev),
493 [META_ID(INDEV)] = META_FUNC(var_indev),
494 [META_ID(SK_BOUND_IF)] = META_FUNC(var_sk_bound_if), 476 [META_ID(SK_BOUND_IF)] = META_FUNC(var_sk_bound_if),
495 }, 477 },
496 [TCF_META_TYPE_INT] = { 478 [TCF_META_TYPE_INT] = {
@@ -499,7 +481,6 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = {
499 [META_ID(LOADAVG_1)] = META_FUNC(int_loadavg_1), 481 [META_ID(LOADAVG_1)] = META_FUNC(int_loadavg_1),
500 [META_ID(LOADAVG_2)] = META_FUNC(int_loadavg_2), 482 [META_ID(LOADAVG_2)] = META_FUNC(int_loadavg_2),
501 [META_ID(DEV)] = META_FUNC(int_dev), 483 [META_ID(DEV)] = META_FUNC(int_dev),
502 [META_ID(INDEV)] = META_FUNC(int_indev),
503 [META_ID(PRIORITY)] = META_FUNC(int_priority), 484 [META_ID(PRIORITY)] = META_FUNC(int_priority),
504 [META_ID(PROTOCOL)] = META_FUNC(int_protocol), 485 [META_ID(PROTOCOL)] = META_FUNC(int_protocol),
505 [META_ID(PKTTYPE)] = META_FUNC(int_pkttype), 486 [META_ID(PKTTYPE)] = META_FUNC(int_pkttype),
@@ -510,9 +491,6 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = {
510 [META_ID(NFMARK)] = META_FUNC(int_nfmark), 491 [META_ID(NFMARK)] = META_FUNC(int_nfmark),
511#endif 492#endif
512 [META_ID(TCINDEX)] = META_FUNC(int_tcindex), 493 [META_ID(TCINDEX)] = META_FUNC(int_tcindex),
513#ifdef CONFIG_NET_CLS_ACT
514 [META_ID(TCVERDICT)] = META_FUNC(int_tcverd),
515#endif
516#ifdef CONFIG_NET_CLS_ROUTE 494#ifdef CONFIG_NET_CLS_ROUTE
517 [META_ID(RTCLASSID)] = META_FUNC(int_rtclassid), 495 [META_ID(RTCLASSID)] = META_FUNC(int_rtclassid),
518#endif 496#endif