diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-10-08 07:21:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-10-08 07:21:55 -0700 |
| commit | 55abcf9f73c6fa6016c90c7c9dc3aaec6a653649 (patch) | |
| tree | e1806ed4b7b61a0cf4ce7c66e9e4229ff0f63625 /include/linux | |
| parent | 6f1fc71cf1b4bc935ae887cb6f870eef25c3eca1 (diff) | |
| parent | 797ef46be7164f00e4e76a06cfd4a4e99393b76a (diff) | |
Merge master.kernel.org:/home/acme/BK/llc-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/atalk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/atalk.h b/include/linux/atalk.h index 477169eb5b28..f75a25719f3c 100644 --- a/include/linux/atalk.h +++ b/include/linux/atalk.h @@ -199,13 +199,13 @@ extern void aarp_cleanup_module(void); #define at_sk(__sk) ((struct atalk_sock *)(__sk)->protinfo) extern struct sock *atalk_sockets; -extern spinlock_t atalk_sockets_lock; +extern rwlock_t atalk_sockets_lock; extern struct atalk_route *atalk_routes; extern rwlock_t atalk_routes_lock; extern struct atalk_iface *atalk_interfaces; -extern spinlock_t atalk_interfaces_lock; +extern rwlock_t atalk_interfaces_lock; extern struct atalk_route atrtr_default; |