diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-01 19:36:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-01 19:36:08 -0800 |
| commit | 733bbb7e1c3acb8fabc55595bf1df8973dde7736 (patch) | |
| tree | 779bc62fda19d2176ff7059fa59b0932c9ebc4c5 /include/net | |
| parent | c7f46b7aa4ae5cbef32eb5e016512a14f936affa (diff) | |
| parent | c121638277a71c1e1fb44c3e654ea353357bbc2c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
netfilter: ctnetlink: fix timeout calculation
ipvs: try also real server with port 0 in backup server
skge: restore rx multicast filter on resume and after config changes
mlx4_en: nullify cq->vector field when closing completion queue
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip_vs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 873d5be7926..e5a7b9aaf55 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -1207,7 +1207,7 @@ extern void ip_vs_control_cleanup(void); extern struct ip_vs_dest * ip_vs_find_dest(struct net *net, int af, const union nf_inet_addr *daddr, __be16 dport, const union nf_inet_addr *vaddr, __be16 vport, - __u16 protocol, __u32 fwmark); + __u16 protocol, __u32 fwmark, __u32 flags); extern struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp); |