diff options
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_nic.c')
-rw-r--r-- | drivers/infiniband/hw/nes/nes_nic.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 730358637bb6..3c96203e0d91 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c | |||
@@ -797,14 +797,13 @@ static int nes_netdev_set_mac_address(struct net_device *netdev, void *p) | |||
797 | int i; | 797 | int i; |
798 | u32 macaddr_low; | 798 | u32 macaddr_low; |
799 | u16 macaddr_high; | 799 | u16 macaddr_high; |
800 | DECLARE_MAC_BUF(mac); | ||
801 | 800 | ||
802 | if (!is_valid_ether_addr(mac_addr->sa_data)) | 801 | if (!is_valid_ether_addr(mac_addr->sa_data)) |
803 | return -EADDRNOTAVAIL; | 802 | return -EADDRNOTAVAIL; |
804 | 803 | ||
805 | memcpy(netdev->dev_addr, mac_addr->sa_data, netdev->addr_len); | 804 | memcpy(netdev->dev_addr, mac_addr->sa_data, netdev->addr_len); |
806 | printk(PFX "%s: Address length = %d, Address = %s\n", | 805 | printk(PFX "%s: Address length = %d, Address = %pM\n", |
807 | __func__, netdev->addr_len, print_mac(mac, mac_addr->sa_data)); | 806 | __func__, netdev->addr_len, mac_addr->sa_data); |
808 | macaddr_high = ((u16)netdev->dev_addr[0]) << 8; | 807 | macaddr_high = ((u16)netdev->dev_addr[0]) << 8; |
809 | macaddr_high += (u16)netdev->dev_addr[1]; | 808 | macaddr_high += (u16)netdev->dev_addr[1]; |
810 | macaddr_low = ((u32)netdev->dev_addr[2]) << 24; | 809 | macaddr_low = ((u32)netdev->dev_addr[2]) << 24; |
@@ -909,9 +908,8 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev) | |||
909 | if (mc_index >= max_pft_entries_avaiable) | 908 | if (mc_index >= max_pft_entries_avaiable) |
910 | break; | 909 | break; |
911 | if (multicast_addr) { | 910 | if (multicast_addr) { |
912 | DECLARE_MAC_BUF(mac); | 911 | nes_debug(NES_DBG_NIC_RX, "Assigning MC Address %pM to register 0x%04X nic_idx=%d\n", |
913 | nes_debug(NES_DBG_NIC_RX, "Assigning MC Address %s to register 0x%04X nic_idx=%d\n", | 912 | multicast_addr->dmi_addr, |
914 | print_mac(mac, multicast_addr->dmi_addr), | ||
915 | perfect_filter_register_address+(mc_index * 8), | 913 | perfect_filter_register_address+(mc_index * 8), |
916 | mc_nic_index); | 914 | mc_nic_index); |
917 | macaddr_high = ((u16)multicast_addr->dmi_addr[0]) << 8; | 915 | macaddr_high = ((u16)multicast_addr->dmi_addr[0]) << 8; |