aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/em_meta.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-07-22 14:47:25 -0400
committerDavid S. Miller <davem@davemloft.net>2005-07-22 14:47:25 -0400
commit28e212fb360ce2568edd60b93d60683d5ad24146 (patch)
treecde99771e1cd026648c7a80e44ae66b710920e78 /net/sched/em_meta.c
parent14a59e1829cd5782ad1a8979e594578f49f3e2c1 (diff)
[PKT_SCHED]: Kill TCF_META_ID_REALDEV from meta ematch.
It won't exist any longer when we shrink the SKB in 2.6.14, and we should kill this off before anyone in userspace starts using it. 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.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index feefcbfd03d0..179efb5bc9b3 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -180,16 +180,6 @@ META_COLLECTOR(var_indev)
180 *err = var_dev(skb->input_dev, dst); 180 *err = var_dev(skb->input_dev, dst);
181} 181}
182 182
183META_COLLECTOR(int_realdev)
184{
185 *err = int_dev(skb->real_dev, dst);
186}
187
188META_COLLECTOR(var_realdev)
189{
190 *err = var_dev(skb->real_dev, dst);
191}
192
193/************************************************************************** 183/**************************************************************************
194 * skb attributes 184 * skb attributes
195 **************************************************************************/ 185 **************************************************************************/
@@ -501,7 +491,6 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = {
501 [TCF_META_TYPE_VAR] = { 491 [TCF_META_TYPE_VAR] = {
502 [META_ID(DEV)] = META_FUNC(var_dev), 492 [META_ID(DEV)] = META_FUNC(var_dev),
503 [META_ID(INDEV)] = META_FUNC(var_indev), 493 [META_ID(INDEV)] = META_FUNC(var_indev),
504 [META_ID(REALDEV)] = META_FUNC(var_realdev),
505 [META_ID(SK_BOUND_IF)] = META_FUNC(var_sk_bound_if), 494 [META_ID(SK_BOUND_IF)] = META_FUNC(var_sk_bound_if),
506 }, 495 },
507 [TCF_META_TYPE_INT] = { 496 [TCF_META_TYPE_INT] = {
@@ -511,7 +500,6 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = {
511 [META_ID(LOADAVG_2)] = META_FUNC(int_loadavg_2), 500 [META_ID(LOADAVG_2)] = META_FUNC(int_loadavg_2),
512 [META_ID(DEV)] = META_FUNC(int_dev), 501 [META_ID(DEV)] = META_FUNC(int_dev),
513 [META_ID(INDEV)] = META_FUNC(int_indev), 502 [META_ID(INDEV)] = META_FUNC(int_indev),
514 [META_ID(REALDEV)] = META_FUNC(int_realdev),
515 [META_ID(PRIORITY)] = META_FUNC(int_priority), 503 [META_ID(PRIORITY)] = META_FUNC(int_priority),
516 [META_ID(PROTOCOL)] = META_FUNC(int_protocol), 504 [META_ID(PROTOCOL)] = META_FUNC(int_protocol),
517 [META_ID(PKTTYPE)] = META_FUNC(int_pkttype), 505 [META_ID(PKTTYPE)] = META_FUNC(int_pkttype),