diff options
| author | Chun-Yeow Yeoh <yeohchunyeow@gmail.com> | 2013-12-02 12:05:49 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-04 12:12:10 +0400 |
| commit | 33dde2bfe8ca97bdd8253bc0496482b048fa0b32 (patch) | |
| tree | be7aa2dca5822741d0e81b796f500c5e21cde96b /net/wireless/mesh.c | |
| parent | ad7e718c9b4f717823fd920a0103f7b0fb06183f (diff) | |
| download | linux-33dde2bfe8ca97bdd8253bc0496482b048fa0b32.tar.xz | |
nl80211: allow the use of DFS channel in mesh
This permits the use of DFS channel once the CAC is conducted and
no radar is detected.
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/mesh.c')
| -rw-r--r-- | net/wireless/mesh.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c index b0e1869de7de..9c7a11ae7936 100644 --- a/net/wireless/mesh.c +++ b/net/wireless/mesh.c @@ -99,6 +99,7 @@ int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev, const struct mesh_config *conf) { struct wireless_dev *wdev = dev->ieee80211_ptr; + u8 radar_detect_width = 0; int err; BUILD_BUG_ON(IEEE80211_MAX_SSID_LEN != IEEE80211_MAX_MESH_ID_LEN); @@ -177,8 +178,16 @@ int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev, if (!cfg80211_reg_can_beacon(&rdev->wiphy, &setup->chandef)) return -EINVAL; - err = cfg80211_can_use_chan(rdev, wdev, setup->chandef.chan, - CHAN_MODE_SHARED); + err = cfg80211_chandef_dfs_required(wdev->wiphy, &setup->chandef); + if (err < 0) + return err; + if (err) + radar_detect_width = BIT(setup->chandef.width); + + err = cfg80211_can_use_iftype_chan(rdev, wdev, wdev->iftype, + setup->chandef.chan, + CHAN_MODE_SHARED, + radar_detect_width); if (err) return err; |