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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
net
/
ax25
/
ax25_route.c
diff --git
a/net/ax25/ax25_route.c
b/net/ax25/ax25_route.c
index
44b99b1
..
1090ac6
100644
(file)
--- a/
net/ax25/ax25_route.c
+++ b/
net/ax25/ax25_route.c
@@
-37,7
+37,7
@@
#include <linux/seq_file.h>
static ax25_route *ax25_route_list;
#include <linux/seq_file.h>
static ax25_route *ax25_route_list;
-static
DEFINE_RWLOCK(ax25_route_lock)
;
+static
rwlock_t ax25_route_lock = RW_LOCK_UNLOCKED
;
static ax25_route *ax25_get_route(ax25_address *, struct net_device *);
static ax25_route *ax25_get_route(ax25_address *, struct net_device *);
@@
-455,7
+455,7
@@
int ax25_rt_autobind(ax25_cb *ax25, ax25_address *addr)
if (ax25->sk != NULL) {
bh_lock_sock(ax25->sk);
if (ax25->sk != NULL) {
bh_lock_sock(ax25->sk);
-
sock_reset_flag(ax25->sk, SOCK_ZAPPED)
;
+
ax25->sk->sk_zapped = 0
;
bh_unlock_sock(ax25->sk);
}
bh_unlock_sock(ax25->sk);
}