diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-08-12 09:37:29 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-24 16:27:55 -0400 |
commit | ac4c977d16d843f12901595c91773dddb65768a9 (patch) | |
tree | 81fdd35a49a82b810a5e42c22e49e9952930aec1 /net/mac80211 | |
parent | 633adf1ad1c92c02bd3f10bbd73737a969179378 (diff) |
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/mac80211')
-rw-r--r-- | net/mac80211/cfg.c | 2 |
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, | |||
1555 | return -ENOLINK; | 1555 | return -ENOLINK; |
1556 | break; | 1556 | break; |
1557 | case NL80211_IFTYPE_STATION: | 1557 | case NL80211_IFTYPE_STATION: |
1558 | if (!(sdata->u.mgd.flags & IEEE80211_STA_MFP_ENABLED)) | ||
1559 | flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT; | ||
1560 | break; | 1558 | break; |
1561 | default: | 1559 | default: |
1562 | return -EOPNOTSUPP; | 1560 | return -EOPNOTSUPP; |