|
@@ -787,16 +787,14 @@ static int nes_netdev_set_mac_address(struct net_device *netdev, void *p)
|
|
int i;
|
|
int i;
|
|
u32 macaddr_low;
|
|
u32 macaddr_low;
|
|
u16 macaddr_high;
|
|
u16 macaddr_high;
|
|
|
|
+ DECLARE_MAC_BUF(mac);
|
|
|
|
|
|
if (!is_valid_ether_addr(mac_addr->sa_data))
|
|
if (!is_valid_ether_addr(mac_addr->sa_data))
|
|
return -EADDRNOTAVAIL;
|
|
return -EADDRNOTAVAIL;
|
|
|
|
|
|
memcpy(netdev->dev_addr, mac_addr->sa_data, netdev->addr_len);
|
|
memcpy(netdev->dev_addr, mac_addr->sa_data, netdev->addr_len);
|
|
- printk(PFX "%s: Address length = %d, Address = %02X%02X%02X%02X%02X%02X..\n",
|
|
|
|
- __func__, netdev->addr_len,
|
|
|
|
- mac_addr->sa_data[0], mac_addr->sa_data[1],
|
|
|
|
- mac_addr->sa_data[2], mac_addr->sa_data[3],
|
|
|
|
- mac_addr->sa_data[4], mac_addr->sa_data[5]);
|
|
|
|
|
|
+ printk(PFX "%s: Address length = %d, Address = %s\n",
|
|
|
|
+ __func__, netdev->addr_len, print_mac(mac, mac_addr->sa_data));
|
|
macaddr_high = ((u16)netdev->dev_addr[0]) << 8;
|
|
macaddr_high = ((u16)netdev->dev_addr[0]) << 8;
|
|
macaddr_high += (u16)netdev->dev_addr[1];
|
|
macaddr_high += (u16)netdev->dev_addr[1];
|
|
macaddr_low = ((u32)netdev->dev_addr[2]) << 24;
|
|
macaddr_low = ((u32)netdev->dev_addr[2]) << 24;
|
|
@@ -878,11 +876,11 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
|
|
if (mc_nic_index < 0)
|
|
if (mc_nic_index < 0)
|
|
mc_nic_index = nesvnic->nic_index;
|
|
mc_nic_index = nesvnic->nic_index;
|
|
if (multicast_addr) {
|
|
if (multicast_addr) {
|
|
- nes_debug(NES_DBG_NIC_RX, "Assigning MC Address = %02X%02X%02X%02X%02X%02X to register 0x%04X nic_idx=%d\n",
|
|
|
|
- multicast_addr->dmi_addr[0], multicast_addr->dmi_addr[1],
|
|
|
|
- multicast_addr->dmi_addr[2], multicast_addr->dmi_addr[3],
|
|
|
|
- multicast_addr->dmi_addr[4], multicast_addr->dmi_addr[5],
|
|
|
|
- perfect_filter_register_address+(mc_index * 8), mc_nic_index);
|
|
|
|
|
|
+ DECLARE_MAC_BUF(mac);
|
|
|
|
+ nes_debug(NES_DBG_NIC_RX, "Assigning MC Address %s to register 0x%04X nic_idx=%d\n",
|
|
|
|
+ print_mac(mac, multicast_addr->dmi_addr),
|
|
|
|
+ perfect_filter_register_address+(mc_index * 8),
|
|
|
|
+ mc_nic_index);
|
|
macaddr_high = ((u16)multicast_addr->dmi_addr[0]) << 8;
|
|
macaddr_high = ((u16)multicast_addr->dmi_addr[0]) << 8;
|
|
macaddr_high += (u16)multicast_addr->dmi_addr[1];
|
|
macaddr_high += (u16)multicast_addr->dmi_addr[1];
|
|
macaddr_low = ((u32)multicast_addr->dmi_addr[2]) << 24;
|
|
macaddr_low = ((u32)multicast_addr->dmi_addr[2]) << 24;
|