Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e20e6940 authored by Michał Mirosław's avatar Michał Mirosław Committed by David S. Miller
Browse files

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: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 974151e6

include/linux/tc_ematch/tc_em_meta.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

net/sched/em_meta.c

+0 −7
Original line number Diff line number Diff line
@@ -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),