From: Johannes Berg <johannes@sipsolutions.net>
Date: Sun, 17 Jan 2010 00:47:57 +0000 (+0100)
Subject: mac80211: remove useless setting of IEEE80211_TX_INTFL_DONT_ENCRYPT
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a6bae9e7ab19876a157c91019852395539e4f20e;p=deliverable%2Flinux.git

mac80211: remove useless setting of IEEE80211_TX_INTFL_DONT_ENCRYPT

There's no value in setting a flag that will
never be checked after this point, this seems
to be legacy code -- I think previously the
flag was used to check whether to encrypt the
frame or not. Now, however, the flag need not
be set, and setting it actually interferes if
the frame will be processed again later.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index a74ab797fed9..9afbee0d53c0 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -553,9 +553,6 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
 		}
 	}
 
-	if (!tx->key || !(tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))
-		info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
-
 	return TX_CONTINUE;
 }