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

Commit a72a5e2d authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

inet: kill unused skb_free op 



The only user was removed in commit
029f7f3b ("netfilter: ipv6: nf_defrag: avoid/free clone operations").

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2fbf5758

include/net/inet_frag.h

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ struct inet_frags { 
	void			(*constructor)(struct inet_frag_queue *q,

					       const void *arg);

	void			(*destructor)(struct inet_frag_queue *);

	void			(*skb_free)(struct sk_buff *);

	void			(*frag_expire)(unsigned long data);

	struct kmem_cache	*frags_cachep;

	const char		*frags_cache_name;

net/ieee802154/6lowpan/reassembly.c

+0 −1
Original line number Diff line number Diff line
@@ -624,7 +624,6 @@ int __init lowpan_net_frag_init(void) 
	lowpan_frags.hashfn = lowpan_hashfn;

	lowpan_frags.constructor = lowpan_frag_init;

	lowpan_frags.destructor = NULL;

	lowpan_frags.skb_free = NULL;

	lowpan_frags.qsize = sizeof(struct frag_queue);

	lowpan_frags.match = lowpan_frag_match;

	lowpan_frags.frag_expire = lowpan_frag_expire;

net/ipv4/inet_fragment.c

+1 −9
Original line number Diff line number Diff line
@@ -285,14 +285,6 @@ void inet_frag_kill(struct inet_frag_queue *fq, struct inet_frags *f) 
}

EXPORT_SYMBOL(inet_frag_kill);



static inline void frag_kfree_skb(struct netns_frags *nf, struct inet_frags *f,

				  struct sk_buff *skb)

{

	if (f->skb_free)

		f->skb_free(skb);

	kfree_skb(skb);

}



void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f)

{

	struct sk_buff *fp;
@@ -309,7 +301,7 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f) 
		struct sk_buff *xp = fp->next;



		sum_truesize += fp->truesize;

		frag_kfree_skb(nf, f, fp);

		kfree_skb(fp);

		fp = xp;

	}

	sum = sum_truesize + f->qsize;

net/ipv4/ip_fragment.c

+0 −1
Original line number Diff line number Diff line
@@ -891,7 +891,6 @@ void __init ipfrag_init(void) 
	ip4_frags.hashfn = ip4_hashfn;

	ip4_frags.constructor = ip4_frag_init;

	ip4_frags.destructor = ip4_frag_free;

	ip4_frags.skb_free = NULL;

	ip4_frags.qsize = sizeof(struct ipq);

	ip4_frags.match = ip4_frag_match;

	ip4_frags.frag_expire = ip_expire;

net/ipv6/reassembly.c

+0 −1
Original line number Diff line number Diff line
@@ -755,7 +755,6 @@ int __init ipv6_frag_init(void) 
	ip6_frags.hashfn = ip6_hashfn;

	ip6_frags.constructor = ip6_frag_init;

	ip6_frags.destructor = NULL;

	ip6_frags.skb_free = NULL;

	ip6_frags.qsize = sizeof(struct frag_queue);

	ip6_frags.match = ip6_frag_match;

	ip6_frags.frag_expire = ip6_frag_expire;