| 1 | From dd6079fc871e99e4b0345d3fe27701dce5dcc7d0 Mon Sep 17 00:00:00 2001 |
| 2 | From: popcornmix <popcornmix@gmail.com> |
| 3 | Date: Tue, 17 Jan 2012 19:22:59 +0000 |
| 4 | Subject: [PATCH 6/7] Allow mac address to be set in smsc95xx |
| 5 | |
| 6 | Signed-off-by: popcornmix <popcornmix@gmail.com> |
| 7 | --- |
| 8 | drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ |
| 9 | 1 files changed, 56 insertions(+), 0 deletions(-) |
| 10 | |
| 11 | diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c |
| 12 | index f74f3ce..5a2e12b 100644 |
| 13 | --- a/drivers/net/usb/smsc95xx.c |
| 14 | +++ b/drivers/net/usb/smsc95xx.c |
| 15 | @@ -46,6 +46,7 @@ |
| 16 | #define SMSC95XX_INTERNAL_PHY_ID (1) |
| 17 | #define SMSC95XX_TX_OVERHEAD (8) |
| 18 | #define SMSC95XX_TX_OVERHEAD_CSUM (12) |
| 19 | +#define MAC_ADDR_LEN (6) |
| 20 | |
| 21 | struct smsc95xx_priv { |
| 22 | u32 mac_cr; |
| 23 | @@ -63,6 +64,10 @@ static int turbo_mode = true; |
| 24 | module_param(turbo_mode, bool, 0644); |
| 25 | MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); |
| 26 | |
| 27 | +static char *macaddr = ":"; |
| 28 | +module_param(macaddr, charp, 0); |
| 29 | +MODULE_PARM_DESC(macaddr, "MAC address"); |
| 30 | + |
| 31 | static int smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data) |
| 32 | { |
| 33 | u32 *buf = kmalloc(4, GFP_KERNEL); |
| 34 | @@ -600,8 +605,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) |
| 35 | return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL); |
| 36 | } |
| 37 | |
| 38 | +/* Check the macaddr module parameter for a MAC address */ |
| 39 | +static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac) |
| 40 | +{ |
| 41 | + int i, j, got_num, num; |
| 42 | + u8 mtbl[MAC_ADDR_LEN]; |
| 43 | + |
| 44 | + if (macaddr[0] == ':') |
| 45 | + return 0; |
| 46 | + |
| 47 | + i = 0; |
| 48 | + j = 0; |
| 49 | + num = 0; |
| 50 | + got_num = 0; |
| 51 | + while (j < MAC_ADDR_LEN) { |
| 52 | + if (macaddr[i] && macaddr[i] != ':') { |
| 53 | + got_num++; |
| 54 | + if ('0' <= macaddr[i] && macaddr[i] <= '9') |
| 55 | + num = num * 16 + macaddr[i] - '0'; |
| 56 | + else if ('A' <= macaddr[i] && macaddr[i] <= 'F') |
| 57 | + num = num * 16 + 10 + macaddr[i] - 'A'; |
| 58 | + else if ('a' <= macaddr[i] && macaddr[i] <= 'f') |
| 59 | + num = num * 16 + 10 + macaddr[i] - 'a'; |
| 60 | + else |
| 61 | + break; |
| 62 | + i++; |
| 63 | + } else if (got_num == 2) { |
| 64 | + mtbl[j++] = (u8) num; |
| 65 | + num = 0; |
| 66 | + got_num = 0; |
| 67 | + i++; |
| 68 | + } else { |
| 69 | + break; |
| 70 | + } |
| 71 | + } |
| 72 | + |
| 73 | + if (j == MAC_ADDR_LEN) { |
| 74 | + netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: " |
| 75 | + "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2], |
| 76 | + mtbl[3], mtbl[4], mtbl[5]); |
| 77 | + for (i = 0; i < MAC_ADDR_LEN; i++) |
| 78 | + dev_mac[i] = mtbl[i]; |
| 79 | + return 1; |
| 80 | + } else { |
| 81 | + return 0; |
| 82 | + } |
| 83 | +} |
| 84 | + |
| 85 | static void smsc95xx_init_mac_address(struct usbnet *dev) |
| 86 | { |
| 87 | + /* Check module parameters */ |
| 88 | + if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr)) |
| 89 | + return; |
| 90 | + |
| 91 | /* try reading mac address from EEPROM */ |
| 92 | if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, |
| 93 | dev->net->dev_addr) == 0) { |
| 94 | -- |
| 95 | 1.7.5.4 |
| 96 | |
| 97 | |
