mac80211: remove unused don't-encrypt flag
authorJohannes Berg <johannes.berg@intel.com>
Thu, 12 Aug 2010 13:37:29 +0000 (15:37 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 24 Aug 2010 20:27:55 +0000 (16:27 -0400)
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>
net/mac80211/cfg.c

index 9a35d9e7efd74e0575fe37fc3297883848a10069..f9a3177661366057225b9fbb525c89029c10aa86 100644 (file)
@@ -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;