From b9dd267d353f30ab07f3152fde899a3bda9e1b15 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Sat, 23 Jan 2010 20:27:14 +0200 Subject: [PATCH] --- yaml --- r: 183885 b: refs/heads/master c: 3b43a18743421cccd33902e29016fa49b2d52dbb h: refs/heads/master i: 183883: 8d9f72ffcbdca5c09e2969ec4c85a25b1b950795 v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4209b3bc9293..ee1805b6feab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f12553ebe045a8a40ab33fa500fb57d10706e226 +refs/heads/master: 3b43a18743421cccd33902e29016fa49b2d52dbb diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index fcfa988a37a3..d017b3530d4d 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -547,9 +547,10 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx) !ieee80211_use_mfp(hdr->frame_control, tx->sta, tx->skb)) tx->key = NULL; - skip_hw = (tx->key->conf.flags & - IEEE80211_KEY_FLAG_SW_MGMT) && - ieee80211_is_mgmt(hdr->frame_control); + else + skip_hw = (tx->key->conf.flags & + IEEE80211_KEY_FLAG_SW_MGMT) && + ieee80211_is_mgmt(hdr->frame_control); break; case ALG_AES_CMAC: if (!ieee80211_is_mgmt(hdr->frame_control))