git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
net
/
netfilter
/
ipvs
/
ip_vs_sync.c
diff --git
a/net/netfilter/ipvs/ip_vs_sync.c
b/net/netfilter/ipvs/ip_vs_sync.c
index
3cdd479
..
2b6678c
100644
(file)
--- a/
net/netfilter/ipvs/ip_vs_sync.c
+++ b/
net/netfilter/ipvs/ip_vs_sync.c
@@
-740,7
+740,7
@@
static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
* but still handled.
*/
dest = ip_vs_find_dest(net, type, daddr, dport, param->vaddr,
- param->vport, protocol, fwmark);
+ param->vport, protocol, fwmark
, flags
);
/* Set the approprite ativity flag */
if (protocol == IPPROTO_TCP) {