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
Don't use the in_interrupt() fix in __vx_check()
[linux-2.6.git]
/
net
/
ax25
/
ax25_iface.c
diff --git
a/net/ax25/ax25_iface.c
b/net/ax25/ax25_iface.c
index
3bb1527
..
07ac020
100644
(file)
--- a/
net/ax25/ax25_iface.c
+++ b/
net/ax25/ax25_iface.c
@@
-6,7
+6,6
@@
*
* Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
*/
*
* Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/socket.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/socket.h>
@@
-67,10
+66,10
@@
int ax25_protocol_register(unsigned int pid,
protocol->pid = pid;
protocol->func = func;
protocol->pid = pid;
protocol->func = func;
- write_lock(&protocol_list_lock);
+ write_lock
_bh
(&protocol_list_lock);
protocol->next = protocol_list;
protocol_list = protocol;
protocol->next = protocol_list;
protocol_list = protocol;
- write_unlock(&protocol_list_lock);
+ write_unlock
_bh
(&protocol_list_lock);
return 1;
}
return 1;
}
@@
-81,16
+80,16
@@
void ax25_protocol_release(unsigned int pid)
{
struct protocol_struct *s, *protocol;
{
struct protocol_struct *s, *protocol;
- write_lock(&protocol_list_lock);
+ write_lock
_bh
(&protocol_list_lock);
protocol = protocol_list;
if (protocol == NULL) {
protocol = protocol_list;
if (protocol == NULL) {
- write_unlock(&protocol_list_lock);
+ write_unlock
_bh
(&protocol_list_lock);
return;
}
if (protocol->pid == pid) {
protocol_list = protocol->next;
return;
}
if (protocol->pid == pid) {
protocol_list = protocol->next;
- write_unlock(&protocol_list_lock);
+ write_unlock
_bh
(&protocol_list_lock);
kfree(protocol);
return;
}
kfree(protocol);
return;
}
@@
-99,14
+98,14
@@
void ax25_protocol_release(unsigned int pid)
if (protocol->next->pid == pid) {
s = protocol->next;
protocol->next = protocol->next->next;
if (protocol->next->pid == pid) {
s = protocol->next;
protocol->next = protocol->next->next;
- write_unlock(&protocol_list_lock);
+ write_unlock
_bh
(&protocol_list_lock);
kfree(s);
return;
}
protocol = protocol->next;
}
kfree(s);
return;
}
protocol = protocol->next;
}
- write_unlock(&protocol_list_lock);
+ write_unlock
_bh
(&protocol_list_lock);
}
EXPORT_SYMBOL(ax25_protocol_release);
}
EXPORT_SYMBOL(ax25_protocol_release);
@@
-267,13
+266,13
@@
int ax25_protocol_is_registered(unsigned int pid)
struct protocol_struct *protocol;
int res = 0;
struct protocol_struct *protocol;
int res = 0;
- read_lock(&protocol_list_lock);
+ read_lock
_bh
(&protocol_list_lock);
for (protocol = protocol_list; protocol != NULL; protocol = protocol->next)
if (protocol->pid == pid) {
res = 1;
break;
}
for (protocol = protocol_list; protocol != NULL; protocol = protocol->next)
if (protocol->pid == pid) {
res = 1;
break;
}
- read_unlock(&protocol_list_lock);
+ read_unlock
_bh
(&protocol_list_lock);
return res;
}
return res;
}