From: Ralf Baechle Date: Wed, 24 Aug 2005 17:01:33 +0000 (+0100) Subject: [PATCH] Fix 6pack setting of MAC address X-Git-Tag: v2.6.13~3^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=214838a2108b4b1e18abce2e28d37996e9bf7c68;p=linux-2.6-omap-h63xx.git [PATCH] Fix 6pack setting of MAC address Don't check type of sax25_family; dev_set_mac_address has already done that before and anyway, the type to check against would have been ARPHRD_AX25. We only got away because AF_AX25 and ARPHRD_AX25 both happen to be defined to the same value. Don't check sax25_ndigis either; it's value is insignificant for the purpose of setting the MAC address and the check has shown to break some application software for no good reason. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index b59c65b9645..0b230222bfe 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);