mac80211: restructure key selection

The "no key" case in key selection that decides
whether to drop the frame or not is impossible
to understand, restructure the code.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
[cavallar@lri.fr: removed blank line and restructured action frame clause]
Signed-off-by: Nicolas Cavallari <cavallar@lri.fr>

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index c9d2175d15c1037a66af3086a37232f57b0f9b3e..a79fd868566d7d162e73b62d70cfa2a31ef3ecde 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -523,7 +523,7 @@ ieee80211_tx_h_check_control_port_protocol(struct ieee80211_tx_data *tx)
 static ieee80211_tx_result debug_noinline
 ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
 {
-       struct ieee80211_key *key = NULL;
+       struct ieee80211_key *key;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
 
@@ -542,16 +542,20 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
        else if (!is_multicast_ether_addr(hdr->addr1) &&
                 (key = rcu_dereference(tx->sdata->default_unicast_key)))
                tx->key = key;
-       else if (tx->sdata->drop_unencrypted &&
-                (tx->skb->protocol != tx->sdata->control_port_protocol) &&
-                !(info->flags & IEEE80211_TX_CTL_INJECTED) &&
-                (!ieee80211_is_robust_mgmt_frame(hdr) ||
-                 (ieee80211_is_action(hdr->frame_control) &&
-                  tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP)))) {
+       else if (info->flags & IEEE80211_TX_CTL_INJECTED)
+               tx->key = NULL;
+       else if (!tx->sdata->drop_unencrypted)
+               tx->key = NULL;
+       else if (tx->skb->protocol == tx->sdata->control_port_protocol)
+               tx->key = NULL;
+       else if (ieee80211_is_robust_mgmt_frame(hdr) &&
+                !(ieee80211_is_action(hdr->frame_control) &&
+                  tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP)))
+               tx->key = NULL;
+       else {
                I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
                return TX_DROP;
-       } else
-               tx->key = NULL;
+       }
 
        if (tx->key) {
                bool skip_hw = false;