aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-dev.h
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-08-26 02:10:53 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-29 15:25:33 -0400
commit0c325769a394559941acda83e888a1d9b1ef8b7f (patch)
tree6c64e9a7f14f5d8c9d6d0df095aa2747caddc0b8 /drivers/net/wireless/iwlwifi/iwl-dev.h
parent57210f7c9f04a2509ee54a0f454003a714db96dd (diff)
iwlagn: move ISR related data to transport layer
Since the ISR is entirely in the transport layer, its data should be in the pcie specific region. Change sync_irq to first disable and then synchronize the IRQ. iwl_isr and iwl_isr_ict now receive iwl_trans. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@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-dev.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 8a8fc74eebca..40a01c0e4f30 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1259,6 +1259,7 @@ struct iwl_priv {
1259 struct traffic_stats rx_stats; 1259 struct traffic_stats rx_stats;
1260 1260
1261 /* counts interrupts */ 1261 /* counts interrupts */
1262 /* TODO: move to the transport layer */
1262 struct isr_statistics isr_stats; 1263 struct isr_statistics isr_stats;
1263 1264
1264 struct iwl_power_mgr power_data; 1265 struct iwl_power_mgr power_data;
@@ -1315,14 +1316,6 @@ struct iwl_priv {
1315 } accum_stats, delta_stats, max_delta_stats; 1316 } accum_stats, delta_stats, max_delta_stats;
1316#endif 1317#endif
1317 1318
1318 /* INT ICT Table */
1319 __le32 *ict_tbl;
1320 void *ict_tbl_vir;
1321 dma_addr_t ict_tbl_dma;
1322 dma_addr_t aligned_ict_tbl_dma;
1323 int ict_index;
1324 u32 inta;
1325 bool use_ict;
1326 /* 1319 /*
1327 * reporting the number of tids has AGG on. 0 means 1320 * reporting the number of tids has AGG on. 0 means
1328 * no AGGREGATION 1321 * no AGGREGATION
@@ -1379,8 +1372,6 @@ struct iwl_priv {
1379 struct iwl_rxon_context *cur_rssi_ctx; 1372 struct iwl_rxon_context *cur_rssi_ctx;
1380 bool bt_is_sco; 1373 bool bt_is_sco;
1381 1374
1382 u32 inta_mask;
1383
1384 struct work_struct restart; 1375 struct work_struct restart;
1385 struct work_struct scan_completed; 1376 struct work_struct scan_completed;
1386 struct work_struct abort_scan; 1377 struct work_struct abort_scan;
@@ -1398,8 +1389,6 @@ struct iwl_priv {
1398 struct work_struct bt_full_concurrency; 1389 struct work_struct bt_full_concurrency;
1399 struct work_struct bt_runtime_config; 1390 struct work_struct bt_runtime_config;
1400 1391
1401 struct tasklet_struct irq_tasklet;
1402
1403 struct delayed_work scan_check; 1392 struct delayed_work scan_check;
1404 1393
1405 /* TX Power */ 1394 /* TX Power */