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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
ax25
/
ax25_dev.c
diff --git
a/net/ax25/ax25_dev.c
b/net/ax25/ax25_dev.c
index
8eac137
..
b787678
100644
(file)
--- a/
net/ax25/ax25_dev.c
+++ b/
net/ax25/ax25_dev.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>
@@
-32,7
+31,7
@@
#include <linux/init.h>
ax25_dev *ax25_dev_list;
#include <linux/init.h>
ax25_dev *ax25_dev_list;
-
spinlock_t ax25_dev_lock = SPIN_LOCK_UNLOCKED
;
+
DEFINE_SPINLOCK(ax25_dev_lock)
;
ax25_dev *ax25_addr_ax25dev(ax25_address *addr)
{
ax25_dev *ax25_addr_ax25dev(ax25_address *addr)
{
@@
-56,15
+55,13
@@
void ax25_dev_device_up(struct net_device *dev)
{
ax25_dev *ax25_dev;
{
ax25_dev *ax25_dev;
- if ((ax25_dev = k
m
alloc(sizeof(*ax25_dev), GFP_ATOMIC)) == NULL) {
+ if ((ax25_dev = k
z
alloc(sizeof(*ax25_dev), GFP_ATOMIC)) == NULL) {
printk(KERN_ERR "AX.25: ax25_dev_device_up - out of memory\n");
return;
}
ax25_unregister_sysctl();
printk(KERN_ERR "AX.25: ax25_dev_device_up - out of memory\n");
return;
}
ax25_unregister_sysctl();
- memset(ax25_dev, 0x00, sizeof(*ax25_dev));
-
dev->ax25_ptr = ax25_dev;
ax25_dev->dev = dev;
dev_hold(dev);
dev->ax25_ptr = ax25_dev;
ax25_dev->dev = dev;
dev_hold(dev);