diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-30 15:25:08 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-30 15:25:08 -0500 |
| commit | 891dc5e73783eeabd2a704a9425e2a199b39c9f9 (patch) | |
| tree | 9b4478941c486d47a71bfce455b896c5dda7e811 /net/mac80211 | |
| parent | e1781ed33a8809c58ad6c3b6d432d656446efa43 (diff) | |
| parent | 55afc80b2ab100618c17af77915f75307b6bd5d1 (diff) | |
| download | kernel_samsung_smdk4412-891dc5e73783eeabd2a704a9425e2a199b39c9f9.zip kernel_samsung_smdk4412-891dc5e73783eeabd2a704a9425e2a199b39c9f9.tar.gz kernel_samsung_smdk4412-891dc5e73783eeabd2a704a9425e2a199b39c9f9.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/libertas/scan.c
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/ibss.c | 4 | ||||
| -rw-r--r-- | net/mac80211/tx.c | 4 | ||||
| -rw-r--r-- | net/mac80211/util.c | 12 |
3 files changed, 20 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 621a54c..5bcde4c 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -387,6 +387,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, u8 *bssid,u8 *addr, u32 supp_rates) { + struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; struct ieee80211_local *local = sdata->local; struct sta_info *sta; int band = local->hw.conf.channel->band; @@ -402,6 +403,9 @@ struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, return NULL; } + if (ifibss->state == IEEE80211_IBSS_MLME_SEARCH) + return NULL; + if (compare_ether_addr(bssid, sdata->u.ibss.bssid)) return NULL; diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 1593a2f..7bba49d 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1418,6 +1418,10 @@ static bool need_dynamic_ps(struct ieee80211_local *local) if (!local->ps_sdata) return false; + /* No point if we're going to suspend */ + if (local->quiescing) + return false; + return true; } diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 4b93030..7e38858 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1084,7 +1084,19 @@ int ieee80211_reconfig(struct ieee80211_local *local) /* restart hardware */ if (local->open_count) { + /* + * Upon resume hardware can sometimes be goofy due to + * various platform / driver / bus issues, so restarting + * the device may at times not work immediately. Propagate + * the error. + */ res = drv_start(local); + if (res) { + WARN(local->suspended, "Harware became unavailable " + "upon resume. This is could be a software issue" + "prior to suspend or a harware issue\n"); + return res; + } ieee80211_led_radio(local, true); } |