raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

Allow mac address to be set in smsc95xx

Browse Source 
Signed-off-by: popcornmix <popcornmix@gmail.com>

SQUASH: smsc95xx: Use dev_mod_addr to set MAC addr

Since adeef3e321 ("net: constify netdev->dev_addr") it has been
illegal to write to the dev_addr MAC address field. Later commits
have added explicit checks that it hasn't been modified by nefarious
means. The dev_addr_mod helper function is the accepted way to change
the dev_addr field, so use it.

Squash with 96c1def63ee1 ("Allow mac address to be set in smsc95xx").

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
This commit is contained in:
popcornmix
2013-03-26 17:26:38 +00:00
committed by Dom Cobley
parent 60a438fc98
commit 19b27c7a61
1 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/net/usb/smsc95xx.c
View File

@@ -87,6 +87,10 @@ static int packetsize = 2560;
module_param(packetsize, int, 0644); module_param(packetsize, int, 0644);
MODULE_PARM_DESC(packetsize, "Override the RX URB packet size"); MODULE_PARM_DESC(packetsize, "Override the RX URB packet size");
static char *macaddr = ":";
module_param(macaddr, charp, 0);
MODULE_PARM_DESC(macaddr, "MAC address");
static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index, static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data) u32 *data)
{ {
@@ -807,6 +811,52 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
return phy_mii_ioctl(netdev->phydev, rq, cmd); return phy_mii_ioctl(netdev->phydev, rq, cmd);
} }
/* Check the macaddr module parameter for a MAC address */
static int smsc95xx_is_macaddr_param(struct usbnet *dev, struct net_device *nd)
{
int i, j, got_num, num;
u8 mtbl[ETH_ALEN];
if (macaddr[0] == ':')
return 0;
i = 0;
j = 0;
num = 0;
got_num = 0;
while (j < ETH_ALEN) {
if (macaddr[i] && macaddr[i] != ':') {
got_num++;
if ('0' <= macaddr[i] && macaddr[i] <= '9')
num = num * 16 + macaddr[i] - '0';
else if ('A' <= macaddr[i] && macaddr[i] <= 'F')
num = num * 16 + 10 + macaddr[i] - 'A';
else if ('a' <= macaddr[i] && macaddr[i] <= 'f')
num = num * 16 + 10 + macaddr[i] - 'a';
else
break;
i++;
} else if (got_num == 2) {
mtbl[j++] = (u8) num;
num = 0;
got_num = 0;
i++;
} else {
break;
}
}
if (j == ETH_ALEN) {
netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: "
"%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2],
mtbl[3], mtbl[4], mtbl[5]);
dev_addr_mod(nd, 0, mtbl, ETH_ALEN);
return 1;
} else {
return 0;
}
}
static void smsc95xx_init_mac_address(struct usbnet *dev) static void smsc95xx_init_mac_address(struct usbnet *dev)
{ {
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];
@@ -830,6 +880,10 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)
} }
} }
/* Check module parameters */
if (smsc95xx_is_macaddr_param(dev, dev->net))
return;
/* no useful static MAC address found. generate a random one */ /* no useful static MAC address found. generate a random one */
eth_hw_addr_random(dev->net); eth_hw_addr_random(dev->net);
netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n"); netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");