diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-07-11 14:21:20 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-07-11 16:22:22 +0800 |
| commit | 2120557722577d8cff75a33a799ad15582dbd8ef (patch) | |
| tree | 2518d0dd3038f52cc9d4a26200594132e115f829 /include/net | |
| parent | afd012a6a05f426411186b5ed23c99bb0d83cbe7 (diff) | |
| parent | 03a929fbcbb1f7dca3cca19eefcbc15ecc191331 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
arch/arm64/kernel/armv8_deprecated.c
arch/arm64/kernel/efi.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/head.S
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/mm/mmu.c
include/linux/memblock.h
mm/memblock.c
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ipv6.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 9a5c9f013784..7a8066b90289 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -744,6 +744,11 @@ static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb, { u32 hash; + /* @flowlabel may include more than a flow label, eg, the traffic class. + * Here we want only the flow label value. + */ + flowlabel &= IPV6_FLOWLABEL_MASK; + if (flowlabel || net->ipv6.sysctl.auto_flowlabels == IP6_AUTO_FLOW_LABEL_OFF || (!autolabel && @@ -958,6 +963,7 @@ int inet6_hash_connect(struct inet_timewait_death_row *death_row, */ extern const struct proto_ops inet6_stream_ops; extern const struct proto_ops inet6_dgram_ops; +extern const struct proto_ops inet6_sockraw_ops; struct group_source_req; struct group_filter; |