ipvs: Pass ipvs not net to ip_vs_sync_conn_v0 (72e9481e) · Commits · 戴 / test

net/netfilter/ipvs/ip_vs_sync.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -533,10 +533,9 @@ set:
		* Version 0 , could be switched in by sys_ctl.
		* Add an ip_vs_conn information into the current sync_buff.
		*/
		static void ip_vs_sync_conn_v0(struct net net, struct ip_vs_conn cp,
		static void ip_vs_sync_conn_v0(struct netns_ipvs ipvs, struct ip_vs_conn cp,
		int pkts)
		{
		struct netns_ipvs *ipvs = net_ipvs(net);
		struct ip_vs_sync_mesg_v0 *m;
		struct ip_vs_sync_conn_v0 *s;
		struct ip_vs_sync_buff *buff;
		@@ -615,7 +614,7 @@ static void ip_vs_sync_conn_v0(struct net net, struct ip_vs_conn cp,
		pkts = atomic_add_return(1, &cp->in_pkts);
		else
		pkts = sysctl_sync_threshold(ipvs);
		ip_vs_sync_conn(net, cp, pkts);
		ip_vs_sync_conn(ipvs->net, cp, pkts);
		}
		}

		@@ -637,7 +636,7 @@ void ip_vs_sync_conn(struct net net, struct ip_vs_conn cp, int pkts)

		/* Handle old version of the protocol */
		if (sysctl_sync_ver(ipvs) == 0) {
		ip_vs_sync_conn_v0(net, cp, pkts);
		ip_vs_sync_conn_v0(ipvs, cp, pkts);
		return;
		}
		/* Do not sync ONE PACKET */