diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-01-22 17:44:59 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-03-05 04:55:45 -0500 |
commit | 77b2283604bdd7053494a97b0e2fee97148206c6 (patch) | |
tree | 4d5c54156d64fd80de765cc18dc7e4a68b5ec5e1 /net/x25/Kconfig | |
parent | 788257d6101d986ac8f2741aaa35974af47f574c (diff) |
x25: remove the BKL
This replaces all instances of lock_kernel in x25
with lock_sock, taking care to release the socket
lock around sleeping functions (sock_alloc_send_skb
and skb_recv_datagram). It is not clear whether
this is a correct solution, but it seem to be what
other protocols do in the same situation.
Includes a fix suggested by Eric Dumazet.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: David S. Miller <davem@davemloft.net>
Tested-by: Andrew Hendry <andrew.hendry@gmail.com>
Cc: linux-x25@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Diffstat (limited to 'net/x25/Kconfig')
-rw-r--r-- | net/x25/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/x25/Kconfig b/net/x25/Kconfig index 2196e55e4f61..e6759c9660bb 100644 --- a/net/x25/Kconfig +++ b/net/x25/Kconfig | |||
@@ -5,7 +5,6 @@ | |||
5 | config X25 | 5 | config X25 |
6 | tristate "CCITT X.25 Packet Layer (EXPERIMENTAL)" | 6 | tristate "CCITT X.25 Packet Layer (EXPERIMENTAL)" |
7 | depends on EXPERIMENTAL | 7 | depends on EXPERIMENTAL |
8 | depends on BKL # should be fixable | ||
9 | ---help--- | 8 | ---help--- |
10 | X.25 is a set of standardized network protocols, similar in scope to | 9 | X.25 is a set of standardized network protocols, similar in scope to |
11 | frame relay; the one physical line from your box to the X.25 network | 10 | frame relay; the one physical line from your box to the X.25 network |