Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d52acb3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge refs/heads/upstream-fixes from... 

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

drivers/net/hamradio/6pack.c

+3 −6
Original line number Diff line number Diff line
@@ -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);