Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ee4979b authored by Sathya Perla's avatar Sathya Perla Committed by David S. Miller
Browse files

be2net: remove type argument of be_cmd_mac_addr_query() 



All invocations of this routine use the same type value.

Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf6d6ea6

drivers/net/ethernet/emulex/benet/be_cmds.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -717,7 +717,7 @@ int be_cmd_eq_create(struct be_adapter *adapter, 




/* Use MCC */

/* Use MCC */

int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,

int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,

			u8 type, bool permanent, u32 if_handle, u32 pmac_id)

			  bool permanent, u32 if_handle, u32 pmac_id)

{

{

	struct be_mcc_wrb *wrb;

	struct be_mcc_wrb *wrb;

	struct be_cmd_req_mac_query *req;

	struct be_cmd_req_mac_query *req;
@@ -734,7 +734,7 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr, 




	be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,

	be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,

		OPCODE_COMMON_NTWK_MAC_QUERY, sizeof(*req), wrb, NULL);

		OPCODE_COMMON_NTWK_MAC_QUERY, sizeof(*req), wrb, NULL);

	req->type = type;

	req->type = MAC_ADDRESS_TYPE_NETWORK;

	if (permanent) {

	if (permanent) {

		req->permanent = 1;

		req->permanent = 1;

	} else {

	} else {

drivers/net/ethernet/emulex/benet/be_cmds.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1687,7 +1687,7 @@ struct be_cmd_req_set_ext_fat_caps { 
extern int be_pci_fnum_get(struct be_adapter *adapter);

extern int be_pci_fnum_get(struct be_adapter *adapter);

extern int be_fw_wait_ready(struct be_adapter *adapter);

extern int be_fw_wait_ready(struct be_adapter *adapter);

extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,

extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,

			u8 type, bool permanent, u32 if_handle, u32 pmac_id);

				 bool permanent, u32 if_handle, u32 pmac_id);

extern int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,

extern int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,

			u32 if_id, u32 *pmac_id, u32 domain);

			u32 if_id, u32 *pmac_id, u32 domain);

extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id,

extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id,

drivers/net/ethernet/emulex/benet/be_main.c

+6 −12
Original line number Original line Diff line number Diff line
@@ -241,8 +241,7 @@ static int be_mac_addr_set(struct net_device *netdev, void *p) 
	if (!is_valid_ether_addr(addr->sa_data))

	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;

		return -EADDRNOTAVAIL;





	status = be_cmd_mac_addr_query(adapter, current_mac,

	status = be_cmd_mac_addr_query(adapter, current_mac, false,

				MAC_ADDRESS_TYPE_NETWORK, false,

				       adapter->if_handle, 0);

				       adapter->if_handle, 0);

	if (status)

	if (status)

		goto err;

		goto err;
@@ -2693,21 +2692,16 @@ static int be_get_mac_addr(struct be_adapter *adapter, u8 *mac, u32 if_handle, 
		status = be_cmd_get_mac_from_list(adapter, mac,

		status = be_cmd_get_mac_from_list(adapter, mac,

						  active_mac, pmac_id, 0);

						  active_mac, pmac_id, 0);

		if (*active_mac) {

		if (*active_mac) {

			status = be_cmd_mac_addr_query(adapter, mac,

			status = be_cmd_mac_addr_query(adapter, mac, false,

						       MAC_ADDRESS_TYPE_NETWORK,

						       if_handle, *pmac_id);

						       false, if_handle,

						       *pmac_id);

		}

		}

	} else if (be_physfn(adapter)) {

	} else if (be_physfn(adapter)) {

		/* For BE3, for PF get permanent MAC */

		/* For BE3, for PF get permanent MAC */

		status = be_cmd_mac_addr_query(adapter, mac,

		status = be_cmd_mac_addr_query(adapter, mac, true, 0, 0);

					       MAC_ADDRESS_TYPE_NETWORK, true,

					       0, 0);

		*active_mac = false;

		*active_mac = false;

	} else {

	} else {

		/* For BE3, for VF get soft MAC assigned by PF*/

		/* For BE3, for VF get soft MAC assigned by PF*/

		status = be_cmd_mac_addr_query(adapter, mac,

		status = be_cmd_mac_addr_query(adapter, mac, false,

					       MAC_ADDRESS_TYPE_NETWORK, false,

					       if_handle, 0);

					       if_handle, 0);

		*active_mac = true;

		*active_mac = true;

	}

	}