| From a4ac6f2e53e568a77a2eb3710efd99ca08634c0a Mon Sep 17 00:00:00 2001 |
| From: Matthias Kaehlcke <mka@chromium.org> |
| Date: Mon, 17 Apr 2017 13:59:53 -0700 |
| Subject: mac80211: ibss: Fix channel type enum in ieee80211_sta_join_ibss() |
| |
| From: Matthias Kaehlcke <mka@chromium.org> |
| |
| commit a4ac6f2e53e568a77a2eb3710efd99ca08634c0a upstream. |
| |
| cfg80211_chandef_create() expects an 'enum nl80211_channel_type' as |
| channel type however in ieee80211_sta_join_ibss() |
| NL80211_CHAN_WIDTH_20_NOHT is passed in two occasions, which is of |
| the enum type 'nl80211_chan_width'. Change the value to NL80211_CHAN_NO_HT |
| (20 MHz, non-HT channel) of the channel type enum. |
| |
| Signed-off-by: Matthias Kaehlcke <mka@chromium.org> |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Cc: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/mac80211/ibss.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/mac80211/ibss.c |
| +++ b/net/mac80211/ibss.c |
| @@ -427,7 +427,7 @@ static void ieee80211_sta_join_ibss(stru |
| 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: |
| @@ -439,7 +439,7 @@ static void ieee80211_sta_join_ibss(stru |
| 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; |
| } |
| |