diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-27 18:05:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-27 18:05:14 -0700 |
| commit | 3d52acb34247816c453f94596e6c7fc4499b76dc (patch) | |
| tree | 39d2f862ec41006d7f25a58c4732a29cab22b5c0 /drivers | |
| parent | [PATCH] Remove race between con_open and con_close (diff) | |
| parent | [PATCH] Fix 6pack setting of MAC address (diff) | |
| download | linux-dev-3d52acb34247816c453f94596e6c7fc4499b76dc.tar.xz linux-dev-3d52acb34247816c453f94596e6c7fc4499b76dc.zip | |
Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/hamradio/6pack.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index f9e3be96963c..0b230222bfea 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -308,12 +308,6 @@ static int sp_set_mac_address(struct net_device *dev, void *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); memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN); spin_unlock_irq(&dev->xmit_lock); @@ -668,6 +662,9 @@ static int sixpack_open(struct tty_struct *tty) netif_start_queue(dev); 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); spin_unlock_bh(&sp->lock); |