Revert "ipv6: omit traffic class when calculating flow hash"
This reverts commit 87ae68c8b4
.
Applied the wrong version of this fix, correct version
coming up.
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -1981,7 +1981,7 @@ out:
|
||||
} else {
|
||||
keys->addrs.v6addrs.src = key_iph->saddr;
|
||||
keys->addrs.v6addrs.dst = key_iph->daddr;
|
||||
keys->tags.flow_label = ip6_flowlabel(key_iph);
|
||||
keys->tags.flow_label = ip6_flowinfo(key_iph);
|
||||
keys->basic.ip_proto = key_iph->nexthdr;
|
||||
}
|
||||
}
|
||||
@@ -2002,7 +2002,7 @@ u32 rt6_multipath_hash(const struct net *net, const struct flowi6 *fl6,
|
||||
} else {
|
||||
hash_keys.addrs.v6addrs.src = fl6->saddr;
|
||||
hash_keys.addrs.v6addrs.dst = fl6->daddr;
|
||||
hash_keys.tags.flow_label = flowi6_get_flowlabel(fl6);
|
||||
hash_keys.tags.flow_label = (__force u32)fl6->flowlabel;
|
||||
hash_keys.basic.ip_proto = fl6->flowi6_proto;
|
||||
}
|
||||
break;
|
||||
|
Reference in New Issue
Block a user