diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-10 18:02:02 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-15 16:48:23 -0400 |
commit | 17741cdc264e4d768167766a252210e201c1519a (patch) | |
tree | 72c0e697af29a40c03bce002b529c3951d34a3b7 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 8aa21e6fd703cb3fed66ac07dcbcb861f00cf6d6 (diff) |
mac80211: share STA information with driver
This patch changes mac80211 to share some more data about
stations with drivers. Should help iwlwifi and ath9k when
they get around to updating, and might also help with
implementing rate control algorithms without internals.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index e8db33bf5e5d..5eeffb41d8c2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -3413,13 +3413,13 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, u16 queue, | |||
3413 | 3413 | ||
3414 | static int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw, | 3414 | static int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw, |
3415 | enum ieee80211_ampdu_mlme_action action, | 3415 | enum ieee80211_ampdu_mlme_action action, |
3416 | const u8 *addr, u16 tid, u16 *ssn) | 3416 | struct ieee80211_sta *sta, u16 tid, u16 *ssn) |
3417 | { | 3417 | { |
3418 | struct iwl_priv *priv = hw->priv; | 3418 | struct iwl_priv *priv = hw->priv; |
3419 | DECLARE_MAC_BUF(mac); | 3419 | DECLARE_MAC_BUF(mac); |
3420 | 3420 | ||
3421 | IWL_DEBUG_HT("A-MPDU action on addr %s tid %d\n", | 3421 | IWL_DEBUG_HT("A-MPDU action on addr %s tid %d\n", |
3422 | print_mac(mac, addr), tid); | 3422 | print_mac(mac, sta->addr), tid); |
3423 | 3423 | ||
3424 | if (!(priv->cfg->sku & IWL_SKU_N)) | 3424 | if (!(priv->cfg->sku & IWL_SKU_N)) |
3425 | return -EACCES; | 3425 | return -EACCES; |
@@ -3427,16 +3427,16 @@ static int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw, | |||
3427 | switch (action) { | 3427 | switch (action) { |
3428 | case IEEE80211_AMPDU_RX_START: | 3428 | case IEEE80211_AMPDU_RX_START: |
3429 | IWL_DEBUG_HT("start Rx\n"); | 3429 | IWL_DEBUG_HT("start Rx\n"); |
3430 | return iwl_rx_agg_start(priv, addr, tid, *ssn); | 3430 | return iwl_rx_agg_start(priv, sta->addr, tid, *ssn); |
3431 | case IEEE80211_AMPDU_RX_STOP: | 3431 | case IEEE80211_AMPDU_RX_STOP: |
3432 | IWL_DEBUG_HT("stop Rx\n"); | 3432 | IWL_DEBUG_HT("stop Rx\n"); |
3433 | return iwl_rx_agg_stop(priv, addr, tid); | 3433 | return iwl_rx_agg_stop(priv, sta->addr, tid); |
3434 | case IEEE80211_AMPDU_TX_START: | 3434 | case IEEE80211_AMPDU_TX_START: |
3435 | IWL_DEBUG_HT("start Tx\n"); | 3435 | IWL_DEBUG_HT("start Tx\n"); |
3436 | return iwl_tx_agg_start(priv, addr, tid, ssn); | 3436 | return iwl_tx_agg_start(priv, sta->addr, tid, ssn); |
3437 | case IEEE80211_AMPDU_TX_STOP: | 3437 | case IEEE80211_AMPDU_TX_STOP: |
3438 | IWL_DEBUG_HT("stop Tx\n"); | 3438 | IWL_DEBUG_HT("stop Tx\n"); |
3439 | return iwl_tx_agg_stop(priv, addr, tid); | 3439 | return iwl_tx_agg_stop(priv, sta->addr, tid); |
3440 | default: | 3440 | default: |
3441 | IWL_DEBUG_HT("unknown\n"); | 3441 | IWL_DEBUG_HT("unknown\n"); |
3442 | return -EINVAL; | 3442 | return -EINVAL; |