Commit 3486be29 authored by Ajit Khaparde's avatar Ajit Khaparde Committed by David S. Miller
Browse files

be2net: variable name changes 



This patch changes names of some variables.

Signed-off-by: default avatarAjit Khaparde <ajitk@serverengines.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8943807c

drivers/net/benet/be.h

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ struct be_adapter { 
	u32 port_num;

	bool promiscuous;

	bool wol;

	u32 cap;

	u32 function_mode;

	u32 rx_fc;		/* Rx flow control */

	u32 tx_fc;		/* Tx flow control */

	int link_speed;

drivers/net/benet/be_cmds.c

+2 −2
Original line number Diff line number Diff line
@@ -1258,7 +1258,7 @@ int be_cmd_get_flow_control(struct be_adapter *adapter, u32 *tx_fc, u32 *rx_fc) 
}



/* Uses mbox */

int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num, u32 *cap)

int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num, u32 *mode)

{

	struct be_mcc_wrb *wrb;

	struct be_cmd_req_query_fw_cfg *req;
@@ -1279,7 +1279,7 @@ int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num, u32 *cap) 
	if (!status) {

		struct be_cmd_resp_query_fw_cfg *resp = embedded_payload(wrb);

		*port_num = le32_to_cpu(resp->phys_port);

		*cap = le32_to_cpu(resp->function_cap);

		*mode = le32_to_cpu(resp->function_mode);

	}



	spin_unlock(&adapter->mbox_lock);

drivers/net/benet/be_cmds.h

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ struct be_cmd_resp_query_fw_cfg { 
	u32 be_config_number;

	u32 asic_revision;

	u32 phys_port;

	u32 function_cap;

	u32 function_mode;

	u32 rsvd[26];

};

drivers/net/benet/be_main.c

+4 −4
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ static void be_rx_compl_process(struct be_adapter *adapter, 


	/* vlanf could be wrongly set in some cards.

	 * ignore if vtm is not set */

	if ((adapter->cap & 0x400) && !vtm)

	if ((adapter->function_mode & 0x400) && !vtm)

		vlanf = 0;



	if (unlikely(vlanf)) {
@@ -1003,7 +1003,7 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter, 


	/* vlanf could be wrongly set in some cards.

	 * ignore if vtm is not set */

	if ((adapter->cap & 0x400) && !vtm)

	if ((adapter->function_mode & 0x400) && !vtm)

		vlanf = 0;



	skb = napi_get_frags(&eq_obj->napi);
@@ -2500,7 +2500,7 @@ static int be_get_config(struct be_adapter *adapter) 
		return status;



	status = be_cmd_query_fw_cfg(adapter,

				&adapter->port_num, &adapter->cap);

				&adapter->port_num, &adapter->function_mode);

	if (status)

		return status;
@@ -2520,7 +2520,7 @@ static int be_get_config(struct be_adapter *adapter) 
		memcpy(adapter->netdev->perm_addr, mac, ETH_ALEN);

	}



	if (adapter->cap & 0x400)

	if (adapter->function_mode & 0x400)

		adapter->max_vlans = BE_NUM_VLANS_SUPPORTED/4;

	else

		adapter->max_vlans = BE_NUM_VLANS_SUPPORTED;