summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-01-02 18:56:49 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-02 18:56:49 -0500
commit455ffa607f0efa90c9fec99604553b7cdd5274b2 (patch)
tree6ff12c853b4a26612ceea8191a8eae29b130b670 /include/net
parent3ab0b245aa550ea4670d096092ca8e8d5e14ac89 (diff)
parent115e8e705e4be071b9e06ff72578e3b603f2ba65 (diff)
downloadlinux-455ffa607f0efa90c9fec99604553b7cdd5274b2.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ip_vs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 48fd12e9d3af..ebe517f2da9f 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);