aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-06-04 13:20:38 -0400
committerDavid S. Miller <davem@davemloft.net>2018-06-04 13:20:38 -0400
commita925ab48dacbc9ad470a9ca4c761601ee07e476c (patch)
treec8bfcc98ea5d60284cbfcb906924685834413646 /net/core
parentipv6: omit traffic class when calculating flow hash (diff)
downloadlinux-dev-a925ab48dacbc9ad470a9ca4c761601ee07e476c.tar.xz
linux-dev-a925ab48dacbc9ad470a9ca4c761601ee07e476c.zip
Revert "ipv6: omit traffic class when calculating flow hash"
This reverts commit 87ae68c8b4944d142447b88875c9c412c714434f. Applied the wrong version of this fix, correct version coming up. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/flow_dissector.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 6497b815e7a2..4fc1e84d77ec 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -1334,7 +1334,7 @@ __u32 __get_hash_from_flowi6(const struct flowi6 *fl6, struct flow_keys *keys)
keys->ports.src = fl6->fl6_sport;
keys->ports.dst = fl6->fl6_dport;
keys->keyid.keyid = fl6->fl6_gre_key;
- keys->tags.flow_label = flowi6_get_flowlabel(fl6);
+ keys->tags.flow_label = (__force u32)fl6->flowlabel;
keys->basic.ip_proto = fl6->flowi6_proto;
return flow_hash_from_keys(keys);