From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 12 Aug 2010 13:37:29 +0000 (+0200)
Subject: mac80211: remove unused don't-encrypt flag
X-Git-Tag: v3.12-rc1~8399^2~679^2~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac4c977d16d843f12901595c91773dddb65768a9;p=kernel%2Fkernel-generic.git

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>
---

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;