diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-09-23 16:23:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-23 16:23:46 -0700 |
| commit | 139d6065c83071d5f66cd013a274a43699f8e2c1 (patch) | |
| tree | b5f0e79e24449ff3284bc5f2f8d3aed041fda108 /net | |
| parent | Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6 (diff) | |
| parent | ath9k: Initialize txgain and rxgain for newer AR9287 chipsets. (diff) | |
| download | linux-dev-139d6065c83071d5f66cd013a274a43699f8e2c1.tar.xz linux-dev-139d6065c83071d5f66cd013a274a43699f8e2c1.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-rx.c
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/scan.c | 4 | ||||
| -rw-r--r-- | net/wireless/wext-sme.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 039901109fa1..71e10cabf811 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -90,8 +90,8 @@ ieee80211_bss_info_update(struct ieee80211_local *local, bss->dtim_period = tim_ie->dtim_period; } - /* set default value for buggy APs */ - if (!elems->tim || bss->dtim_period == 0) + /* set default value for buggy AP/no TIM element */ + if (bss->dtim_period == 0) bss->dtim_period = 1; bss->supp_rates_len = 0; diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c index d16cd9ea4d00..bf725275eb8d 100644 --- a/net/wireless/wext-sme.c +++ b/net/wireless/wext-sme.c @@ -26,11 +26,11 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev, wdev->wext.connect.ie = wdev->wext.ie; wdev->wext.connect.ie_len = wdev->wext.ie_len; - wdev->wext.connect.privacy = wdev->wext.default_key != -1; if (wdev->wext.keys) { wdev->wext.keys->def = wdev->wext.default_key; wdev->wext.keys->defmgmt = wdev->wext.default_mgmt_key; + wdev->wext.connect.privacy = true; } if (!wdev->wext.connect.ssid_len) |