aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/tc_ematch/tc_em_meta.h1
-rw-r--r--net/sched/em_meta.c12
2 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index 90ab9f95d43d..150efe07ff6b 100644
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -42,7 +42,6 @@ enum
42 TCF_META_ID_LOADAVG_2, 42 TCF_META_ID_LOADAVG_2,
43 TCF_META_ID_DEV, 43 TCF_META_ID_DEV,
44 TCF_META_ID_INDEV, 44 TCF_META_ID_INDEV,
45 TCF_META_ID_REALDEV,
46 TCF_META_ID_PRIORITY, 45 TCF_META_ID_PRIORITY,
47 TCF_META_ID_PROTOCOL, 46 TCF_META_ID_PROTOCOL,
48 TCF_META_ID_SECURITY, /* obsolete */ 47 TCF_META_ID_SECURITY, /* obsolete */
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),