aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>2012-03-07 12:52:35 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-08 13:59:55 -0500
commit92d743ae105314a865b3fca9128da11525d22203 (patch)
tree6298acf9da2fab5531449e15182ee01acdb120ba /drivers/net/wireless/iwlwifi/iwl-agn.c
parent3251715dc51a8cbd2cd030ff94fe36f37b4b9e74 (diff)
iwlwifi: configure transport layer from dvm op mode
Introduce the iwl_trans_config struct which contains state variables that only the op mode can determine, but which the transport layer needs to know. Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 6ed2f782177b..83018ec11bc7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1185,6 +1185,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
1185 struct iwl_op_mode *op_mode; 1185 struct iwl_op_mode *op_mode;
1186 u16 num_mac; 1186 u16 num_mac;
1187 u32 ucode_flags; 1187 u32 ucode_flags;
1188 struct iwl_trans_config trans_cfg;
1188 1189
1189 /************************ 1190 /************************
1190 * 1. Allocating HW data 1191 * 1. Allocating HW data
@@ -1205,7 +1206,14 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
1205 /* TODO: remove fw from shared data later */ 1206 /* TODO: remove fw from shared data later */
1206 priv->shrd->fw = fw; 1207 priv->shrd->fw = fw;
1207 1208
1208 iwl_trans_configure(trans(priv), op_mode); 1209 /*
1210 * Populate the state variables that the transport layer needs
1211 * to know about.
1212 */
1213 trans_cfg.op_mode = op_mode;
1214
1215 /* Configure transport layer */
1216 iwl_trans_configure(trans(priv), &trans_cfg);
1209 1217
1210 /* At this point both hw and priv are allocated. */ 1218 /* At this point both hw and priv are allocated. */
1211 1219