diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-14 20:45:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-14 20:45:59 -0500 |
| commit | f6f223039c0d0683bdea1eabd35b309e10311a60 (patch) | |
| tree | 890e07acf8c18ddc2994ebc0a0bdcdda38b0dcc6 /net/mac80211/agg-tx.c | |
| parent | b3b3f04fb587ecb61b5baa6c1c5f0e666fd12d73 (diff) | |
| parent | 42c4568a4ace0adc27a9d6f02936e2047ba6fc7e (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/agg-tx.c')
| -rw-r--r-- | net/mac80211/agg-tx.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 718fbcff84d2..5538e1b4a697 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c | |||
| @@ -237,6 +237,14 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid) | |||
| 237 | sdata->vif.type != NL80211_IFTYPE_AP) | 237 | sdata->vif.type != NL80211_IFTYPE_AP) |
| 238 | return -EINVAL; | 238 | return -EINVAL; |
| 239 | 239 | ||
| 240 | if (test_sta_flags(sta, WLAN_STA_DISASSOC)) { | ||
| 241 | #ifdef CONFIG_MAC80211_HT_DEBUG | ||
| 242 | printk(KERN_DEBUG "Disassociation is in progress. " | ||
| 243 | "Denying BA session request\n"); | ||
| 244 | #endif | ||
| 245 | return -EINVAL; | ||
| 246 | } | ||
| 247 | |||
| 240 | if (test_sta_flags(sta, WLAN_STA_SUSPEND)) { | 248 | if (test_sta_flags(sta, WLAN_STA_SUSPEND)) { |
| 241 | #ifdef CONFIG_MAC80211_HT_DEBUG | 249 | #ifdef CONFIG_MAC80211_HT_DEBUG |
| 242 | printk(KERN_DEBUG "Suspend in progress. " | 250 | printk(KERN_DEBUG "Suspend in progress. " |