From: Johannes Berg Date: Tue, 26 Aug 2014 12:25:46 +0000 (+0200) Subject: iwlwifi: mvm: correctly handle PM/QoS changes from mac80211 X-Git-Tag: fixes-for-v3.18-merge-window~87^2~35^2~1^2~6 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bc10d3b509cf9f55a516c1e6dd0716f5e8fefd7;p=pandora-kernel.git iwlwifi: mvm: correctly handle PM/QoS changes from mac80211 When mac80211 requests multiple BSS config changes, as for example while associating, we ignore power management and QoS changes and only apply them later. Fix that by removing the "else" and making the conditions independent. Also move it after (potential) beacon filter enablement to have that already enabled when going into power management code. Signed-off-by: Johannes Berg Signed-off-by: Emmanuel Grumbach --- Reading git-diff-tree failed