diff options
Diffstat (limited to 'net/wireless/chan.c')
-rw-r--r-- | net/wireless/chan.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 72d81e2154d5..85506f1d0789 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c | |||
@@ -115,7 +115,7 @@ bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) | |||
115 | EXPORT_SYMBOL(cfg80211_chandef_valid); | 115 | EXPORT_SYMBOL(cfg80211_chandef_valid); |
116 | 116 | ||
117 | static void chandef_primary_freqs(const struct cfg80211_chan_def *c, | 117 | static void chandef_primary_freqs(const struct cfg80211_chan_def *c, |
118 | int *pri40, int *pri80) | 118 | u32 *pri40, u32 *pri80) |
119 | { | 119 | { |
120 | int tmp; | 120 | int tmp; |
121 | 121 | ||
@@ -366,6 +366,7 @@ int cfg80211_chandef_dfs_required(struct wiphy *wiphy, | |||
366 | 366 | ||
367 | break; | 367 | break; |
368 | case NL80211_IFTYPE_STATION: | 368 | case NL80211_IFTYPE_STATION: |
369 | case NL80211_IFTYPE_OCB: | ||
369 | case NL80211_IFTYPE_P2P_CLIENT: | 370 | case NL80211_IFTYPE_P2P_CLIENT: |
370 | case NL80211_IFTYPE_MONITOR: | 371 | case NL80211_IFTYPE_MONITOR: |
371 | case NL80211_IFTYPE_AP_VLAN: | 372 | case NL80211_IFTYPE_AP_VLAN: |
@@ -892,6 +893,13 @@ cfg80211_get_chan_state(struct wireless_dev *wdev, | |||
892 | *radar_detect |= BIT(wdev->chandef.width); | 893 | *radar_detect |= BIT(wdev->chandef.width); |
893 | } | 894 | } |
894 | return; | 895 | return; |
896 | case NL80211_IFTYPE_OCB: | ||
897 | if (wdev->chandef.chan) { | ||
898 | *chan = wdev->chandef.chan; | ||
899 | *chanmode = CHAN_MODE_SHARED; | ||
900 | return; | ||
901 | } | ||
902 | break; | ||
895 | case NL80211_IFTYPE_MONITOR: | 903 | case NL80211_IFTYPE_MONITOR: |
896 | case NL80211_IFTYPE_AP_VLAN: | 904 | case NL80211_IFTYPE_AP_VLAN: |
897 | case NL80211_IFTYPE_WDS: | 905 | case NL80211_IFTYPE_WDS: |