diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2008-03-18 18:00:31 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-03-25 16:41:56 -0400 |
commit | 7b9d44cd6b393cb1032ce201307ae87e5677bfa7 (patch) | |
tree | 7d1e41044439aab2b45dbdd97c22eddff7ae0e4c | |
parent | 2e354ed7bec8a6fc9ecc71e908555af708583c30 (diff) |
mac80211: fixing debug prints for AddBA request
This patch also fixes the Rx timer's comments
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index 28703d1e8362..9beedb655896 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c | |||
@@ -1145,7 +1145,7 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev, | |||
1145 | status = WLAN_STATUS_INVALID_QOS_PARAM; | 1145 | status = WLAN_STATUS_INVALID_QOS_PARAM; |
1146 | #ifdef CONFIG_MAC80211_HT_DEBUG | 1146 | #ifdef CONFIG_MAC80211_HT_DEBUG |
1147 | if (net_ratelimit()) | 1147 | if (net_ratelimit()) |
1148 | printk(KERN_DEBUG "Block Ack Req with bad params from " | 1148 | printk(KERN_DEBUG "AddBA Req with bad params from " |
1149 | "%s on tid %u. policy %d, buffer size %d\n", | 1149 | "%s on tid %u. policy %d, buffer size %d\n", |
1150 | print_mac(mac, mgmt->sa), tid, ba_policy, | 1150 | print_mac(mac, mgmt->sa), tid, ba_policy, |
1151 | buf_size); | 1151 | buf_size); |
@@ -1169,7 +1169,7 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev, | |||
1169 | if (tid_agg_rx->state != HT_AGG_STATE_IDLE) { | 1169 | if (tid_agg_rx->state != HT_AGG_STATE_IDLE) { |
1170 | #ifdef CONFIG_MAC80211_HT_DEBUG | 1170 | #ifdef CONFIG_MAC80211_HT_DEBUG |
1171 | if (net_ratelimit()) | 1171 | if (net_ratelimit()) |
1172 | printk(KERN_DEBUG "unexpected Block Ack Req from " | 1172 | printk(KERN_DEBUG "unexpected AddBA Req from " |
1173 | "%s on tid %u\n", | 1173 | "%s on tid %u\n", |
1174 | print_mac(mac, mgmt->sa), tid); | 1174 | print_mac(mac, mgmt->sa), tid); |
1175 | #endif /* CONFIG_MAC80211_HT_DEBUG */ | 1175 | #endif /* CONFIG_MAC80211_HT_DEBUG */ |
@@ -1497,8 +1497,8 @@ timer_expired_exit: | |||
1497 | } | 1497 | } |
1498 | 1498 | ||
1499 | /* | 1499 | /* |
1500 | * After receiving Block Ack Request (BAR) we activated a | 1500 | * After accepting the AddBA Request we activated a timer, |
1501 | * timer after each frame arrives from the originator. | 1501 | * resetting it after each frame that arrives from the originator. |
1502 | * if this timer expires ieee80211_sta_stop_rx_ba_session will be executed. | 1502 | * if this timer expires ieee80211_sta_stop_rx_ba_session will be executed. |
1503 | */ | 1503 | */ |
1504 | void sta_rx_agg_session_timer_expired(unsigned long data) | 1504 | void sta_rx_agg_session_timer_expired(unsigned long data) |