diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2008-04-07 13:16:56 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-08 16:44:44 -0400 |
commit | 513a1025fd91008316a8e9b4803d1bfcbb2bf256 (patch) | |
tree | 8f39f9459932b1ec0da1e14b5c6d58a8d39422b6 /net/mac80211/ieee80211_sta.c | |
parent | 8cf6a31e8d30cae1fbec8c782842f00472a4495c (diff) |
mac80211: BA session debug prints changes
This patch contains next issues:
1 - prevents "stop BA session" multiple warnings
2 - adds debug print to stop Rx BA session flow
3 - adds EOL in one debug print
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_sta.c')
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index 89481c919cb6..2a3f8a8e9a43 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c | |||
@@ -1278,7 +1278,7 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev, | |||
1278 | ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_START, | 1278 | ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_START, |
1279 | sta->addr, tid, &start_seq_num); | 1279 | sta->addr, tid, &start_seq_num); |
1280 | #ifdef CONFIG_MAC80211_HT_DEBUG | 1280 | #ifdef CONFIG_MAC80211_HT_DEBUG |
1281 | printk(KERN_DEBUG "Rx A-MPDU on tid %d result %d", tid, ret); | 1281 | printk(KERN_DEBUG "Rx A-MPDU request on tid %d result %d\n", tid, ret); |
1282 | #endif /* CONFIG_MAC80211_HT_DEBUG */ | 1282 | #endif /* CONFIG_MAC80211_HT_DEBUG */ |
1283 | 1283 | ||
1284 | if (ret) { | 1284 | if (ret) { |
@@ -1433,6 +1433,7 @@ void ieee80211_sta_stop_rx_ba_session(struct net_device *dev, u8 *ra, u16 tid, | |||
1433 | struct ieee80211_hw *hw = &local->hw; | 1433 | struct ieee80211_hw *hw = &local->hw; |
1434 | struct sta_info *sta; | 1434 | struct sta_info *sta; |
1435 | int ret, i; | 1435 | int ret, i; |
1436 | DECLARE_MAC_BUF(mac); | ||
1436 | 1437 | ||
1437 | rcu_read_lock(); | 1438 | rcu_read_lock(); |
1438 | 1439 | ||
@@ -1453,12 +1454,17 @@ void ieee80211_sta_stop_rx_ba_session(struct net_device *dev, u8 *ra, u16 tid, | |||
1453 | sta->ampdu_mlme.tid_state_rx[tid] = | 1454 | sta->ampdu_mlme.tid_state_rx[tid] = |
1454 | HT_AGG_STATE_REQ_STOP_BA_MSK | | 1455 | HT_AGG_STATE_REQ_STOP_BA_MSK | |
1455 | (initiator << HT_AGG_STATE_INITIATOR_SHIFT); | 1456 | (initiator << HT_AGG_STATE_INITIATOR_SHIFT); |
1456 | spin_unlock_bh(&sta->ampdu_mlme.ampdu_rx); | 1457 | spin_unlock_bh(&sta->ampdu_mlme.ampdu_rx); |
1457 | 1458 | ||
1458 | /* stop HW Rx aggregation. ampdu_action existence | 1459 | /* stop HW Rx aggregation. ampdu_action existence |
1459 | * already verified in session init so we add the BUG_ON */ | 1460 | * already verified in session init so we add the BUG_ON */ |
1460 | BUG_ON(!local->ops->ampdu_action); | 1461 | BUG_ON(!local->ops->ampdu_action); |
1461 | 1462 | ||
1463 | #ifdef CONFIG_MAC80211_HT_DEBUG | ||
1464 | printk(KERN_DEBUG "Rx BA session stop requested for %s tid %u\n", | ||
1465 | print_mac(mac, ra), tid); | ||
1466 | #endif /* CONFIG_MAC80211_HT_DEBUG */ | ||
1467 | |||
1462 | ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_STOP, | 1468 | ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_STOP, |
1463 | ra, tid, NULL); | 1469 | ra, tid, NULL); |
1464 | if (ret) | 1470 | if (ret) |