summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/p54/fwio.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-04-22 15:40:58 +0300
committerJohannes Berg <johannes.berg@intel.com>2015-04-24 12:14:13 +0300
commitdf1404650ccbfeb76a84f301f22316be0d00a864 (patch)
tree3c866bf75c99dd402b4e152bdeefaa209f38eb8d /drivers/net/wireless/p54/fwio.c
parentebd82b39bf11b38b0b50919c8d4386706b26bff7 (diff)
downloadlinux-df1404650ccbfeb76a84f301f22316be0d00a864.tar.xz
mac80211: remove support for IFF_PROMISC
This support is essentially useless as typically networks are encrypted, frames will be filtered by hardware, and rate scaling will be done with the intended recipient in mind. For real monitoring of the network, the monitor mode support should be used instead. Removing it removes a lot of corner cases. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/p54/fwio.c')
-rw-r--r--drivers/net/wireless/p54/fwio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 275408eaf95e..257a9eadd595 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -351,8 +351,7 @@ int p54_setup_mac(struct p54_common *priv)
* "TRANSPARENT and PROMISCUOUS are mutually exclusive"
* STSW45X0C LMAC API - page 12
*/
- if (((priv->filter_flags & FIF_PROMISC_IN_BSS) ||
- (priv->filter_flags & FIF_OTHER_BSS)) &&
+ if (priv->filter_flags & FIF_OTHER_BSS &&
(mode != P54_FILTER_TYPE_PROMISCUOUS))
mode |= P54_FILTER_TYPE_TRANSPARENT;
} else {