Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
+3
-6
+3
-6
drivers/net/hamradio/6pack.c
+3
-6
drivers/net/hamradio/6pack.c
···
308
308
{
309
309
struct sockaddr_ax25 *sa = addr;
310
310
311
-
if (sa->sax25_family != AF_AX25)
312
-
return -EINVAL;
313
-
314
-
if (!sa->sax25_ndigis)
315
-
return -EINVAL;
316
-
317
311
spin_lock_irq(&dev->xmit_lock);
318
312
memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
319
313
spin_unlock_irq(&dev->xmit_lock);
···
662
668
netif_start_queue(dev);
663
669
664
670
init_timer(&sp->tx_t);
671
+
sp->tx_t.function = sp_xmit_on_air;
672
+
sp->tx_t.data = (unsigned long) sp;
673
+
665
674
init_timer(&sp->resync_t);
666
675
667
676
spin_unlock_bh(&sp->lock);