public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipvs: Pass ipvs not net to ip_vs_proc_sync_conn

Browse source 
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Eric W. Biederman 2015-09-21 13:02:19 -05:00 • committed by Simon Horman
parent 4f30665bac
commit 1fc12004d2
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/netfilter/ipvs/ip_vs_sync.c
View file

@ -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 * 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; struct ip_vs_sync_conn_options opt;
union ip_vs_sync_conn *s; union ip_vs_sync_conn *s;
struct ip_vs_protocol *pp; struct ip_vs_protocol *pp;
@ -1254,7 +1253,7 @@ static void ip_vs_process_message(struct netns_ipvs *ipvs, __u8 *buffer,
return; return;
} }
/* Process a single sync_conn */ /* 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) { if (retc < 0) {
IP_VS_ERR_RL("BACKUP, Dropping buffer, Err: %d in decoding\n", IP_VS_ERR_RL("BACKUP, Dropping buffer, Err: %d in decoding\n",
retc); retc);