aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
authorTom Herbert <tom@herbertland.com>2015-07-31 19:52:11 -0400
committerDavid S. Miller <davem@davemloft.net>2015-07-31 20:07:11 -0400
commit67800f9b1f4eb5bbefc32e3f5044097354bc85b3 (patch)
treefe8539672e187703c52b6b9e0344f96c0e344551 /net/ipv6/ip6_output.c
parentf70ea018da0631e10c26a02f5a82d626ffef5bd7 (diff)
ipv6: Call skb_get_hash_flowi6 to get skb->hash in ip6_make_flowlabel
We can't call skb_get_hash here since the packet is not complete to do flow_dissector. Create hash based on flowi6 instead. Signed-off-by: Tom Herbert <tom@herbertland.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 92b7cf0dc1f9..26ea47930740 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -207,7 +207,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
207 hlimit = ip6_dst_hoplimit(dst); 207 hlimit = ip6_dst_hoplimit(dst);
208 208
209 ip6_flow_hdr(hdr, tclass, ip6_make_flowlabel(net, skb, fl6->flowlabel, 209 ip6_flow_hdr(hdr, tclass, ip6_make_flowlabel(net, skb, fl6->flowlabel,
210 np->autoflowlabel)); 210 np->autoflowlabel, fl6));
211 211
212 hdr->payload_len = htons(seg_len); 212 hdr->payload_len = htons(seg_len);
213 hdr->nexthdr = proto; 213 hdr->nexthdr = proto;
@@ -1649,7 +1649,7 @@ struct sk_buff *__ip6_make_skb(struct sock *sk,
1649 1649
1650 ip6_flow_hdr(hdr, v6_cork->tclass, 1650 ip6_flow_hdr(hdr, v6_cork->tclass,
1651 ip6_make_flowlabel(net, skb, fl6->flowlabel, 1651 ip6_make_flowlabel(net, skb, fl6->flowlabel,
1652 np->autoflowlabel)); 1652 np->autoflowlabel, fl6));
1653 hdr->hop_limit = v6_cork->hop_limit; 1653 hdr->hop_limit = v6_cork->hop_limit;
1654 hdr->nexthdr = proto; 1654 hdr->nexthdr = proto;
1655 hdr->saddr = fl6->saddr; 1655 hdr->saddr = fl6->saddr;