diff options
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 36 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 |
4 files changed, 0 insertions, 40 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index f51b8cd80de5..c1eff4c5b448 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -3440,7 +3440,6 @@ static struct ieee80211_ops iwl_hw_ops = { | |||
| 3440 | .set_key = iwl_mac_set_key, | 3440 | .set_key = iwl_mac_set_key, |
| 3441 | .update_tkip_key = iwl_mac_update_tkip_key, | 3441 | .update_tkip_key = iwl_mac_update_tkip_key, |
| 3442 | .get_stats = iwl_mac_get_stats, | 3442 | .get_stats = iwl_mac_get_stats, |
| 3443 | .get_tx_stats = iwl_mac_get_tx_stats, | ||
| 3444 | .conf_tx = iwl_mac_conf_tx, | 3443 | .conf_tx = iwl_mac_conf_tx, |
| 3445 | .reset_tsf = iwl_mac_reset_tsf, | 3444 | .reset_tsf = iwl_mac_reset_tsf, |
| 3446 | .bss_info_changed = iwl_bss_info_changed, | 3445 | .bss_info_changed = iwl_bss_info_changed, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index b248fba4875e..d390eef2efe5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
| @@ -2851,42 +2851,6 @@ out: | |||
| 2851 | } | 2851 | } |
| 2852 | EXPORT_SYMBOL(iwl_mac_config); | 2852 | EXPORT_SYMBOL(iwl_mac_config); |
| 2853 | 2853 | ||
| 2854 | int iwl_mac_get_tx_stats(struct ieee80211_hw *hw, | ||
| 2855 | struct ieee80211_tx_queue_stats *stats) | ||
| 2856 | { | ||
| 2857 | struct iwl_priv *priv = hw->priv; | ||
| 2858 | int i, avail; | ||
| 2859 | struct iwl_tx_queue *txq; | ||
| 2860 | struct iwl_queue *q; | ||
| 2861 | unsigned long flags; | ||
| 2862 | |||
| 2863 | IWL_DEBUG_MAC80211(priv, "enter\n"); | ||
| 2864 | |||
| 2865 | if (!iwl_is_ready_rf(priv)) { | ||
| 2866 | IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n"); | ||
| 2867 | return -EIO; | ||
| 2868 | } | ||
| 2869 | |||
| 2870 | spin_lock_irqsave(&priv->lock, flags); | ||
| 2871 | |||
| 2872 | for (i = 0; i < AC_NUM; i++) { | ||
| 2873 | txq = &priv->txq[i]; | ||
| 2874 | q = &txq->q; | ||
| 2875 | avail = iwl_queue_space(q); | ||
| 2876 | |||
| 2877 | stats[i].len = q->n_window - avail; | ||
| 2878 | stats[i].limit = q->n_window - q->high_mark; | ||
| 2879 | stats[i].count = q->n_window; | ||
| 2880 | |||
| 2881 | } | ||
| 2882 | spin_unlock_irqrestore(&priv->lock, flags); | ||
| 2883 | |||
| 2884 | IWL_DEBUG_MAC80211(priv, "leave\n"); | ||
| 2885 | |||
| 2886 | return 0; | ||
| 2887 | } | ||
| 2888 | EXPORT_SYMBOL(iwl_mac_get_tx_stats); | ||
| 2889 | |||
| 2890 | void iwl_mac_reset_tsf(struct ieee80211_hw *hw) | 2854 | void iwl_mac_reset_tsf(struct ieee80211_hw *hw) |
| 2891 | { | 2855 | { |
| 2892 | struct iwl_priv *priv = hw->priv; | 2856 | struct iwl_priv *priv = hw->priv; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 49795b90246d..8f0c564e68b0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
| @@ -342,8 +342,6 @@ void iwl_mac_remove_interface(struct ieee80211_hw *hw, | |||
| 342 | struct ieee80211_vif *vif); | 342 | struct ieee80211_vif *vif); |
| 343 | int iwl_mac_config(struct ieee80211_hw *hw, u32 changed); | 343 | int iwl_mac_config(struct ieee80211_hw *hw, u32 changed); |
| 344 | void iwl_config_ap(struct iwl_priv *priv); | 344 | void iwl_config_ap(struct iwl_priv *priv); |
| 345 | int iwl_mac_get_tx_stats(struct ieee80211_hw *hw, | ||
| 346 | struct ieee80211_tx_queue_stats *stats); | ||
| 347 | void iwl_mac_reset_tsf(struct ieee80211_hw *hw); | 345 | void iwl_mac_reset_tsf(struct ieee80211_hw *hw); |
| 348 | int iwl_alloc_txq_mem(struct iwl_priv *priv); | 346 | int iwl_alloc_txq_mem(struct iwl_priv *priv); |
| 349 | void iwl_free_txq_mem(struct iwl_priv *priv); | 347 | void iwl_free_txq_mem(struct iwl_priv *priv); |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 119da54116de..eac2b9a95711 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -3835,7 +3835,6 @@ static struct ieee80211_ops iwl3945_hw_ops = { | |||
| 3835 | .config = iwl_mac_config, | 3835 | .config = iwl_mac_config, |
| 3836 | .configure_filter = iwl_configure_filter, | 3836 | .configure_filter = iwl_configure_filter, |
| 3837 | .set_key = iwl3945_mac_set_key, | 3837 | .set_key = iwl3945_mac_set_key, |
| 3838 | .get_tx_stats = iwl_mac_get_tx_stats, | ||
| 3839 | .conf_tx = iwl_mac_conf_tx, | 3838 | .conf_tx = iwl_mac_conf_tx, |
| 3840 | .reset_tsf = iwl_mac_reset_tsf, | 3839 | .reset_tsf = iwl_mac_reset_tsf, |
| 3841 | .bss_info_changed = iwl_bss_info_changed, | 3840 | .bss_info_changed = iwl_bss_info_changed, |
