diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-25 16:36:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-25 16:36:46 -0700 |
| commit | 495a1b4eff1a216a3ea171ac137f1807e6555f52 (patch) | |
| tree | 72d059d6d66fac6a74df33bac2eb40dcd0ea0732 /drivers/net/wireless/iwlwifi/iwl-3945.h | |
| parent | ad8affd972a705a38e769859c50ee8e749b631da (diff) | |
| parent | d3feaf5ad12259927039a675cfb25dc342b403ab (diff) | |
| download | op-kernel-dev-495a1b4eff1a216a3ea171ac137f1807e6555f52.zip op-kernel-dev-495a1b4eff1a216a3ea171ac137f1807e6555f52.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
net/mac80211/pm.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h index 5518884..da87528f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945.h @@ -162,7 +162,6 @@ struct iwl3945_frame { #define STATUS_TEMPERATURE 8 #define STATUS_GEO_CONFIGURED 9 #define STATUS_EXIT_PENDING 10 -#define STATUS_IN_SUSPEND 11 #define STATUS_STATISTICS 12 #define STATUS_SCANNING 13 #define STATUS_SCAN_ABORTING 14 @@ -207,7 +206,8 @@ struct iwl3945_addsta_cmd; extern int iwl3945_send_add_station(struct iwl_priv *priv, struct iwl3945_addsta_cmd *sta, u8 flags); extern u8 iwl3945_add_station(struct iwl_priv *priv, const u8 *bssid, - int is_ap, u8 flags); + int is_ap, u8 flags, struct ieee80211_sta_ht_cap *ht_info); +extern void iwl3945_clear_stations_table(struct iwl_priv *priv); extern int iwl3945_power_init_handle(struct iwl_priv *priv); extern int iwl3945_eeprom_init(struct iwl_priv *priv); extern int iwl3945_calc_db_from_ratio(int sig_ratio); @@ -278,6 +278,8 @@ extern void iwl3945_hw_rx_statistics(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb); extern void iwl3945_disable_events(struct iwl_priv *priv); extern int iwl4965_get_temperature(const struct iwl_priv *priv); +extern void iwl3945_post_associate(struct iwl_priv *priv); +extern void iwl3945_config_ap(struct iwl_priv *priv); /** * iwl3945_hw_find_station - Find station id for a given BSSID |
