Message ID | 1394712342-15778-28-Taiwan-albertk@realtek.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
Hello. On 9/2/2014 1:55 PM, Hayes Wang wrote: > If the hw doesn't have a valid MAC address, give a random one and > set it to the hw. > Signed-off-by: Hayes Wang <hayeswang@realtek.com> > --- > drivers/net/usb/r8152.c | 39 ++++++++++++++++++++++++--------------- > 1 file changed, 24 insertions(+), 15 deletions(-) > diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c > index b5ff933..2bc1b8d 100644 > --- a/drivers/net/usb/r8152.c > +++ b/drivers/net/usb/r8152.c > @@ -992,32 +992,41 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p) > return 0; > } > > -static inline void set_ethernet_addr(struct r8152 *tp) > +static int set_ethernet_addr(struct r8152 *tp) > { > struct net_device *dev = tp->netdev; > + struct sockaddr sa; > int ret; > - u8 node_id[8] = {0}; > > if (tp->version == RTL_VER_01) > - ret = pla_ocp_read(tp, PLA_IDR, sizeof(node_id), node_id); > + ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data); > else > - ret = pla_ocp_read(tp, PLA_BACKUP, sizeof(node_id), node_id); > + ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa.sa_data); > > if (ret < 0) { > - netif_notice(tp, probe, dev, "inet addr fail\n"); > + netif_err(tp, probe, dev, "Get ether addr fail\n"); > + } else if (!is_valid_ether_addr(sa.sa_data)) { > + netif_err(tp, probe, dev, > + "Invalid ether addr %02x:%02x:%02x:%02x:%02x:%02x\n", There's now "%pM" format specifier for printing a MAC address. > + sa.sa_data[0], sa.sa_data[1], sa.sa_data[2], > + sa.sa_data[3], sa.sa_data[4], sa.sa_data[5]); > + eth_hw_addr_random(dev); > + ether_addr_copy(sa.sa_data, dev->dev_addr); > + ret = rtl8152_set_mac_address(dev, &sa); > + netif_info(tp, probe, dev, > + "Random ether addr %02x:%02x:%02x:%02x:%02x:%02x\n", Likewise. WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index b5ff933..2bc1b8d 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -992,32 +992,41 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p) return 0; } -static inline void set_ethernet_addr(struct r8152 *tp) +static int set_ethernet_addr(struct r8152 *tp) { struct net_device *dev = tp->netdev; + struct sockaddr sa; int ret; - u8 node_id[8] = {0}; if (tp->version == RTL_VER_01) - ret = pla_ocp_read(tp, PLA_IDR, sizeof(node_id), node_id); + ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data); else - ret = pla_ocp_read(tp, PLA_BACKUP, sizeof(node_id), node_id); + ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa.sa_data); if (ret < 0) { - netif_notice(tp, probe, dev, "inet addr fail\n"); + netif_err(tp, probe, dev, "Get ether addr fail\n"); + } else if (!is_valid_ether_addr(sa.sa_data)) { + netif_err(tp, probe, dev, + "Invalid ether addr %02x:%02x:%02x:%02x:%02x:%02x\n", + sa.sa_data[0], sa.sa_data[1], sa.sa_data[2], + sa.sa_data[3], sa.sa_data[4], sa.sa_data[5]); + eth_hw_addr_random(dev); + ether_addr_copy(sa.sa_data, dev->dev_addr); + ret = rtl8152_set_mac_address(dev, &sa); + netif_info(tp, probe, dev, + "Random ether addr %02x:%02x:%02x:%02x:%02x:%02x\n", + sa.sa_data[0], sa.sa_data[1], sa.sa_data[2], + sa.sa_data[3], sa.sa_data[4], sa.sa_data[5]); } else { - if (tp->version != RTL_VER_01) { - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, - CRWECR_CONFIG); - pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, - sizeof(node_id), node_id); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, - CRWECR_NORAML); - } + if (tp->version == RTL_VER_01) + ether_addr_copy(dev->dev_addr, sa.sa_data); + else + ret = rtl8152_set_mac_address(dev, &sa); - memcpy(dev->dev_addr, node_id, dev->addr_len); - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); + ether_addr_copy(dev->perm_addr, dev->dev_addr); } + + return ret; } static void read_bulk_callback(struct urb *urb)
If the hw doesn't have a valid MAC address, give a random one and set it to the hw. Signed-off-by: Hayes Wang <hayeswang@realtek.com> --- drivers/net/usb/r8152.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-)