diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-12-13 08:24:03 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-12-13 13:42:28 -0300 |
commit | b88f3949e4e90bd4c9ebbf928d847e7ad5b689ec (patch) | |
tree | 9df183ee766f94a4165943ae1ec67162cebc6a13 /libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch | |
parent | 21416ad505ea7e95a9ac44a0ab016980bdc9422c (diff) | |
download | abslibre-b88f3949e4e90bd4c9ebbf928d847e7ad5b689ec.tar.gz abslibre-b88f3949e4e90bd4c9ebbf928d847e7ad5b689ec.tar.bz2 abslibre-b88f3949e4e90bd4c9ebbf928d847e7ad5b689ec.zip |
linux-libre-4.3.2_gnu-1: updating version
* fixup configs
* add CONFIG_MTD_PCMCIA=m - FS#46316 -> https://bugs.archlinux.org/task/46316
* add CONFIG_MTD_UBI_BLOCK=Y - FS#47066 -> https://bugs.archlinux.org/task/47066
* add CONFIG_SENSORS_NCT7904=m - FS#46488 -> https://bugs.archlinux.org/task/46488
* add CONFIG_BPF_SYSCALL=Y - FS#47008 -> https://bugs.archlinux.org/task/47008
* add CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m - #857 -> https://labs.parabola.nu/issues/857
* add CONFIG_USB_G_DBGP=m - #858 -> https://labs.parabola.nu/issues/858
Diffstat (limited to 'libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch')
-rw-r--r-- | libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch deleted file mode 100644 index b8d64bfe4..000000000 --- a/libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ /dev/null @@ -1,95 +0,0 @@ -From f51bebf4094d0263c125b38b761a0eb2e3bbdbd8 Mon Sep 17 00:00:00 2001 -From: popcornmix <popcornmix@gmail.com> -Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter - ---- - 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 -index 26423ad..e29a323 100644 ---- a/drivers/net/usb/smsc95xx.c -+++ b/drivers/net/usb/smsc95xx.c -@@ -59,6 +59,7 @@ - #define SUSPEND_SUSPEND3 (0x08) - #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ - SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) -+#define MAC_ADDR_LEN (6) - - struct smsc95xx_priv { - u32 mac_cr; -@@ -74,6 +75,10 @@ static bool turbo_mode = true; - 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) - { -@@ -763,8 +768,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) - 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; -+ - /* try reading mac address from EEPROM */ - if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, - dev->net->dev_addr) == 0) { --- -2.4.5 - |