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>

diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index ac42bbb37b2dd5ca16bee092c3fc4481667f8bf2..12aac0fd6ee7cd9d5963d69a606ebbc5b9981b26 100644 (file)
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -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;

diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
index 6b437e8760d314c5314cc1deb2d5d13dff0f2ec8..30d875dff6b54658f2671ae48a4e1fce8b750c3e 100644 (file)
--- a/net/ieee802154/6lowpan/reassembly.c
+++ b/net/ieee802154/6lowpan/reassembly.c
@@ -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;

diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index fe144dae7372dcfa3e0c5dc34f66ce9cfde2e7a3..3a88b0c73797231e1468de8297045c8ad725ccfa 100644 (file)
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -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;

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 1fe55ae817818abf9f10fa4c06a222476d3d3c45..3f00810b7288991f83ba147a65ac4f78e68ae594 100644 (file)
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -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;

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 45f5ae51de65c0fb4d700bad79a05c1e750309e0..18f3498a6c80564d897a2f659a7747827d19a667 100644 (file)
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -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;