tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

net: remove SK_ROUTE_CAPS from meta ematch

Remove it, as it indirectly exposes netdev features. It's not used in
iproute2 (2.6.38) - is anything else using its interface?

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Michał Mirosław and committed by
David S. Miller e20e6940 974151e6

+1 -8
+1 -1
include/linux/tc_ematch/tc_em_meta.h
··· 67 67 TCF_META_ID_SK_FORWARD_ALLOCS, 68 68 TCF_META_ID_SK_SNDBUF, 69 69 TCF_META_ID_SK_ALLOCS, 70 - TCF_META_ID_SK_ROUTE_CAPS, 70 + __TCF_META_ID_SK_ROUTE_CAPS, /* unimplemented but in ABI already */ 71 71 TCF_META_ID_SK_HASH, 72 72 TCF_META_ID_SK_LINGERTIME, 73 73 TCF_META_ID_SK_ACK_BACKLOG,
-7
net/sched/em_meta.c
··· 404 404 dst->value = (__force int) skb->sk->sk_allocation; 405 405 } 406 406 407 - META_COLLECTOR(int_sk_route_caps) 408 - { 409 - SKIP_NONLOCAL(skb); 410 - dst->value = skb->sk->sk_route_caps; 411 - } 412 - 413 407 META_COLLECTOR(int_sk_hash) 414 408 { 415 409 SKIP_NONLOCAL(skb); ··· 524 530 [META_ID(SK_ERR_QLEN)] = META_FUNC(int_sk_err_qlen), 525 531 [META_ID(SK_FORWARD_ALLOCS)] = META_FUNC(int_sk_fwd_alloc), 526 532 [META_ID(SK_ALLOCS)] = META_FUNC(int_sk_alloc), 527 - [META_ID(SK_ROUTE_CAPS)] = META_FUNC(int_sk_route_caps), 528 533 [META_ID(SK_HASH)] = META_FUNC(int_sk_hash), 529 534 [META_ID(SK_LINGERTIME)] = META_FUNC(int_sk_lingertime), 530 535 [META_ID(SK_ACK_BACKLOG)] = META_FUNC(int_sk_ack_bl),