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

Commit 1fc12004 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Pass ipvs not net to ip_vs_proc_sync_conn 



Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 4f30665b

net/netfilter/ipvs/ip_vs_sync.c

+2 −3
Original line number Diff line number Diff line
@@ -1064,9 +1064,8 @@ static int ip_vs_proc_str(__u8 *p, unsigned int plen, unsigned int *data_len, 
/*

 *   Process a Version 1 sync. connection

 */

static inline int ip_vs_proc_sync_conn(struct net *net, __u8 *p, __u8 *msg_end)

static inline int ip_vs_proc_sync_conn(struct netns_ipvs *ipvs, __u8 *p, __u8 *msg_end)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct ip_vs_sync_conn_options opt;

	union  ip_vs_sync_conn *s;

	struct ip_vs_protocol *pp;
@@ -1254,7 +1253,7 @@ static void ip_vs_process_message(struct netns_ipvs *ipvs, __u8 *buffer, 
				return;

			}

			/* Process a single sync_conn */

			retc = ip_vs_proc_sync_conn(ipvs->net, p, msg_end);

			retc = ip_vs_proc_sync_conn(ipvs, p, msg_end);

			if (retc < 0) {

				IP_VS_ERR_RL("BACKUP, Dropping buffer, Err: %d in decoding\n",

					     retc);