aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-08-12 15:37:29 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:27:55 -0400
commitac4c977d16d843f12901595c91773dddb65768a9 (patch)
tree81fdd35a49a82b810a5e42c22e49e9952930aec1 /net
parentcfg80211: mark ieee80211_hdrlen const (diff)
downloadlinux-dev-ac4c977d16d843f12901595c91773dddb65768a9.tar.xz
linux-dev-ac4c977d16d843f12901595c91773dddb65768a9.zip
mac80211: remove unused don't-encrypt flag
When MFP is disabled, action frames will not be encrypted since they are management frames and the only management frames that can then be encrypted are authentication frames. Therefore, setting the don't-encrypt flag on action frames is unnecessary. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/cfg.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 9a35d9e7efd7..f9a317766136 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1555,8 +1555,6 @@ static int ieee80211_action(struct wiphy *wiphy, struct net_device *dev,
return -ENOLINK;
break;
case NL80211_IFTYPE_STATION:
- if (!(sdata->u.mgd.flags & IEEE80211_STA_MFP_ENABLED))
- flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
break;
default:
return -EOPNOTSUPP;