diff --cc include/net/inet_sock.h
index acbb93d7607a,491ceb7ebe5d..2de0e4d4a027
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@@ -218,12 -218,12 +218,12 @@@ struct inet_sock 
  #define inet_dport		sk.__sk_common.skc_dport
  #define inet_num		sk.__sk_common.skc_num
  
 +	unsigned long		inet_flags;
  	__be32			inet_saddr;
  	__s16			uc_ttl;
 -	__u16			cmsg_flags;
 +	__be16			inet_sport;
  	struct ip_options_rcu __rcu	*inet_opt;
- 	__u16			inet_id;
+ 	atomic_t		inet_id;
 -	__be16			inet_sport;
  
  	__u8			tos;
  	__u8			min_ttl;