aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-3945.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index cfceee18814d..788cd9cc4b13 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -422,7 +422,7 @@ struct iwl3945_priv {
422 422
423 /* each calibration channel group in the EEPROM has a derived 423 /* each calibration channel group in the EEPROM has a derived
424 * clip setting for each rate. */ 424 * clip setting for each rate. */
425 const struct iwl3945_clip_group clip_groups[5]; 425 const struct iwl3945_clip_group clip39_groups[5];
426 426
427 /* thermal calibration */ 427 /* thermal calibration */
428 s32 temperature; /* degrees Kelvin */ 428 s32 temperature; /* degrees Kelvin */
@@ -438,7 +438,7 @@ struct iwl3945_priv {
438 int one_direct_scan; 438 int one_direct_scan;
439 u8 direct_ssid_len; 439 u8 direct_ssid_len;
440 u8 direct_ssid[IW_ESSID_MAX_SIZE]; 440 u8 direct_ssid[IW_ESSID_MAX_SIZE];
441 struct iwl3945_scan_cmd *scan; 441 struct iwl3945_scan_cmd *scan39;
442 442
443 /* spinlock */ 443 /* spinlock */
444 spinlock_t lock; /* protect general shared data */ 444 spinlock_t lock; /* protect general shared data */
@@ -468,11 +468,11 @@ struct iwl3945_priv {
468 * changed via explicit cast within the 468 * changed via explicit cast within the
469 * routines that actually update the physical 469 * routines that actually update the physical
470 * hardware */ 470 * hardware */
471 const struct iwl3945_rxon_cmd active_rxon; 471 const struct iwl3945_rxon_cmd active39_rxon;
472 struct iwl3945_rxon_cmd staging_rxon; 472 struct iwl3945_rxon_cmd staging39_rxon;
473 473
474 int error_recovering; 474 int error_recovering;
475 struct iwl3945_rxon_cmd recovery_rxon; 475 struct iwl3945_rxon_cmd recovery39_rxon;
476 476
477 /* 1st responses from initialize and runtime uCode images. 477 /* 1st responses from initialize and runtime uCode images.
478 * 4965's initialize alive response contains some calibration data. */ 478 * 4965's initialize alive response contains some calibration data. */
@@ -485,7 +485,7 @@ struct iwl3945_priv {
485#endif 485#endif
486 486
487#ifdef CONFIG_IWL3945_LEDS 487#ifdef CONFIG_IWL3945_LEDS
488 struct iwl3945_led led[IWL_LED_TRG_MAX]; 488 struct iwl3945_led led39[IWL_LED_TRG_MAX];
489 unsigned long last_blink_time; 489 unsigned long last_blink_time;
490 u8 last_blink_rate; 490 u8 last_blink_rate;
491 u8 allow_blinking; 491 u8 allow_blinking;
@@ -510,16 +510,16 @@ struct iwl3945_priv {
510 510
511 /* Rx and Tx DMA processing queues */ 511 /* Rx and Tx DMA processing queues */
512 struct iwl_rx_queue rxq; 512 struct iwl_rx_queue rxq;
513 struct iwl3945_tx_queue txq[IWL39_MAX_NUM_QUEUES]; 513 struct iwl3945_tx_queue txq39[IWL39_MAX_NUM_QUEUES];
514 514
515 unsigned long status; 515 unsigned long status;
516 516
517 int last_rx_rssi; /* From Rx packet statisitics */ 517 int last_rx_rssi; /* From Rx packet statisitics */
518 int last_rx_noise; /* From beacon statistics */ 518 int last_rx_noise; /* From beacon statistics */
519 519
520 struct iwl3945_power_mgr power_data; 520 struct iwl3945_power_mgr power_data_39;
521 521
522 struct iwl3945_notif_statistics statistics; 522 struct iwl3945_notif_statistics statistics_39;
523 unsigned long last_statistics_time; 523 unsigned long last_statistics_time;
524 524
525 /* context information */ 525 /* context information */
@@ -534,7 +534,7 @@ struct iwl3945_priv {
534 /*station table variables */ 534 /*station table variables */
535 spinlock_t sta_lock; 535 spinlock_t sta_lock;
536 int num_stations; 536 int num_stations;
537 struct iwl3945_station_entry stations[IWL_STATION_COUNT]; 537 struct iwl3945_station_entry stations_39[IWL_STATION_COUNT];
538 538
539 /* Indication if ieee80211_ops->open has been called */ 539 /* Indication if ieee80211_ops->open has been called */
540 u8 is_open; 540 u8 is_open;
@@ -546,7 +546,7 @@ struct iwl3945_priv {
546 u64 last_tsf; 546 u64 last_tsf;
547 547
548 /* eeprom */ 548 /* eeprom */
549 struct iwl3945_eeprom eeprom; 549 struct iwl3945_eeprom eeprom39;
550 550
551 enum nl80211_iftype iw_mode; 551 enum nl80211_iftype iw_mode;
552 552
@@ -607,7 +607,7 @@ struct iwl3945_priv {
607 607
608static inline int iwl3945_is_associated(struct iwl3945_priv *priv) 608static inline int iwl3945_is_associated(struct iwl3945_priv *priv)
609{ 609{
610 return (priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0; 610 return (priv->active39_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
611} 611}
612 612
613extern const struct iwl_channel_info *iwl3945_get_channel_info( 613extern const struct iwl_channel_info *iwl3945_get_channel_info(