diff options
| author |   Hans Schillstrom <hans.schillstrom@ericsson.com> | 2010-11-19 14:25:07 +0100 |
|---|---|---|
| committer |   Simon Horman <horms@verge.net.au> | 2010-11-25 10:42:58 +0900 |
| commit | 0e051e683ba4acb4e67c272c6a89707d974099d1 (patch) | |
| tree | c834c362a50e68573256b813bcfcd86c6cc41db8 /net/netfilter/ipvs/ip_vs_sync.c | |
| parent | Merge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6 (diff) | |
| download | linux-dev-0e051e683ba4acb4e67c272c6a89707d974099d1.tar.xz linux-dev-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 '')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_sync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index 3897d6bf3b29..47eed672dc08 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -404,7 +404,7 @@ static void ip_vs_process_message(char *buffer, const size_t buflen) s->dport, (union nf_inet_addr *)&s->vaddr, s->vport, - s->protocol); + s->protocol, 0); /* Set the approprite ativity flag */ if (s->protocol == IPPROTO_TCP) { if (state != IP_VS_TCP_S_ESTABLISHED) @@ -419,7 +419,7 @@ static void ip_vs_process_message(char *buffer, const size_t buflen) } cp = ip_vs_conn_new(¶m, (union nf_inet_addr *)&s->daddr, - s->dport, flags, dest); + s->dport, flags, dest, 0); if (dest) atomic_dec(&dest->refcnt); if (!cp) { |