From 146de8b7b0bed4dcd1cd52fdfe27e73e2299d3b4 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Tue, 7 Jun 2011 14:03:08 -0400 Subject: [PATCH] --- yaml --- r: 253415 b: refs/heads/master c: bb77f6341728624314f488ebd8b4c69f2caa33ea h: refs/heads/master i: 253413: 81dba6ffd9287deef50112a8da6635ff0d5caed6 253411: 4a93202bbbfe5a3c7931a11c8be9a148c7a77d8b 253407: ef97ba1316aabe21276692ec91d9c8ae1784d818 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0ebdef6d96fb..9eeb83385b5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51892dbbd511911c0f965a36b431fc3e8f1e4f8a +refs/heads/master: bb77f6341728624314f488ebd8b4c69f2caa33ea diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 456cccf26b51..d595265d6c22 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -232,9 +232,6 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata, WARN_ON(!ieee80211_set_channel_type(local, sdata, channel_type)); } - ieee80211_stop_queues_by_reason(&sdata->local->hw, - IEEE80211_QUEUE_STOP_REASON_CSA); - /* channel_type change automatically detected */ ieee80211_hw_config(local, 0); @@ -248,9 +245,6 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata, rcu_read_unlock(); } - ieee80211_wake_queues_by_reason(&sdata->local->hw, - IEEE80211_QUEUE_STOP_REASON_CSA); - ht_opmode = le16_to_cpu(hti->operation_mode); /* if bss configuration changed store the new one */