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

Commit e176fe89 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[NET]: Remove unused security member in sk_buff 



Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3154e540

include/linux/skbuff.h

+1 −3
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ struct skb_shared_info { 
 *	@priority: Packet queueing priority

 *	@users: User count - see {datagram,tcp}.c

 *	@protocol: Packet protocol from driver

 *	@security: Security level of packet

 *	@truesize: Buffer size 

 *	@head: Head of buffer

 *	@data: Data head pointer
@@ -255,8 +254,7 @@ struct sk_buff { 
				pkt_type,

				ip_summed;

	__u32			priority;

	unsigned short		protocol,

				security;

	unsigned short		protocol;



	void			(*destructor)(struct sk_buff *skb);

#ifdef CONFIG_NETFILTER

include/linux/tc_ematch/tc_em_meta.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ enum 
	TCF_META_ID_REALDEV,

	TCF_META_ID_PRIORITY,

	TCF_META_ID_PROTOCOL,

	TCF_META_ID_SECURITY,

	TCF_META_ID_SECURITY, /* obsolete */

	TCF_META_ID_PKTTYPE,

	TCF_META_ID_PKTLEN,

	TCF_META_ID_DATALEN,

net/core/skbuff.c

+0 −2
Original line number Diff line number Diff line
@@ -357,7 +357,6 @@ struct sk_buff *skb_clone(struct sk_buff *skb, int gfp_mask) 
	C(ip_summed);

	C(priority);

	C(protocol);

	C(security);

	n->destructor = NULL;

#ifdef CONFIG_NETFILTER

	C(nfmark);
@@ -422,7 +421,6 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old) 
	new->pkt_type	= old->pkt_type;

	new->stamp	= old->stamp;

	new->destructor = NULL;

	new->security	= old->security;

#ifdef CONFIG_NETFILTER

	new->nfmark	= old->nfmark;

	new->nfcache	= old->nfcache;

net/ipv4/ip_output.c

+0 −1
Original line number Diff line number Diff line
@@ -389,7 +389,6 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from) 
	to->pkt_type = from->pkt_type;

	to->priority = from->priority;

	to->protocol = from->protocol;

	to->security = from->security;

	dst_release(to->dst);

	to->dst = dst_clone(from->dst);

	to->dev = from->dev;

net/ipv6/ip6_output.c

+0 −1
Original line number Diff line number Diff line
@@ -465,7 +465,6 @@ static void ip6_copy_metadata(struct sk_buff *to, struct sk_buff *from) 
	to->pkt_type = from->pkt_type;

	to->priority = from->priority;

	to->protocol = from->protocol;

	to->security = from->security;

	dst_release(to->dst);

	to->dst = dst_clone(from->dst);

	to->dev = from->dev;