diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-12-03 11:29:21 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-12-05 09:35:57 -0500 |
commit | 1c02667db5eae801b8fc279fdfa618164c0efb6e (patch) | |
tree | f1fd2727869cf45557c88ef419019c4e27fc1cd6 /drivers | |
parent | 4c7f0bc266ccccfb0ca397405af13ee3d9e0f6b2 (diff) |
rt2x00: Fix check for BSS info changes
Fix ERP configuration, due to a too strict changes
flags checking we never updated the short slot time
or basic rate mask when no other changes were made
at the same time.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index fa91ca5cd0e2..dded68071007 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -634,7 +634,7 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, | |||
634 | * When the erp information has changed, we should perform | 634 | * When the erp information has changed, we should perform |
635 | * additional configuration steps. For all other changes we are done. | 635 | * additional configuration steps. For all other changes we are done. |
636 | */ | 636 | */ |
637 | if (changes & (BSS_CHANGED_ERP_PREAMBLE | BSS_CHANGED_ERP_CTS_PROT)) { | 637 | if (changes & ~(BSS_CHANGED_ASSOC | BSS_CHANGED_HT)) { |
638 | if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags)) | 638 | if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags)) |
639 | rt2x00lib_config_erp(rt2x00dev, intf, bss_conf); | 639 | rt2x00lib_config_erp(rt2x00dev, intf, bss_conf); |
640 | else | 640 | else |