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
This commit is contained in:
@@ -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;
|
||||
|
@@ -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)
|
||||
|
Fai riferimento in un nuovo problema
Block a user