diff options
author | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
commit | 5ee07f2a498e0a5f4a9994317c0f2e451e27b4f2 (patch) | |
tree | 8d8cc50a7de738e1e6b7a66ec27120f616b3919a /net/netfilter/ipvs/ip_vs_core.c | |
parent | 5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (diff) | |
parent | 44fb3170ae46f8de964a4bb5b0504e865a6dd7da (diff) |
Merge commit 'v3.2.9' into rt-3.2.9-rt13v3.2.9-rt13
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_core.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index 093cc327020f..6dc7d7d08961 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -232,6 +232,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc, __be16 dport = 0; /* destination port to forward */ unsigned int flags; struct ip_vs_conn_param param; + const union nf_inet_addr fwmark = { .ip = htonl(svc->fwmark) }; union nf_inet_addr snet; /* source network of the client, after masking */ @@ -267,7 +268,6 @@ ip_vs_sched_persist(struct ip_vs_service *svc, { int protocol = iph.protocol; const union nf_inet_addr *vaddr = &iph.daddr; - const union nf_inet_addr fwmark = { .ip = htonl(svc->fwmark) }; __be16 vport = 0; if (dst_port == svc->port) { |