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

Commit 4a516f11 authored by Simon Horman's avatar Simon Horman Committed by Pablo Neira Ayuso
Browse files

ipvs: Remove unused return value of protocol state transitions 



Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Acked-by Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3c2de2ae

include/net/ip_vs.h

+3 −3
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ struct ip_vs_protocol { 


	const char *(*state_name)(int state);



	int (*state_transition)(struct ip_vs_conn *cp, int direction,

	void (*state_transition)(struct ip_vs_conn *cp, int direction,

				 const struct sk_buff *skb,

				 struct ip_vs_proto_data *pd);

net/netfilter/ipvs/ip_vs_core.c

+6 −7
Original line number Diff line number Diff line
@@ -188,14 +188,13 @@ ip_vs_conn_stats(struct ip_vs_conn *cp, struct ip_vs_service *svc) 
}





static inline int

static inline void

ip_vs_set_state(struct ip_vs_conn *cp, int direction,

		const struct sk_buff *skb,

		struct ip_vs_proto_data *pd)

{

	if (unlikely(!pd->pp->state_transition))

		return 0;

	return pd->pp->state_transition(cp, direction, skb, pd);

	if (likely(pd->pp->state_transition))

		pd->pp->state_transition(cp, direction, skb, pd);

}



static inline int
@@ -557,7 +556,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, 
		ip_vs_in_stats(cp, skb);



		/* set state */

		cs = ip_vs_set_state(cp, IP_VS_DIR_INPUT, skb, pd);

		ip_vs_set_state(cp, IP_VS_DIR_INPUT, skb, pd);



		/* transmit the first SYN packet */

		ret = cp->packet_xmit(skb, cp, pd->pp);
@@ -1490,7 +1489,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) 
	struct ip_vs_protocol *pp;

	struct ip_vs_proto_data *pd;

	struct ip_vs_conn *cp;

	int ret, restart, pkts;

	int ret, pkts;

	struct netns_ipvs *ipvs;



	/* Already marked as IPVS request or reply? */
@@ -1591,7 +1590,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) 
	}



	ip_vs_in_stats(cp, skb);

	restart = ip_vs_set_state(cp, IP_VS_DIR_INPUT, skb, pd);

	ip_vs_set_state(cp, IP_VS_DIR_INPUT, skb, pd);

	if (cp->packet_xmit)

		ret = cp->packet_xmit(skb, cp, pp);

		/* do not touch skb anymore */

net/netfilter/ipvs/ip_vs_proto_sctp.c

+4 −10
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static const char *sctp_state_name(int state) 
	return "?";

}



static inline int

static inline void

set_sctp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp,

		int direction, const struct sk_buff *skb)

{
@@ -924,7 +924,7 @@ set_sctp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp, 
	sch = skb_header_pointer(skb, ihl + sizeof(sctp_sctphdr_t),

				sizeof(_sctpch), &_sctpch);

	if (sch == NULL)

		return 0;

		return;



	chunk_type = sch->type;

	/*
@@ -993,21 +993,15 @@ set_sctp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp, 
		cp->timeout = pd->timeout_table[cp->state = next_state];

	else	/* What to do ? */

		cp->timeout = sctp_timeouts[cp->state = next_state];



	return 1;

}



static int

static void

sctp_state_transition(struct ip_vs_conn *cp, int direction,

		const struct sk_buff *skb, struct ip_vs_proto_data *pd)

{

	int ret = 0;



	spin_lock(&cp->lock);

	ret = set_sctp_state(pd, cp, direction, skb);

	set_sctp_state(pd, cp, direction, skb);

	spin_unlock(&cp->lock);



	return ret;

}



static inline __u16 sctp_app_hashkey(__be16 port)

net/netfilter/ipvs/ip_vs_proto_tcp.c

+2 −4
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ set_tcp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp, 
/*

 *	Handle state transitions

 */

static int

static void

tcp_state_transition(struct ip_vs_conn *cp, int direction,

		     const struct sk_buff *skb,

		     struct ip_vs_proto_data *pd)
@@ -561,13 +561,11 @@ tcp_state_transition(struct ip_vs_conn *cp, int direction, 


	th = skb_header_pointer(skb, ihl, sizeof(_tcph), &_tcph);

	if (th == NULL)

		return 0;

		return;



	spin_lock(&cp->lock);

	set_tcp_state(pd, cp, direction, th);

	spin_unlock(&cp->lock);



	return 1;

}



static inline __u16 tcp_app_hashkey(__be16 port)

net/netfilter/ipvs/ip_vs_proto_udp.c

+2 −3
Original line number Diff line number Diff line
@@ -454,18 +454,17 @@ static const char * udp_state_name(int state) 
	return udp_state_name_table[state] ? udp_state_name_table[state] : "?";

}



static int

static void

udp_state_transition(struct ip_vs_conn *cp, int direction,

		     const struct sk_buff *skb,

		     struct ip_vs_proto_data *pd)

{

	if (unlikely(!pd)) {

		pr_err("UDP no ns data\n");

		return 0;

		return;

	}



	cp->timeout = pd->timeout_table[IP_VS_UDP_S_NORMAL];

	return 1;

}



static void __udp_init(struct net *net, struct ip_vs_proto_data *pd)