Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7d537f3ab7694709981498c37233a0874d18c639

Authored by Eric W. Biederman
Committed by Simon Horman
1 parent 37b68e6ded

ipvs: Pass ipvs not net to ip_vs_process_message 

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>

Showing 1 changed file with 3 additions and 4 deletions Side-by-side Diff

net/netfilter/ipvs/ip_vs_sync.c
Diff comments   View file @ 7d537f3
... ... @@ -1204,10 +1204,9 @@
1204 1204 * ip_vs_conn entries.
1205 1205 * Handles Version 0 & 1
1206 1206 */
1207   -static void ip_vs_process_message(struct net *net, __u8 *buffer,
  1207 +static void ip_vs_process_message(struct netns_ipvs *ipvs, __u8 *buffer,
1208 1208 const size_t buflen)
1209 1209 {
1210   - struct netns_ipvs *ipvs = net_ipvs(net);
1211 1210 struct ip_vs_sync_mesg *m2 = (struct ip_vs_sync_mesg *)buffer;
1212 1211 __u8 *p, *msg_end;
1213 1212 int i, nr_conns;
... ... @@ -1257,7 +1256,7 @@
1257 1256 return;
1258 1257 }
1259 1258 /* Process a single sync_conn */
1260   - retc = ip_vs_proc_sync_conn(net, p, msg_end);
  1259 + retc = ip_vs_proc_sync_conn(ipvs->net, p, msg_end);
1261 1260 if (retc < 0) {
1262 1261 IP_VS_ERR_RL("BACKUP, Dropping buffer, Err: %d in decoding\n",
1263 1262 retc);
... ... @@ -1763,7 +1762,7 @@
1763 1762 break;
1764 1763 }
1765 1764  
1766   - ip_vs_process_message(ipvs->net, tinfo->buf, len);
  1765 + ip_vs_process_message(ipvs, tinfo->buf, len);
1767 1766 }
1768 1767 }
1769 1768