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

Commit 02eca9d2 authored by stephen hemminger's avatar stephen hemminger Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: remove unused code 



Function never used in current upstream code.

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 34ce3240

include/linux/netfilter/ipset/ip_set.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -331,7 +331,6 @@ extern ip_set_id_t ip_set_get_byname(struct net *net, 
				     const char *name, struct ip_set **set);

				     const char *name, struct ip_set **set);

extern void ip_set_put_byindex(struct net *net, ip_set_id_t index);

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 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 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);

extern void ip_set_nfnl_put(struct net *net, ip_set_id_t index);

net/netfilter/ipset/ip_set_core.c

+0 −28
Original line number Original line Diff line number Diff line
@@ -624,34 +624,6 @@ EXPORT_SYMBOL_GPL(ip_set_name_byindex); 
 * call nfnl_lock for us.

 * call nfnl_lock for us.

 */

 */





/*

 * 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

 * Find set by index, reference it once. The reference makes sure the

 * thing pointed to, does not go away under our feet.

 * thing pointed to, does not go away under our feet.