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
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
drivers
/
net
/
hamradio
/
mkiss.c
diff --git
a/drivers/net/hamradio/mkiss.c
b/drivers/net/hamradio/mkiss.c
index
d81a8e1
..
3ebbbe5
100644
(file)
--- a/
drivers/net/hamradio/mkiss.c
+++ b/
drivers/net/hamradio/mkiss.c
@@
-357,9
+357,9
@@
static int ax_set_mac_address(struct net_device *dev, void *addr)
{
struct sockaddr_ax25 *sa = addr;
{
struct sockaddr_ax25 *sa = addr;
-
spin_lock_irq(&dev->xmit_lock
);
+
netif_tx_lock_bh(dev
);
memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
-
spin_unlock_irq(&dev->xmit_lock
);
+
netif_tx_unlock_bh(dev
);
return 0;
}
return 0;
}
@@
-886,9
+886,9
@@
static int mkiss_ioctl(struct tty_struct *tty, struct file *file,
break;
}
break;
}
-
spin_lock_irq(&dev->xmit_lock
);
+
netif_tx_lock_bh(dev
);
memcpy(dev->dev_addr, addr, AX25_ADDR_LEN);
memcpy(dev->dev_addr, addr, AX25_ADDR_LEN);
-
spin_unlock_irq(&dev->xmit_lock
);
+
netif_tx_unlock_bh(dev
);
err = 0;
break;
err = 0;
break;