mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
77 lines
2.4 KiB
Diff
77 lines
2.4 KiB
Diff
From abc515eb9206d0691792e93d78441c03b6b0fcd6 Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Tue, 26 Mar 2013 17:26:38 +0000
|
|
Subject: [PATCH 0064/1002] Allow mac address to be set in smsc95xx
|
|
|
|
Signed-off-by: popcornmix <popcornmix@gmail.com>
|
|
|
|
SQUASH: smsc95xx: Use dev_mod_addr to set MAC addr
|
|
|
|
Since adeef3e32146 ("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>
|
|
---
|
|
drivers/net/usb/smsc95xx.c | 27 +++++++++++++++++++++++++++
|
|
1 file changed, 27 insertions(+)
|
|
|
|
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
|
|
index d65daf301d0d..340a877eaf69 100644
|
|
--- a/drivers/net/usb/smsc95xx.c
|
|
+++ b/drivers/net/usb/smsc95xx.c
|
|
@@ -87,6 +87,10 @@ static int packetsize = 2560;
|
|
module_param(packetsize, int, 0644);
|
|
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,
|
|
u32 *data)
|
|
{
|
|
@@ -809,6 +813,21 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int 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)
|
|
{
|
|
u8 addr[ETH_ALEN];
|
|
@@ -832,6 +851,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 */
|
|
eth_hw_addr_random(dev->net);
|
|
netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
|
|
--
|
|
2.44.0
|
|
|