Commit-ID: ac4c977d16d843f12901595c91773dddb65768a9 Gitweb: http://git.kernel.org/tip/ac4c977d16d843f12901595c91773dddb65768a9 Author: Johannes Berg <johannes.berg@xxxxxxxxx> AuthorDate: Thu, 12 Aug 2010 15:37:29 +0200 Committer: John W. Linville <linville@xxxxxxxxxxxxx> CommitDate: Tue, 24 Aug 2010 16:27:55 -0400 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@xxxxxxxxx> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> --- 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 9a35d9e..f9a3177 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; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|