diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/output_core.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c index 6313abd53c9d..56596ce390a1 100644 --- a/net/ipv6/output_core.c +++ b/net/ipv6/output_core.c | |||
@@ -12,7 +12,7 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt) | |||
12 | { | 12 | { |
13 | static atomic_t ipv6_fragmentation_id; | 13 | static atomic_t ipv6_fragmentation_id; |
14 | struct in6_addr addr; | 14 | struct in6_addr addr; |
15 | int old, new; | 15 | int ident; |
16 | 16 | ||
17 | #if IS_ENABLED(CONFIG_IPV6) | 17 | #if IS_ENABLED(CONFIG_IPV6) |
18 | struct inet_peer *peer; | 18 | struct inet_peer *peer; |
@@ -26,15 +26,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt) | |||
26 | return; | 26 | return; |
27 | } | 27 | } |
28 | #endif | 28 | #endif |
29 | do { | 29 | ident = atomic_inc_return(&ipv6_fragmentation_id); |
30 | old = atomic_read(&ipv6_fragmentation_id); | ||
31 | new = old + 1; | ||
32 | if (!new) | ||
33 | new = 1; | ||
34 | } while (atomic_cmpxchg(&ipv6_fragmentation_id, old, new) != old); | ||
35 | 30 | ||
36 | addr = rt->rt6i_dst.addr; | 31 | addr = rt->rt6i_dst.addr; |
37 | addr.s6_addr32[0] ^= (__force __be32)new; | 32 | addr.s6_addr32[0] ^= (__force __be32)ident; |
38 | fhdr->identification = htonl(secure_ipv6_id(addr.s6_addr32)); | 33 | fhdr->identification = htonl(secure_ipv6_id(addr.s6_addr32)); |
39 | } | 34 | } |
40 | EXPORT_SYMBOL(ipv6_select_ident); | 35 | EXPORT_SYMBOL(ipv6_select_ident); |