X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fax25%2Fax25_route.c;h=1090ac6dc058676e12072f5bddcae36f238b6893;hb=f1227cd3e0e73c48b93368800aa89f4341103a00;hp=44b99b1ff9f8c7c8a92568d0d4a665979288a268;hpb=340e2b1a4c74f653454348914c408420d5d3c28a;p=linux-2.6.git

diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c
index 44b99b1ff..1090ac6dc 100644
--- 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;
-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 *);
 
@@ -455,7 +455,7 @@ int ax25_rt_autobind(ax25_cb *ax25, ax25_address *addr)
 
 	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);
 	}