diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-11 18:43:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-11 18:43:02 -0500 |
commit | 7e452baf6b96b5aeba097afd91501d33d390cc97 (patch) | |
tree | 9b0e062d3677d50d731ffd0fba47423bfdee9253 /net/netfilter | |
parent | 3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833 (diff) | |
parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/message/fusion/mptlan.c
drivers/net/sfc/ethtool.c
net/mac80211/debugfs_sta.c
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_xmit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c index 2f367219073..425ab144f15 100644 --- a/net/netfilter/ipvs/ip_vs_xmit.c +++ b/net/netfilter/ipvs/ip_vs_xmit.c | |||
@@ -711,7 +711,8 @@ ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, | |||
711 | iph = ipv6_hdr(skb); | 711 | iph = ipv6_hdr(skb); |
712 | iph->version = 6; | 712 | iph->version = 6; |
713 | iph->nexthdr = IPPROTO_IPV6; | 713 | iph->nexthdr = IPPROTO_IPV6; |
714 | iph->payload_len = old_iph->payload_len + sizeof(old_iph); | 714 | iph->payload_len = old_iph->payload_len; |
715 | be16_add_cpu(&iph->payload_len, sizeof(*old_iph)); | ||
715 | iph->priority = old_iph->priority; | 716 | iph->priority = old_iph->priority; |
716 | memset(&iph->flow_lbl, 0, sizeof(iph->flow_lbl)); | 717 | memset(&iph->flow_lbl, 0, sizeof(iph->flow_lbl)); |
717 | iph->daddr = rt->rt6i_dst.addr; | 718 | iph->daddr = rt->rt6i_dst.addr; |