0058-Allow-mac-address-to-be-set-in-smsc95xx.patch 3.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091
  1. From 775d5392d5ba612dc856f05fef318b3fd0687f81 Mon Sep 17 00:00:00 2001
  2. From: popcornmix <popcornmix@gmail.com>
  3. Date: Tue, 26 Mar 2013 17:26:38 +0000
  4. Subject: [PATCH 058/381] Allow mac address to be set in smsc95xx
  5. Signed-off-by: popcornmix <popcornmix@gmail.com>
  6. ---
  7. drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
  8. 1 file changed, 56 insertions(+)
  9. --- a/drivers/net/usb/smsc95xx.c
  10. +++ b/drivers/net/usb/smsc95xx.c
  11. @@ -59,6 +59,7 @@
  12. #define SUSPEND_SUSPEND3 (0x08)
  13. #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
  14. SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
  15. +#define MAC_ADDR_LEN (6)
  16. struct smsc95xx_priv {
  17. u32 mac_cr;
  18. @@ -74,6 +75,10 @@ static bool turbo_mode = false;
  19. module_param(turbo_mode, bool, 0644);
  20. MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
  21. +static char *macaddr = ":";
  22. +module_param(macaddr, charp, 0);
  23. +MODULE_PARM_DESC(macaddr, "MAC address");
  24. +
  25. static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
  26. u32 *data, int in_pm)
  27. {
  28. @@ -763,8 +768,59 @@ static int smsc95xx_ioctl(struct net_dev
  29. return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
  30. }
  31. +/* Check the macaddr module parameter for a MAC address */
  32. +static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac)
  33. +{
  34. + int i, j, got_num, num;
  35. + u8 mtbl[MAC_ADDR_LEN];
  36. +
  37. + if (macaddr[0] == ':')
  38. + return 0;
  39. +
  40. + i = 0;
  41. + j = 0;
  42. + num = 0;
  43. + got_num = 0;
  44. + while (j < MAC_ADDR_LEN) {
  45. + if (macaddr[i] && macaddr[i] != ':') {
  46. + got_num++;
  47. + if ('0' <= macaddr[i] && macaddr[i] <= '9')
  48. + num = num * 16 + macaddr[i] - '0';
  49. + else if ('A' <= macaddr[i] && macaddr[i] <= 'F')
  50. + num = num * 16 + 10 + macaddr[i] - 'A';
  51. + else if ('a' <= macaddr[i] && macaddr[i] <= 'f')
  52. + num = num * 16 + 10 + macaddr[i] - 'a';
  53. + else
  54. + break;
  55. + i++;
  56. + } else if (got_num == 2) {
  57. + mtbl[j++] = (u8) num;
  58. + num = 0;
  59. + got_num = 0;
  60. + i++;
  61. + } else {
  62. + break;
  63. + }
  64. + }
  65. +
  66. + if (j == MAC_ADDR_LEN) {
  67. + netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: "
  68. + "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2],
  69. + mtbl[3], mtbl[4], mtbl[5]);
  70. + for (i = 0; i < MAC_ADDR_LEN; i++)
  71. + dev_mac[i] = mtbl[i];
  72. + return 1;
  73. + } else {
  74. + return 0;
  75. + }
  76. +}
  77. +
  78. static void smsc95xx_init_mac_address(struct usbnet *dev)
  79. {
  80. + /* Check module parameters */
  81. + if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr))
  82. + return;
  83. +
  84. /* try reading mac address from EEPROM */
  85. if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
  86. dev->net->dev_addr) == 0) {