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

Commit f1f71e03 authored by Roberto Nibali's avatar Roberto Nibali Committed by David S. Miller
Browse files

[IPVS]: remove dead code 



This patch removes dead code. I don't see the reason to keep this cruft
around, besides cluttering the nice and functionally working code.

Signed-off-by: default avatarRoberto Nibali <ratz@drugphish.ch>
Signed-off-by: default avatarHorms <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65a45441

net/ipv4/ipvs/ip_vs_app.c

+0 −28
Original line number Diff line number Diff line
@@ -224,34 +224,6 @@ void unregister_ip_vs_app(struct ip_vs_app *app) 
}





#if 0000

/*

 *	Get reference to app by name (called from user context)

 */

struct ip_vs_app *ip_vs_app_get_by_name(char *appname)

{

	struct ip_vs_app *app, *a = NULL;



	down(&__ip_vs_app_mutex);



	list_for_each_entry(ent, &ip_vs_app_list, a_list) {

		if (strcmp(app->name, appname))

			continue;



		/* softirq may call ip_vs_app_get too, so the caller

		   must disable softirq on the current CPU */

		if (ip_vs_app_get(app))

			a = app;

		break;

	}



	up(&__ip_vs_app_mutex);



	return a;

}

#endif





/*

 *	Bind ip_vs_conn to its ip_vs_app (called by cp constructor)

 */

net/ipv4/ipvs/ip_vs_lblc.c

+0 −27
Original line number Diff line number Diff line
@@ -228,33 +228,6 @@ ip_vs_lblc_hash(struct ip_vs_lblc_table *tbl, struct ip_vs_lblc_entry *en) 
}





#if 0000

/*

 *	Unhash ip_vs_lblc_entry from ip_vs_lblc_table.

 *	returns bool success.

 */

static int ip_vs_lblc_unhash(struct ip_vs_lblc_table *tbl,

			     struct ip_vs_lblc_entry *en)

{

	if (list_empty(&en->list)) {

		IP_VS_ERR("ip_vs_lblc_unhash(): request for not hashed entry, "

			  "called from %p\n", __builtin_return_address(0));

		return 0;

	}



	/*

	 * Remove it from the table

	 */

	write_lock(&tbl->lock);

	list_del(&en->list);

	INIT_LIST_HEAD(&en->list);

	write_unlock(&tbl->lock);



	return 1;

}

#endif





/*

 *  Get ip_vs_lblc_entry associated with supplied parameters.

 */

net/ipv4/ipvs/ip_vs_lblcr.c

+0 −27
Original line number Diff line number Diff line
@@ -414,33 +414,6 @@ ip_vs_lblcr_hash(struct ip_vs_lblcr_table *tbl, struct ip_vs_lblcr_entry *en) 
}





#if 0000

/*

 *	Unhash ip_vs_lblcr_entry from ip_vs_lblcr_table.

 *	returns bool success.

 */

static int ip_vs_lblcr_unhash(struct ip_vs_lblcr_table *tbl,

			     struct ip_vs_lblcr_entry *en)

{

	if (list_empty(&en->list)) {

		IP_VS_ERR("ip_vs_lblcr_unhash(): request for not hashed entry, "

			  "called from %p\n", __builtin_return_address(0));

		return 0;

	}



	/*

	 * Remove it from the table

	 */

	write_lock(&tbl->lock);

	list_del(&en->list);

	INIT_LIST_HEAD(&en->list);

	write_unlock(&tbl->lock);



	return 1;

}

#endif





/*

 *  Get ip_vs_lblcr_entry associated with supplied parameters.

 */

net/ipv4/ipvs/ip_vs_proto_tcp.c

+0 −22
Original line number Diff line number Diff line
@@ -275,28 +275,6 @@ static int tcp_timeouts[IP_VS_TCP_S_LAST+1] = { 
	[IP_VS_TCP_S_LAST]		=	2*HZ,

};





#if 0



/* FIXME: This is going to die */



static int tcp_timeouts_dos[IP_VS_TCP_S_LAST+1] = {

	[IP_VS_TCP_S_NONE]		=	2*HZ,

	[IP_VS_TCP_S_ESTABLISHED]	=	8*60*HZ,

	[IP_VS_TCP_S_SYN_SENT]		=	60*HZ,

	[IP_VS_TCP_S_SYN_RECV]		=	10*HZ,

	[IP_VS_TCP_S_FIN_WAIT]		=	60*HZ,

	[IP_VS_TCP_S_TIME_WAIT]		=	60*HZ,

	[IP_VS_TCP_S_CLOSE]		=	10*HZ,

	[IP_VS_TCP_S_CLOSE_WAIT]	=	60*HZ,

	[IP_VS_TCP_S_LAST_ACK]		=	30*HZ,

	[IP_VS_TCP_S_LISTEN]		=	2*60*HZ,

	[IP_VS_TCP_S_SYNACK]		=	100*HZ,

	[IP_VS_TCP_S_LAST]		=	2*HZ,

};



#endif



static char * tcp_state_name_table[IP_VS_TCP_S_LAST+1] = {

	[IP_VS_TCP_S_NONE]		=	"NONE",

	[IP_VS_TCP_S_ESTABLISHED]	=	"ESTABLISHED",