lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse Source
This commit is contained in:
Linus Torvalds
2005-08-27 18:05:14 -07:00
parent f786648b89 214838a210
commit 3d52acb342
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/hamradio/6pack.c
View File

@@ -308,12 +308,6 @@ static int sp_set_mac_address(struct net_device *dev, void *addr)
{ {
struct sockaddr_ax25 *sa = addr; struct sockaddr_ax25 *sa = addr;
if (sa->sax25_family != AF_AX25)
return -EINVAL;
if (!sa->sax25_ndigis)
return -EINVAL;
spin_lock_irq(&dev->xmit_lock); 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);
spin_unlock_irq(&dev->xmit_lock); spin_unlock_irq(&dev->xmit_lock);
@@ -668,6 +662,9 @@ static int sixpack_open(struct tty_struct *tty)
netif_start_queue(dev); netif_start_queue(dev);
init_timer(&sp->tx_t); init_timer(&sp->tx_t);
sp->tx_t.function = sp_xmit_on_air;
sp->tx_t.data = (unsigned long) sp;
init_timer(&sp->resync_t); init_timer(&sp->resync_t);
spin_unlock_bh(&sp->lock); spin_unlock_bh(&sp->lock);