diff options
| author | Hans Schillstrom | 2010-11-19 14:25:07 +0100 |
|---|---|---|
| committer | Simon Horman | 2010-11-25 02:42:58 +0100 |
| commit | 0e051e683ba4acb4e67c272c6a89707d974099d1 (patch) | |
| tree | c834c362a50e68573256b813bcfcd86c6cc41db8 /net/netfilter/ipvs/ip_vs_ctl.c | |
| parent | Merge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/h... (diff) | |
| download | kernel-qcow2-linux-0e051e683ba4acb4e67c272c6a89707d974099d1.tar.gz kernel-qcow2-linux-0e051e683ba4acb4e67c272c6a89707d974099d1.tar.xz kernel-qcow2-linux-0e051e683ba4acb4e67c272c6a89707d974099d1.zip | |
IPVS: Backup, Prepare for transferring firewall marks (fwmark) to the backup daemon.
One struct will have fwmark added:
* ip_vs_conn
ip_vs_conn_new() and ip_vs_find_dest()
will have an extra param - fwmark
The effects of that, is in this patch.
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ctl.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 3e92558dfcc2..a5bd00279047 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -657,12 +657,12 @@ ip_vs_lookup_dest(struct ip_vs_service *svc, const union nf_inet_addr *daddr, struct ip_vs_dest *ip_vs_find_dest(int af, const union nf_inet_addr *daddr, __be16 dport, const union nf_inet_addr *vaddr, - __be16 vport, __u16 protocol) + __be16 vport, __u16 protocol, __u32 fwmark) { struct ip_vs_dest *dest; struct ip_vs_service *svc; - svc = ip_vs_service_get(af, 0, protocol, vaddr, vport); + svc = ip_vs_service_get(af, fwmark, protocol, vaddr, vport); if (!svc) return NULL; dest = ip_vs_lookup_dest(svc, daddr, dport); |