git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
net
/
wanrouter
/
af_wanpipe.c
diff --git
a/net/wanrouter/af_wanpipe.c
b/net/wanrouter/af_wanpipe.c
index
4776ec1
..
d0d9233
100644
(file)
--- a/
net/wanrouter/af_wanpipe.c
+++ b/
net/wanrouter/af_wanpipe.c
@@
-158,7
+158,7
@@
static void dbg_kfree(void * v, int line) {
/* List of all wanpipe sockets. */
HLIST_HEAD(wanpipe_sklist);
/* List of all wanpipe sockets. */
HLIST_HEAD(wanpipe_sklist);
-static
rwlock_t wanpipe_sklist_lock = RW_LOCK_UNLOCKED
;
+static
DEFINE_RWLOCK(wanpipe_sklist_lock)
;
atomic_t wanpipe_socks_nr;
static unsigned long wanpipe_tx_critical;
atomic_t wanpipe_socks_nr;
static unsigned long wanpipe_tx_critical;
@@
-2423,7
+2423,6
@@
static int wanpipe_accept(struct socket *sock, struct socket *newsock, int flags
write_unlock(&wanpipe_sklist_lock);
clear_bit(1,&wanpipe_tx_critical);
write_unlock(&wanpipe_sklist_lock);
clear_bit(1,&wanpipe_tx_critical);
- newsk->sk_pair = NULL;
newsk->sk_socket = newsock;
newsk->sk_sleep = &newsock->wait;
newsk->sk_socket = newsock;
newsk->sk_sleep = &newsock->wait;