diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2010-01-17 01:47:57 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 16:25:17 -0500 |
| commit | a6bae9e7ab19876a157c91019852395539e4f20e (patch) | |
| tree | 221b68a7d938c40e48782a208392554812b60d75 /net/mac80211/tx.c | |
| parent | 697e6a0fb0c8783695d4b4a5d7131476b296d623 (diff) | |
| download | kernel_samsung_aries-a6bae9e7ab19876a157c91019852395539e4f20e.zip kernel_samsung_aries-a6bae9e7ab19876a157c91019852395539e4f20e.tar.gz kernel_samsung_aries-a6bae9e7ab19876a157c91019852395539e4f20e.tar.bz2 | |
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>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index a74ab79..9afbee0 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; } |