diff options
| author | Florian Schilhabel <florian.c.schilhabel@googlemail.com> | 2010-07-14 14:42:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 11:57:49 -0700 |
| commit | d54713991107f3f29acb9b579569de9196ab2890 (patch) | |
| tree | f363876e18393bf93dd72c940004c3101c802b88 /drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | |
| parent | 638b5acd4dfe9dd79260a9c824be74b29408ee9a (diff) | |
staging: rtl8192su: update rtl819x_set_channel_map()
This function is now on par with the latest realtek drivers.
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c')
| -rw-r--r-- | drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c index 4f1f2f08b2d7..c2028b433bcf 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c @@ -1432,6 +1432,8 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee if ((ieee->iw_mode == IW_MODE_ADHOC) && !(net->capability & WLAN_CAPABILITY_IBSS)) return; + if ((ieee->iw_mode == IW_MODE_ADHOC) && (net->channel > ieee->ibss_maxjoin_chal)) + return; if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC){ /* if the user specified the AP MAC, we need also the essid @@ -2362,7 +2364,7 @@ void ieee80211_start_ibss_wq(struct work_struct *work) // if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK)) if (ieee->state == IEEE80211_NOLINK) - ieee->current_network.channel = 6; + ieee->current_network.channel = ieee->IbssStartChnl; /* if not then the state is not linked. Maybe the user swithced to * ad-hoc mode just after being in monitor mode, or just after * being very few time in managed mode (so the card have had no |