diff options
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/core.c | 3 | ||||
-rw-r--r-- | net/tipc/core.h | 3 | ||||
-rw-r--r-- | net/tipc/socket.c | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index e071579e0850..2da1fc75ad65 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * net/tipc/core.c: TIPC module code | 2 | * net/tipc/core.c: TIPC module code |
3 | * | 3 | * |
4 | * Copyright (c) 2003-2006, Ericsson AB | 4 | * Copyright (c) 2003-2006, Ericsson AB |
5 | * Copyright (c) 2005-2006, Wind River Systems | 5 | * Copyright (c) 2005-2006, 2010-2011, Wind River Systems |
6 | * All rights reserved. | 6 | * All rights reserved. |
7 | * | 7 | * |
8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
@@ -57,7 +57,6 @@ | |||
57 | 57 | ||
58 | int tipc_mode = TIPC_NOT_RUNNING; | 58 | int tipc_mode = TIPC_NOT_RUNNING; |
59 | int tipc_random; | 59 | int tipc_random; |
60 | atomic_t tipc_user_count = ATOMIC_INIT(0); | ||
61 | 60 | ||
62 | const char tipc_alphabet[] = | 61 | const char tipc_alphabet[] = |
63 | "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_."; | 62 | "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_."; |
diff --git a/net/tipc/core.h b/net/tipc/core.h index 997158546e25..37544d9f73e1 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * net/tipc/core.h: Include file for TIPC global declarations | 2 | * net/tipc/core.h: Include file for TIPC global declarations |
3 | * | 3 | * |
4 | * Copyright (c) 2005-2006, Ericsson AB | 4 | * Copyright (c) 2005-2006, Ericsson AB |
5 | * Copyright (c) 2005-2007, Wind River Systems | 5 | * Copyright (c) 2005-2007, 2010-2011, Wind River Systems |
6 | * All rights reserved. | 6 | * All rights reserved. |
7 | * | 7 | * |
8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
@@ -161,7 +161,6 @@ extern int tipc_remote_management; | |||
161 | extern int tipc_mode; | 161 | extern int tipc_mode; |
162 | extern int tipc_random; | 162 | extern int tipc_random; |
163 | extern const char tipc_alphabet[]; | 163 | extern const char tipc_alphabet[]; |
164 | extern atomic_t tipc_user_count; | ||
165 | 164 | ||
166 | 165 | ||
167 | /* | 166 | /* |
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 2b02a3a80313..893ca6eb5b41 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * net/tipc/socket.c: TIPC socket API | 2 | * net/tipc/socket.c: TIPC socket API |
3 | * | 3 | * |
4 | * Copyright (c) 2001-2007, Ericsson AB | 4 | * Copyright (c) 2001-2007, Ericsson AB |
5 | * Copyright (c) 2004-2008, Wind River Systems | 5 | * Copyright (c) 2004-2008, 2010-2011, Wind River Systems |
6 | * All rights reserved. | 6 | * All rights reserved. |
7 | * | 7 | * |
8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
@@ -241,7 +241,6 @@ static int tipc_create(struct net *net, struct socket *sock, int protocol, | |||
241 | tipc_set_portunreliable(tp_ptr->ref, 1); | 241 | tipc_set_portunreliable(tp_ptr->ref, 1); |
242 | } | 242 | } |
243 | 243 | ||
244 | atomic_inc(&tipc_user_count); | ||
245 | return 0; | 244 | return 0; |
246 | } | 245 | } |
247 | 246 | ||
@@ -321,7 +320,6 @@ static int release(struct socket *sock) | |||
321 | sock_put(sk); | 320 | sock_put(sk); |
322 | sock->sk = NULL; | 321 | sock->sk = NULL; |
323 | 322 | ||
324 | atomic_dec(&tipc_user_count); | ||
325 | return res; | 323 | return res; |
326 | } | 324 | } |
327 | 325 | ||