1 files changed, 5 insertions, 3 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 0e42322aa6b1..098ae854ad3c 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -539,9 +539,11 @@ ieee80211_tx_h_check_control_port_protocol(struct ieee80211_tx_data *tx)
 {
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
 
-        if (unlikely(tx->sdata->control_port_protocol == tx->skb->protocol &&
-                     tx->sdata->control_port_no_encrypt))
-                info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
+        if (unlikely(tx->sdata->control_port_protocol == tx->skb->protocol)) {
+                if (tx->sdata->control_port_no_encrypt)
+                        info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
+                info->control.flags |= IEEE80211_TX_CTRL_PORT_CTRL_PROTO;
+        }
 
         return TX_CONTINUE;
 }