Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a72a5e2d34ec2921c0d9a7545093087e4cb90d0a

Authored by Florian Westphal
Committed by David S. Miller
1 parent 2fbf575867

inet: kill unused skb_free op 

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

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 5 changed files with 1 additions and 13 deletions Side-by-side Diff

include/net/inet_frag.h
Diff comments   View file @ a72a5e2
... ... @@ -99,7 +99,6 @@
99 99 void (*constructor)(struct inet_frag_queue *q,
100 100 const void *arg);
101 101 void (*destructor)(struct inet_frag_queue *);
102   - void (*skb_free)(struct sk_buff *);
103 102 void (*frag_expire)(unsigned long data);
104 103 struct kmem_cache *frags_cachep;
105 104 const char *frags_cache_name;
net/ieee802154/6lowpan/reassembly.c
Diff comments   View file @ a72a5e2
... ... @@ -624,7 +624,6 @@
624 624 lowpan_frags.hashfn = lowpan_hashfn;
625 625 lowpan_frags.constructor = lowpan_frag_init;
626 626 lowpan_frags.destructor = NULL;
627   - lowpan_frags.skb_free = NULL;
628 627 lowpan_frags.qsize = sizeof(struct frag_queue);
629 628 lowpan_frags.match = lowpan_frag_match;
630 629 lowpan_frags.frag_expire = lowpan_frag_expire;
net/ipv4/inet_fragment.c
Diff comments   View file @ a72a5e2
... ... @@ -285,14 +285,6 @@
285 285 }
286 286 EXPORT_SYMBOL(inet_frag_kill);
287 287  
288   -static inline void frag_kfree_skb(struct netns_frags *nf, struct inet_frags *f,
289   - struct sk_buff *skb)
290   -{
291   - if (f->skb_free)
292   - f->skb_free(skb);
293   - kfree_skb(skb);
294   -}
295   -
296 288 void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f)
297 289 {
298 290 struct sk_buff *fp;
... ... @@ -309,7 +301,7 @@
309 301 struct sk_buff *xp = fp->next;
310 302  
311 303 sum_truesize += fp->truesize;
312   - frag_kfree_skb(nf, f, fp);
  304 + kfree_skb(fp);
313 305 fp = xp;
314 306 }
315 307 sum = sum_truesize + f->qsize;
net/ipv4/ip_fragment.c
Diff comments   View file @ a72a5e2
... ... @@ -891,7 +891,6 @@
891 891 ip4_frags.hashfn = ip4_hashfn;
892 892 ip4_frags.constructor = ip4_frag_init;
893 893 ip4_frags.destructor = ip4_frag_free;
894   - ip4_frags.skb_free = NULL;
895 894 ip4_frags.qsize = sizeof(struct ipq);
896 895 ip4_frags.match = ip4_frag_match;
897 896 ip4_frags.frag_expire = ip_expire;
net/ipv6/reassembly.c
Diff comments   View file @ a72a5e2
... ... @@ -755,7 +755,6 @@
755 755 ip6_frags.hashfn = ip6_hashfn;
756 756 ip6_frags.constructor = ip6_frag_init;
757 757 ip6_frags.destructor = NULL;
758   - ip6_frags.skb_free = NULL;
759 758 ip6_frags.qsize = sizeof(struct frag_queue);
760 759 ip6_frags.match = ip6_frag_match;
761 760 ip6_frags.frag_expire = ip6_frag_expire;