diff options
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_cmds.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_cmds.h | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 18 |
3 files changed, 9 insertions, 15 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index 701b3e9a715b..6fbfb207fa5a 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c | |||
@@ -717,7 +717,7 @@ int be_cmd_eq_create(struct be_adapter *adapter, | |||
717 | 717 | ||
718 | /* Use MCC */ | 718 | /* Use MCC */ |
719 | int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr, | 719 | int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr, |
720 | u8 type, bool permanent, u32 if_handle, u32 pmac_id) | 720 | bool permanent, u32 if_handle, u32 pmac_id) |
721 | { | 721 | { |
722 | struct be_mcc_wrb *wrb; | 722 | struct be_mcc_wrb *wrb; |
723 | struct be_cmd_req_mac_query *req; | 723 | struct be_cmd_req_mac_query *req; |
@@ -734,7 +734,7 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr, | |||
734 | 734 | ||
735 | be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON, | 735 | be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON, |
736 | OPCODE_COMMON_NTWK_MAC_QUERY, sizeof(*req), wrb, NULL); | 736 | OPCODE_COMMON_NTWK_MAC_QUERY, sizeof(*req), wrb, NULL); |
737 | req->type = type; | 737 | req->type = MAC_ADDRESS_TYPE_NETWORK; |
738 | if (permanent) { | 738 | if (permanent) { |
739 | req->permanent = 1; | 739 | req->permanent = 1; |
740 | } else { | 740 | } else { |
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h index 250f19b5f7b6..1f5b83975f21 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.h +++ b/drivers/net/ethernet/emulex/benet/be_cmds.h | |||
@@ -1687,7 +1687,7 @@ struct be_cmd_req_set_ext_fat_caps { | |||
1687 | extern int be_pci_fnum_get(struct be_adapter *adapter); | 1687 | extern int be_pci_fnum_get(struct be_adapter *adapter); |
1688 | extern int be_fw_wait_ready(struct be_adapter *adapter); | 1688 | extern int be_fw_wait_ready(struct be_adapter *adapter); |
1689 | extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr, | 1689 | extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr, |
1690 | u8 type, bool permanent, u32 if_handle, u32 pmac_id); | 1690 | bool permanent, u32 if_handle, u32 pmac_id); |
1691 | extern int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr, | 1691 | extern int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr, |
1692 | u32 if_id, u32 *pmac_id, u32 domain); | 1692 | u32 if_id, u32 *pmac_id, u32 domain); |
1693 | extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, | 1693 | extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, |
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 84379f4fe837..fa1743036a88 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c | |||
@@ -241,9 +241,8 @@ static int be_mac_addr_set(struct net_device *netdev, void *p) | |||
241 | if (!is_valid_ether_addr(addr->sa_data)) | 241 | if (!is_valid_ether_addr(addr->sa_data)) |
242 | return -EADDRNOTAVAIL; | 242 | return -EADDRNOTAVAIL; |
243 | 243 | ||
244 | status = be_cmd_mac_addr_query(adapter, current_mac, | 244 | status = be_cmd_mac_addr_query(adapter, current_mac, false, |
245 | MAC_ADDRESS_TYPE_NETWORK, false, | 245 | adapter->if_handle, 0); |
246 | adapter->if_handle, 0); | ||
247 | if (status) | 246 | if (status) |
248 | goto err; | 247 | goto err; |
249 | 248 | ||
@@ -2693,21 +2692,16 @@ static int be_get_mac_addr(struct be_adapter *adapter, u8 *mac, u32 if_handle, | |||
2693 | status = be_cmd_get_mac_from_list(adapter, mac, | 2692 | status = be_cmd_get_mac_from_list(adapter, mac, |
2694 | active_mac, pmac_id, 0); | 2693 | active_mac, pmac_id, 0); |
2695 | if (*active_mac) { | 2694 | if (*active_mac) { |
2696 | status = be_cmd_mac_addr_query(adapter, mac, | 2695 | status = be_cmd_mac_addr_query(adapter, mac, false, |
2697 | MAC_ADDRESS_TYPE_NETWORK, | 2696 | if_handle, *pmac_id); |
2698 | false, if_handle, | ||
2699 | *pmac_id); | ||
2700 | } | 2697 | } |
2701 | } else if (be_physfn(adapter)) { | 2698 | } else if (be_physfn(adapter)) { |
2702 | /* For BE3, for PF get permanent MAC */ | 2699 | /* For BE3, for PF get permanent MAC */ |
2703 | status = be_cmd_mac_addr_query(adapter, mac, | 2700 | status = be_cmd_mac_addr_query(adapter, mac, true, 0, 0); |
2704 | MAC_ADDRESS_TYPE_NETWORK, true, | ||
2705 | 0, 0); | ||
2706 | *active_mac = false; | 2701 | *active_mac = false; |
2707 | } else { | 2702 | } else { |
2708 | /* For BE3, for VF get soft MAC assigned by PF*/ | 2703 | /* For BE3, for VF get soft MAC assigned by PF*/ |
2709 | status = be_cmd_mac_addr_query(adapter, mac, | 2704 | status = be_cmd_mac_addr_query(adapter, mac, false, |
2710 | MAC_ADDRESS_TYPE_NETWORK, false, | ||
2711 | if_handle, 0); | 2705 | if_handle, 0); |
2712 | *active_mac = true; | 2706 | *active_mac = true; |
2713 | } | 2707 | } |