brcm2708: update to v3.18
[15.05/openwrt.git] / target / linux / brcm2708 / patches-3.18 / 0018-Allow-mac-address-to-be-set-in-smsc95xx.patch
1 From c732e3a3218671786b589835260995bc24715248 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 018/114] 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 file changed, 56 insertions(+)
10
11 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
12 index d07bf4c..5ae60ab 100644
13 --- a/drivers/net/usb/smsc95xx.c
14 +++ b/drivers/net/usb/smsc95xx.c
15 @@ -59,6 +59,7 @@
16  #define SUSPEND_SUSPEND3               (0x08)
17  #define SUSPEND_ALLMODES               (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
18                                          SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
19 +#define MAC_ADDR_LEN                    (6)
20  
21  struct smsc95xx_priv {
22         u32 mac_cr;
23 @@ -74,6 +75,10 @@ static bool 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 __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
32                                             u32 *data, int in_pm)
33  {
34 @@ -763,8 +768,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.8.3.2
96