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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
hamradio
/
6pack.c
diff --git
a/drivers/net/hamradio/6pack.c
b/drivers/net/hamradio/6pack.c
index
86b3bb9
..
d1f6895
100644
(file)
--- a/
drivers/net/hamradio/6pack.c
+++ b/
drivers/net/hamradio/6pack.c
@@
-12,6
+12,7
@@
* Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
*/
* Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <linux/module.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@
-307,9
+308,9
@@
static int sp_set_mac_address(struct net_device *dev, void *addr)
{
struct sockaddr_ax25 *sa = addr;
{
struct sockaddr_ax25 *sa = addr;
-
netif_tx_lock_bh(dev
);
+
spin_lock_irq(&dev->xmit_lock
);
memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
-
netif_tx_unlock_bh(dev
);
+
spin_unlock_irq(&dev->xmit_lock
);
return 0;
}
return 0;
}
@@
-766,9
+767,9
@@
static int sixpack_ioctl(struct tty_struct *tty, struct file *file,
break;
}
break;
}
-
netif_tx_lock_bh(dev
);
+
spin_lock_irq(&dev->xmit_lock
);
memcpy(dev->dev_addr, &addr, AX25_ADDR_LEN);
memcpy(dev->dev_addr, &addr, AX25_ADDR_LEN);
-
netif_tx_unlock_bh(dev
);
+
spin_unlock_irq(&dev->xmit_lock
);
err = 0;
break;
err = 0;
break;
@@
-914,7
+915,7
@@
static void decode_prio_command(struct sixpack *sp, unsigned char cmd)
printk(KERN_DEBUG "6pack: protocol violation\n");
else
sp->status = 0;
printk(KERN_DEBUG "6pack: protocol violation\n");
else
sp->status = 0;
- cmd &=
!
SIXP_RX_DCD_MASK;
+ cmd &=
~
SIXP_RX_DCD_MASK;
}
sp->status = cmd & SIXP_PRIO_DATA_MASK;
} else { /* output watchdog char if idle */
}
sp->status = cmd & SIXP_PRIO_DATA_MASK;
} else { /* output watchdog char if idle */