raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +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 7c389fdfcc
commit 909d2d5d30
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,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)
{ {
@@ -866,6 +870,21 @@ 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_macaddr_param(struct usbnet *dev, struct net_device *nd)
{
u8 mtbl[ETH_ALEN];
if (mac_pton(macaddr, mtbl)) {
netif_dbg(dev, ifup, dev->net,
"Overriding MAC address with: %pM\n", mtbl);
dev_addr_mod(nd, 0, mtbl, ETH_ALEN);
return 0;
} else {
return -EINVAL;
}
}
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];
@@ -889,6 +908,14 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)
} }
} }
/* Check module parameters */
if (smsc95xx_macaddr_param(dev, dev->net) == 0) {
if (is_valid_ether_addr(dev->net->dev_addr)) {
netif_dbg(dev, ifup, dev->net, "MAC address read from module parameter\n");
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");