Merge 4.4.160 into android-4.4-p

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / net / mac80211 / ibss.c

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index f2af196..0a35dd6 100644 (file)
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -427,7 +427,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
        case NL80211_CHAN_WIDTH_5:
        case NL80211_CHAN_WIDTH_10:
                cfg80211_chandef_create(&chandef, cbss->channel,
-                                       NL80211_CHAN_WIDTH_20_NOHT);
+                                       NL80211_CHAN_NO_HT);
                chandef.width = sdata->u.ibss.chandef.width;
                break;
        case NL80211_CHAN_WIDTH_80:
@@ -438,7 +438,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
        default:
                /* fall back to 20 MHz for unsupported modes */
                cfg80211_chandef_create(&chandef, cbss->channel,
-                                       NL80211_CHAN_WIDTH_20_NOHT);
+                                       NL80211_CHAN_NO_HT);
                break;
        }