PKGBUILDs/core/linux-armv5-rc/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch

96 lines
3.2 KiB
Diff
Raw Normal View History

2018-02-27 01:43:53 +00:00
From 53e7e1b9714a896948d4443ccd8672973a197b18 Mon Sep 17 00:00:00 2001
2015-11-17 01:06:26 +00:00
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
2018-02-27 01:43:53 +00:00
Subject: [PATCH 1/9] net/smsc95xx: Allow mac address to be set as a parameter
2015-11-17 01:06:26 +00:00
---
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
2017-11-29 03:25:12 +00:00
index 309b88acd3d0..7bc9feb891a1 100644
2015-11-17 01:06:26 +00:00
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
2016-05-09 00:18:43 +00:00
@@ -60,6 +60,7 @@
2015-11-17 01:06:26 +00:00
#define SUSPEND_SUSPEND3 (0x08)
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
+#define MAC_ADDR_LEN (6)
2016-06-06 00:11:13 +00:00
#define CARRIER_CHECK_DELAY (2 * HZ)
2016-12-26 18:24:34 +00:00
@@ -82,6 +83,10 @@ static bool turbo_mode = true;
2015-11-17 01:06:26 +00:00
module_param(turbo_mode, bool, 0644);
MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
+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, int in_pm)
{
2016-12-26 18:24:34 +00:00
@@ -910,8 +915,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
2015-11-17 01:06:26 +00:00
return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
}
+/* Check the macaddr module parameter for a MAC address */
+static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac)
+{
+ int i, j, got_num, num;
+ u8 mtbl[MAC_ADDR_LEN];
+
+ if (macaddr[0] == ':')
+ return 0;
+
+ i = 0;
+ j = 0;
+ num = 0;
+ got_num = 0;
+ while (j < MAC_ADDR_LEN) {
+ 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 == MAC_ADDR_LEN) {
+ 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]);
+ for (i = 0; i < MAC_ADDR_LEN; i++)
+ dev_mac[i] = mtbl[i];
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
static void smsc95xx_init_mac_address(struct usbnet *dev)
{
+ /* Check module parameters */
+ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr))
+ return;
+
2016-05-09 00:18:43 +00:00
const u8 *mac_addr;
/* maybe the boot loader passed the MAC address in devicetree */
2015-11-17 01:06:26 +00:00
--
2018-02-27 01:43:53 +00:00
2.16.1
2015-11-17 01:06:26 +00:00