1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 0675a2fec6a6..2913113c5833 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -109,8 +109,10 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata,
        /* Disallow HT40+/- mismatch */
        if (ie->ht_operation &&
-            local->_oper_channel_type > NL80211_CHAN_HT20 &&
+            (local->_oper_channel_type == NL80211_CHAN_HT40MINUS ||
-            sta_channel_type > NL80211_CHAN_HT20 &&
+            local->_oper_channel_type == NL80211_CHAN_HT40PLUS) &&
+            (sta_channel_type == NL80211_CHAN_HT40MINUS ||
+             sta_channel_type == NL80211_CHAN_HT40PLUS) &&
            local->_oper_channel_type != sta_channel_type)
                goto mismatch;