From: Luciano Coelho <luciano.coelho@intel.com>
Date: Wed, 30 Jul 2014 12:04:08 +0000 (+0300)
Subject: iwlwifi: mvm: set MAC_FILTER_IN_BEACON correctly for STA/P2P client
X-Git-Tag: fixes-for-v3.18-merge-window~87^2~35^2~1^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c8b3bc688bdcfd7789efbd17da4d85b104ad351;p=pandora-kernel.git

iwlwifi: mvm: set MAC_FILTER_IN_BEACON correctly for STA/P2P client

In commit cad3f08c (iwlwifi: mvm: enable MAC_FILTER_IN_BEACON when
forced_assoc_off is set) the code to set the MAC_FILTER_IN_BEACON flag
was accidentally moved to the main block of the if statement, while it
should be in the else block instead.  Move it to the right place.

Fixes: cad3f08c23de ("iwlwifi: mvm: enable MAC_FILTER_IN_BEACON when forced_assoc_off is set")
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---

Reading git-diff-tree failed