diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2008-08-04 10:00:39 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-08-04 21:09:12 +0200 |
| commit | 4c43e0d0ecd5196ed5c67f64ed2f1860770eed34 (patch) | |
| tree | f25047f729c2d3bc2e82db51c1b7f4a3cb094b77 /net/mac80211 | |
| parent | p54: Fix potential concurrent access to private data (diff) | |
| download | linux-4c43e0d0ecd5196ed5c67f64ed2f1860770eed34.tar.xz linux-4c43e0d0ecd5196ed5c67f64ed2f1860770eed34.zip | |
iwlwifi: HW bug fixes
This patch adds few HW bug fixes.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 5358420d8796..e1d11c9b6729 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3920,7 +3920,7 @@ done: if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { struct ieee80211_if_sta *ifsta = &sdata->u.sta; if (!(ifsta->flags & IEEE80211_STA_BSSID_SET) || - (!ifsta->state == IEEE80211_IBSS_JOINED && + (!(ifsta->state == IEEE80211_IBSS_JOINED) && !ieee80211_sta_active_ibss(dev))) ieee80211_sta_find_ibss(dev, ifsta); } |