diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-03 00:56:49 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-03 00:56:49 +0100 |
| commit | 455ffa607f0efa90c9fec99604553b7cdd5274b2 (patch) | |
| tree | 6ff12c853b4a26612ceea8191a8eae29b130b670 /include/net/ip_vs.h | |
| parent | netfilter: nfnetlink_acct: fix nfnl_acct_get operation (diff) | |
| parent | Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| download | linux-455ffa607f0efa90c9fec99604553b7cdd5274b2.tar.xz linux-455ffa607f0efa90c9fec99604553b7cdd5274b2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include/net/ip_vs.h')
| -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 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); |