diff options
| author | Johannes Berg | 2015-03-20 11:37:36 +0100 |
|---|---|---|
| committer | Johannes Berg | 2015-03-20 11:37:36 +0100 |
| commit | e8f4fb7c7c6b25dc0495f1fd43b03444f0a5c6e3 (patch) | |
| tree | 98bd6b2bd1957a8a35ed4bd9a82db3e307e3d7de /net/mac80211/tx.c | |
| parent | mac80211: Get IV len from key conf and not cipher scheme (diff) | |
| download | kernel-qcow2-linux-e8f4fb7c7c6b25dc0495f1fd43b03444f0a5c6e3.tar.gz kernel-qcow2-linux-e8f4fb7c7c6b25dc0495f1fd43b03444f0a5c6e3.tar.xz kernel-qcow2-linux-e8f4fb7c7c6b25dc0495f1fd43b03444f0a5c6e3.zip | |
mac80211: remove drop_unencrypted code
This mechanism was historic, and only ever used by IBSS, which
also doesn't need to have it as it properly manages station's
802.1X PAE state (or, with WEP, always has a key.)
Remove the mechanism to clean up the code.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 7e7de811e6ad..0bae03bca49e 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -593,23 +593,8 @@ 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 (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(tx->skb) && - !(ieee80211_is_action(hdr->frame_control) && - tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP))) - tx->key = NULL; - else if (ieee80211_is_mgmt(hdr->frame_control) && - !ieee80211_is_robust_mgmt_frame(tx->skb)) + else tx->key = NULL; - else { - I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted); - return TX_DROP; - } if (tx->key) { bool skip_hw = false; |