projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
94485fe
)
ipvs: Use outer header in ip_vs_bypass_xmit_v6
author
Alex Gartrell
<agartrell@fb.com>
Wed, 26 Aug 2015 16:40:35 +0000
(09:40 -0700)
committer
Simon Horman
<horms@verge.net.au>
Tue, 1 Sep 2015 01:33:48 +0000
(10:33 +0900)
The ip_vs_iphdr may refer to an internal header, so use the outer one
instead.
Signed-off-by: Alex Gartrell <agartrell@fb.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
net/netfilter/ipvs/ip_vs_xmit.c
patch
|
blob
|
history
diff --git
a/net/netfilter/ipvs/ip_vs_xmit.c
b/net/netfilter/ipvs/ip_vs_xmit.c
index
9a26f2e
..
af5e9d3
100644
(file)
--- a/
net/netfilter/ipvs/ip_vs_xmit.c
+++ b/
net/netfilter/ipvs/ip_vs_xmit.c
@@
-656,10
+656,12
@@
int
ip_vs_bypass_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
struct ip_vs_protocol *pp, struct ip_vs_iphdr *ipvsh)
{
+ struct ipv6hdr *iph = ipv6_hdr(skb);
+
EnterFunction(10);
rcu_read_lock();
- if (__ip_vs_get_out_rt_v6(cp->af, skb, NULL, &ip
vsh->daddr.in6
, NULL,
+ if (__ip_vs_get_out_rt_v6(cp->af, skb, NULL, &ip
h->daddr
, NULL,
ipvsh, 0, IP_VS_RT_MODE_NON_LOCAL) < 0)
goto tx_error;