diff options
| -rw-r--r-- | include/net/inetpeer.h | 9 | ||||
| -rw-r--r-- | net/ipv6/ip6_output.c | 11 |
2 files changed, 4 insertions, 16 deletions
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h index 34b06da..ba0ddb0 100644 --- a/include/net/inetpeer.h +++ b/include/net/inetpeer.h @@ -115,16 +115,9 @@ static inline void inet_peer_refcheck(const struct inet_peer *p) /* can be called with or without local BH being disabled */ static inline int inet_getid(struct inet_peer *p, int more) { - int old, new; more++; inet_peer_refcheck(p); - do { - old = atomic_read(&p->ip_id_count); - new = old + more; - if (!new) - new = 1; - } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old); - return new; + return atomic_add_return(more, &p->ip_id_count) - more; } #endif /* _NET_INETPEER_H */ diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 7871cc6..14753d3 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -612,7 +612,7 @@ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr) void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt) { static atomic_t ipv6_fragmentation_id; - int old, new; + int ident; if (rt && !(rt->dst.flags & DST_NOPEER)) { struct inet_peer *peer; @@ -625,13 +625,8 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt) return; } } - do { - old = atomic_read(&ipv6_fragmentation_id); - new = old + 1; - if (!new) - new = 1; - } while (atomic_cmpxchg(&ipv6_fragmentation_id, old, new) != old); - fhdr->identification = htonl(new); + ident = atomic_inc_return(&ipv6_fragmentation_id); + fhdr->identification = htonl(ident); } int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) |