[PATCH net-next] ipset: remove unused code

[PATCH net-next] ipset: remove unused code

[Stephen Hemminger]

Function never used in current upstream code.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>


--- a/include/linux/netfilter/ipset/ip_set.h	2013-12-30 15:37:28.704768854 -0800
+++ b/include/linux/netfilter/ipset/ip_set.h	2013-12-30 16:59:22.806917895 -0800
@@ -331,7 +331,6 @@ extern ip_set_id_t ip_set_get_byname(str
 				     const char *name, struct ip_set **set);
 extern void ip_set_put_byindex(struct net *net, ip_set_id_t index);
 extern const char *ip_set_name_byindex(struct net *net, ip_set_id_t index);
-extern ip_set_id_t ip_set_nfnl_get(struct net *net, const char *name);
 extern ip_set_id_t ip_set_nfnl_get_byindex(struct net *net, ip_set_id_t index);
 extern void ip_set_nfnl_put(struct net *net, ip_set_id_t index);
 
--- a/net/netfilter/ipset/ip_set_core.c	2013-12-30 15:37:28.704768854 -0800
+++ b/net/netfilter/ipset/ip_set_core.c	2013-12-30 16:59:22.810917833 -0800
@@ -625,34 +625,6 @@ EXPORT_SYMBOL_GPL(ip_set_name_byindex);
  */
 
 /*
- * Find set by name, reference it once. The reference makes sure the
- * thing pointed to, does not go away under our feet.
- *
- * The nfnl mutex is used in the function.
- */
-ip_set_id_t
-ip_set_nfnl_get(struct net *net, const char *name)
-{
-	ip_set_id_t i, index = IPSET_INVALID_ID;
-	struct ip_set *s;
-	struct ip_set_net *inst = ip_set_pernet(net);
-
-	nfnl_lock(NFNL_SUBSYS_IPSET);
-	for (i = 0; i < inst->ip_set_max; i++) {
-		s = nfnl_set(inst, i);
-		if (s != NULL && STREQ(s->name, name)) {
-			__ip_set_get(s);
-			index = i;
-			break;
-		}
-	}
-	nfnl_unlock(NFNL_SUBSYS_IPSET);
-
-	return index;
-}
-EXPORT_SYMBOL_GPL(ip_set_nfnl_get);
-
-/*
  * Find set by index, reference it once. The reference makes sure the
  * thing pointed to, does not go away under our feet.
  *

Re: [PATCH net-next] ipset: remove unused code

[Pablo Neira Ayuso]

On Mon, Dec 30, 2013 at 05:13:10PM -0800, Stephen Hemminger wrote:
> Function never used in current upstream code.

applied, thanks Stephen.