diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-13 12:02:10 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-13 12:02:10 +0800 |
| commit | 0bdf4ea52af04501c69799babfdd0b38cbf0299e (patch) | |
| tree | ab784e8eb73ed40e760075e0e111719937de3f91 /include | |
| parent | a2b5256f1edd2d412d14ec9dceb1d28e39a794e4 (diff) | |
| parent | 8b5ab55d254f36e89b1b53aeac7223d2d102483e (diff) | |
Merge tag 'v4.4.121' into linux-linaro-lsk-v4.4
This is the 4.4.121 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nospec.h | 3 | ||||
| -rw-r--r-- | include/net/udplite.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/nospec.h b/include/linux/nospec.h index b99bced39ac2..4a040862f4bf 100644 --- a/include/linux/nospec.h +++ b/include/linux/nospec.h @@ -66,7 +66,6 @@ static inline unsigned long array_index_mask_nospec(unsigned long index, BUILD_BUG_ON(sizeof(_i) > sizeof(long)); \ BUILD_BUG_ON(sizeof(_s) > sizeof(long)); \ \ - _i &= _mask; \ - _i; \ + (typeof(_i)) (_i & _mask); \ }) #endif /* _LINUX_NOSPEC_H */ diff --git a/include/net/udplite.h b/include/net/udplite.h index 80761938b9a7..8228155b305e 100644 --- a/include/net/udplite.h +++ b/include/net/udplite.h @@ -62,6 +62,7 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh) UDP_SKB_CB(skb)->cscov = cscov; if (skb->ip_summed == CHECKSUM_COMPLETE) skb->ip_summed = CHECKSUM_NONE; + skb->csum_valid = 0; } return 0; |