diff options
author | David S. Miller <davem@davemloft.net> | 2012-01-02 23:56:49 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-02 23:56:49 (GMT) |
commit | 455ffa607f0efa90c9fec99604553b7cdd5274b2 (patch) | |
tree | 6ff12c853b4a26612ceea8191a8eae29b130b670 /include | |
parent | 3ab0b245aa550ea4670d096092ca8e8d5e14ac89 (diff) | |
parent | 115e8e705e4be071b9e06ff72578e3b603f2ba65 (diff) | |
download | linux-455ffa607f0efa90c9fec99604553b7cdd5274b2.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include')
-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 48fd12e..ebe517f 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); |