diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-06-02 15:36:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-02 15:36:51 -0400 |
| commit | 1c62c72b1a3c4478fb9069503d20c41b1f385ca1 (patch) | |
| tree | 939634bedbabfcd389ab7ad96ab7e161e25b2061 /drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | |
| parent | da1fdb02d9200ff28b6f3a380d21930335fe5429 (diff) | |
| parent | 9f6e1bafac4f3c58c8a670496adcc4d313d3c7f7 (diff) | |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c index 44ef5d93bef..25851ec2ab1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include "iwl-io.h" | 37 | #include "iwl-io.h" |
| 38 | #include "iwl-agn.h" | 38 | #include "iwl-agn.h" |
| 39 | 39 | ||
| 40 | static int iwlagn_send_rxon_assoc(struct iwl_priv *priv) | 40 | int iwlagn_send_rxon_assoc(struct iwl_priv *priv) |
| 41 | { | 41 | { |
| 42 | int ret = 0; | 42 | int ret = 0; |
| 43 | struct iwl5000_rxon_assoc_cmd rxon_assoc; | 43 | struct iwl5000_rxon_assoc_cmd rxon_assoc; |
| @@ -84,7 +84,7 @@ static int iwlagn_send_rxon_assoc(struct iwl_priv *priv) | |||
| 84 | return ret; | 84 | return ret; |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | static int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant) | 87 | int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant) |
| 88 | { | 88 | { |
| 89 | struct iwl_tx_ant_config_cmd tx_ant_cmd = { | 89 | struct iwl_tx_ant_config_cmd tx_ant_cmd = { |
| 90 | .valid = cpu_to_le32(valid_tx_ant), | 90 | .valid = cpu_to_le32(valid_tx_ant), |