diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-10 22:24:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-10 22:24:44 +0100 |
| commit | 23779897546c1effb546ff89b89803d9d955d517 (patch) | |
| tree | d4b5d52b5d716a72755ba018382d4b87eae763a4 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | tipc: trivial endian annotation in debug statement (diff) | |
| parent | rtl8187: Change TX power settings (diff) | |
| download | linux-23779897546c1effb546ff89b89803d9d955d517.tar.xz linux-23779897546c1effb546ff89b89803d9d955d517.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index b58fcdef5432..eb396f26730c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -576,8 +576,8 @@ extern int iwl_send_add_sta(struct iwl_priv *priv, struct iwl_addsta_cmd *sta, u8 flags); extern u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags, struct ieee80211_sta_ht_cap *ht_info); -extern void iwl4965_update_chain_flags(struct iwl_priv *priv); -extern int iwl4965_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src); +extern void iwl_update_chain_flags(struct iwl_priv *priv); +extern int iwl_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src); extern const u8 iwl_bcast_addr[ETH_ALEN]; extern int iwl_rxq_stop(struct iwl_priv *priv); extern void iwl_txq_ctx_stop(struct iwl_priv *priv); @@ -926,8 +926,6 @@ struct iwl_priv { unsigned long last_statistics_time; /* context information */ - u8 essid[IW_ESSID_MAX_SIZE]; - u8 essid_len; u16 rates_mask; u32 power_mode; |