Commit 3c2de2ae authored by Simon Horman's avatar Simon Horman Committed by Pablo Neira Ayuso
Browse files

ipvs: Remove unused parameter from ip_vs_confirm_conntrack() 



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 7e777dd4

include/net/ip_vs.h

+2 −3
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ static inline int ip_vs_conntrack_enabled(struct netns_ipvs *ipvs) 


extern void ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp,

				   int outin);

extern int ip_vs_confirm_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp);

extern int ip_vs_confirm_conntrack(struct sk_buff *skb);

extern void ip_vs_nfct_expect_related(struct sk_buff *skb, struct nf_conn *ct,

				      struct ip_vs_conn *cp, u_int8_t proto,

				      const __be16 port, int from_rs);
@@ -1396,8 +1396,7 @@ static inline void ip_vs_update_conntrack(struct sk_buff *skb, 
{

}



static inline int ip_vs_confirm_conntrack(struct sk_buff *skb,

					  struct ip_vs_conn *cp)

static inline int ip_vs_confirm_conntrack(struct sk_buff *skb);

{

	return NF_ACCEPT;

}

net/netfilter/ipvs/ip_vs_nfct.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, int outin) 
	nf_conntrack_alter_reply(ct, &new_tuple);

}



int ip_vs_confirm_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp)

int ip_vs_confirm_conntrack(struct sk_buff *skb)

{

	return nf_conntrack_confirm(skb);

}

net/netfilter/ipvs/ip_vs_xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ ip_vs_dst_reset(struct ip_vs_dest *dest) 
								\

	(skb)->ipvs_property = 1;				\

	if (unlikely((cp)->flags & IP_VS_CONN_F_NFCT))		\

		__ret = ip_vs_confirm_conntrack(skb, cp);	\

		__ret = ip_vs_confirm_conntrack(skb);		\

	if (__ret == NF_ACCEPT) {				\

		nf_reset(skb);					\

		skb_forward_csum(skb);				\