From cfad0021af9c49f620a1ae079e5a65d2dc8938be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Thu, 14 Jul 2011 14:45:59 -0700 Subject: [PATCH] --- yaml --- r: 256311 b: refs/heads/master c: e20e6940736fb7b4dd024933f7456b9da4c44118 h: refs/heads/master i: 256309: 7b57e2918b1bfc6f3ca975a60a1b56f90a7693bc 256307: c48bf08425b265088d7f42d75295a99d2f67878c 256303: 5d0e1362ca5522efbb9fa0b4335da34a2d953da8 v: v3 --- [refs] | 2 +- trunk/include/linux/tc_ematch/tc_em_meta.h | 2 +- trunk/net/sched/em_meta.c | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 36891e377821..2996a2a51e9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 974151e6119f20d2af4acb97526c780ae0f18ccb +refs/heads/master: e20e6940736fb7b4dd024933f7456b9da4c44118 diff --git a/trunk/include/linux/tc_ematch/tc_em_meta.h b/trunk/include/linux/tc_ematch/tc_em_meta.h index 7138962664f8..b11f8ce2d3c0 100644 --- a/trunk/include/linux/tc_ematch/tc_em_meta.h +++ b/trunk/include/linux/tc_ematch/tc_em_meta.h @@ -67,7 +67,7 @@ enum { TCF_META_ID_SK_FORWARD_ALLOCS, TCF_META_ID_SK_SNDBUF, TCF_META_ID_SK_ALLOCS, - TCF_META_ID_SK_ROUTE_CAPS, + __TCF_META_ID_SK_ROUTE_CAPS, /* unimplemented but in ABI already */ TCF_META_ID_SK_HASH, TCF_META_ID_SK_LINGERTIME, TCF_META_ID_SK_ACK_BACKLOG, diff --git a/trunk/net/sched/em_meta.c b/trunk/net/sched/em_meta.c index 49130e8abff0..1363bf14e61b 100644 --- a/trunk/net/sched/em_meta.c +++ b/trunk/net/sched/em_meta.c @@ -404,12 +404,6 @@ META_COLLECTOR(int_sk_alloc) dst->value = (__force int) skb->sk->sk_allocation; } -META_COLLECTOR(int_sk_route_caps) -{ - SKIP_NONLOCAL(skb); - dst->value = skb->sk->sk_route_caps; -} - META_COLLECTOR(int_sk_hash) { SKIP_NONLOCAL(skb); @@ -530,7 +524,6 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX + 1][TCF_META_ID_MAX + 1] = [META_ID(SK_ERR_QLEN)] = META_FUNC(int_sk_err_qlen), [META_ID(SK_FORWARD_ALLOCS)] = META_FUNC(int_sk_fwd_alloc), [META_ID(SK_ALLOCS)] = META_FUNC(int_sk_alloc), - [META_ID(SK_ROUTE_CAPS)] = META_FUNC(int_sk_route_caps), [META_ID(SK_HASH)] = META_FUNC(int_sk_hash), [META_ID(SK_LINGERTIME)] = META_FUNC(int_sk_lingertime), [META_ID(SK_ACK_BACKLOG)] = META_FUNC(int_sk_ack_bl),