From dab7820c5395269726e015b11ba551b68ac0fa72 Mon Sep 17 00:00:00 2001 From: Florian Schilhabel Date: Thu, 15 Jul 2010 19:02:59 +0200 Subject: [PATCH] --- yaml --- r: 205932 b: refs/heads/master c: 26cc71540ab80714f7635139526b4c0cb6fe465d h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8950ee23ee19..cdbaa0fb90e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67db39324f6fcc8dc2a286bc8881be1016c8dc29 +refs/heads/master: 26cc71540ab80714f7635139526b4c0cb6fe465d diff --git a/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c b/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c index c2028b433bcf..7cae63a7c012 100644 --- a/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +++ b/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c @@ -1407,6 +1407,12 @@ void ieee80211_associate_procedure_wq(struct work_struct *work) //ieee->set_chan(ieee->dev, ieee->current_network.channel); HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); + if(ieee->eRFPowerState == eRfOff) + { + printk("=============>%s():Rf state is eRfOff, schedule ipsleave wq again,return\n",__FUNCTION__); + up(&ieee->wx_sem); + return; + } ieee->associate_seq = 1; ieee80211_associate_step1(ieee);