---

yaml --- r: 183845 b: refs/heads/master c: a6bae9e h: refs/heads/master i: 183843: 30ff0cf v: v3
git-mirror · Jan 19, 2010 · 6388327 · 6388327
1 parent b3c9425
commit 6388327
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 697e6a0fb0c8783695d4b4a5d7131476b296d623
+refs/heads/master: a6bae9e7ab19876a157c91019852395539e4f20e
diff --git a/trunk/net/mac80211/tx.c b/trunk/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;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
     }
@@ Expand Down @@