lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

be2net: variable name changes

Browse Source 
This patch changes names of some variables.

Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ajit Khaparde
2010-07-23 02:04:54 +00:00
committed by David S. Miller
parent 8943807c21
commit 3486be29e6
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/benet/be.h
View File

@@ -285,7 +285,7 @@ struct be_adapter {
u32 port_num; u32 port_num;
bool promiscuous; bool promiscuous;
bool wol; bool wol;
u32 cap; u32 function_mode;
u32 rx_fc; /* Rx flow control */ u32 rx_fc; /* Rx flow control */
u32 tx_fc; /* Tx flow control */ u32 tx_fc; /* Tx flow control */
int link_speed; int link_speed;

4
drivers/net/benet/be_cmds.c
View File

@@ -1258,7 +1258,7 @@ err:
} }
/* Uses mbox */ /* 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_mcc_wrb *wrb;
struct be_cmd_req_query_fw_cfg *req; 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) { if (!status) {
struct be_cmd_resp_query_fw_cfg *resp = embedded_payload(wrb); struct be_cmd_resp_query_fw_cfg *resp = embedded_payload(wrb);
*port_num = le32_to_cpu(resp->phys_port); *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); spin_unlock(&adapter->mbox_lock);

2
drivers/net/benet/be_cmds.h
View File

@@ -749,7 +749,7 @@ struct be_cmd_resp_query_fw_cfg {
u32 be_config_number; u32 be_config_number;
u32 asic_revision; u32 asic_revision;
u32 phys_port; u32 phys_port;
u32 function_cap; u32 function_mode;
u32 rsvd[26]; u32 rsvd[26];
}; };

8
drivers/net/benet/be_main.c
View File

@@ -963,7 +963,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,
/* vlanf could be wrongly set in some cards. /* vlanf could be wrongly set in some cards.
* ignore if vtm is not set */ * ignore if vtm is not set */
if ((adapter->cap & 0x400) && !vtm) if ((adapter->function_mode & 0x400) && !vtm)
vlanf = 0; vlanf = 0;
if (unlikely(vlanf)) { 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. /* vlanf could be wrongly set in some cards.
* ignore if vtm is not set */ * ignore if vtm is not set */
if ((adapter->cap & 0x400) && !vtm) if ((adapter->function_mode & 0x400) && !vtm)
vlanf = 0; vlanf = 0;
skb = napi_get_frags(&eq_obj->napi); skb = napi_get_frags(&eq_obj->napi);
@@ -2500,7 +2500,7 @@ static int be_get_config(struct be_adapter *adapter)
return status; return status;
status = be_cmd_query_fw_cfg(adapter, status = be_cmd_query_fw_cfg(adapter,
&adapter->port_num, &adapter->cap); &adapter->port_num, &adapter->function_mode);
if (status) if (status)
return status; return status;
@@ -2520,7 +2520,7 @@ static int be_get_config(struct be_adapter *adapter)
memcpy(adapter->netdev->perm_addr, mac, ETH_ALEN); 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; adapter->max_vlans = BE_NUM_VLANS_SUPPORTED/4;
else else
adapter->max_vlans = BE_NUM_VLANS_SUPPORTED; adapter->max_vlans = BE_NUM_VLANS_SUPPORTED;