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

Commit 70314fc6 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Merge tag 'ipvs2-for-v3.19' of... 

Merge tag 'ipvs2-for-v3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next

 into ipvs-next

Simon Horman says:

====================
Second round of IPVS Updates for v3.19

please consider these IPVS updates for v3.19 or alternatively v3.20.

The single patch in this series fixes a long standing bug that
has not caused any trouble and thus is not being prioritised as a fix.
====================

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents ac9a3d84 3b05ac38

net/netfilter/ipvs/ip_vs_ftp.c

+5 −5
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp, 
	struct nf_conn *ct;

	struct net *net;



	*diff = 0;



#ifdef CONFIG_IP_VS_IPV6

	/* This application helper doesn't work with IPv6 yet,

	 * so turn this into a no-op for IPv6 packets
@@ -191,8 +193,6 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp, 
		return 1;

#endif



	*diff = 0;



	/* Only useful for established sessions */

	if (cp->state != IP_VS_TCP_S_ESTABLISHED)

		return 1;
@@ -322,6 +322,9 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, 
	struct ip_vs_conn *n_cp;

	struct net *net;



	/* no diff required for incoming packets */

	*diff = 0;



#ifdef CONFIG_IP_VS_IPV6

	/* This application helper doesn't work with IPv6 yet,

	 * so turn this into a no-op for IPv6 packets
@@ -330,9 +333,6 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, 
		return 1;

#endif



	/* no diff required for incoming packets */

	*diff = 0;



	/* Only useful for established sessions */

	if (cp->state != IP_VS_TCP_S_ESTABLISHED)

		return 1;