Commit d2859df5 authored by Janusz Dziedzic's avatar Janusz Dziedzic Committed by Johannes Berg
Browse files

cfg80211/mac80211: DFS setup chandef for cac event



To report channel width correctly we have
to send correct channel parameters from
mac80211 when calling cfg80211_cac_event().

This is required in case of using channel width
higher than 20MHz and we have to set correct
dfs channel state after CAC (NL80211_DFS_AVAILABLE).
Signed-off-by: default avatarJanusz Dziedzic <janusz.dziedzic@tieto.com>
Reviewed-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5282c3ba
...@@ -4150,6 +4150,7 @@ void cfg80211_radar_event(struct wiphy *wiphy, ...@@ -4150,6 +4150,7 @@ void cfg80211_radar_event(struct wiphy *wiphy,
/** /**
* cfg80211_cac_event - Channel availability check (CAC) event * cfg80211_cac_event - Channel availability check (CAC) event
* @netdev: network device * @netdev: network device
* @chandef: chandef for the current channel
* @event: type of event * @event: type of event
* @gfp: context flags * @gfp: context flags
* *
...@@ -4158,6 +4159,7 @@ void cfg80211_radar_event(struct wiphy *wiphy, ...@@ -4158,6 +4159,7 @@ void cfg80211_radar_event(struct wiphy *wiphy,
* also by full-MAC drivers. * also by full-MAC drivers.
*/ */
void cfg80211_cac_event(struct net_device *netdev, void cfg80211_cac_event(struct net_device *netdev,
const struct cfg80211_chan_def *chandef,
enum nl80211_radar_event event, gfp_t gfp); enum nl80211_radar_event event, gfp_t gfp);
......
...@@ -1050,6 +1050,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) ...@@ -1050,6 +1050,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct beacon_data *old_beacon; struct beacon_data *old_beacon;
struct probe_resp *old_probe_resp; struct probe_resp *old_probe_resp;
struct cfg80211_chan_def chandef;
old_beacon = rtnl_dereference(sdata->u.ap.beacon); old_beacon = rtnl_dereference(sdata->u.ap.beacon);
if (!old_beacon) if (!old_beacon)
...@@ -1091,8 +1092,10 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) ...@@ -1091,8 +1092,10 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED); ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
if (sdata->wdev.cac_started) { if (sdata->wdev.cac_started) {
chandef = sdata->vif.bss_conf.chandef;
cancel_delayed_work_sync(&sdata->dfs_cac_timer_work); cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_ABORTED, cfg80211_cac_event(sdata->dev, &chandef,
NL80211_RADAR_CAC_ABORTED,
GFP_KERNEL); GFP_KERNEL);
} }
......
...@@ -749,6 +749,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ...@@ -749,6 +749,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
u32 hw_reconf_flags = 0; u32 hw_reconf_flags = 0;
int i, flushed; int i, flushed;
struct ps_data *ps; struct ps_data *ps;
struct cfg80211_chan_def chandef;
clear_bit(SDATA_STATE_RUNNING, &sdata->state); clear_bit(SDATA_STATE_RUNNING, &sdata->state);
...@@ -823,11 +824,13 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ...@@ -823,11 +824,13 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
cancel_delayed_work_sync(&sdata->dfs_cac_timer_work); cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
if (sdata->wdev.cac_started) { if (sdata->wdev.cac_started) {
chandef = sdata->vif.bss_conf.chandef;
WARN_ON(local->suspended); WARN_ON(local->suspended);
mutex_lock(&local->iflist_mtx); mutex_lock(&local->iflist_mtx);
ieee80211_vif_release_channel(sdata); ieee80211_vif_release_channel(sdata);
mutex_unlock(&local->iflist_mtx); mutex_unlock(&local->iflist_mtx);
cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_ABORTED, cfg80211_cac_event(sdata->dev, &chandef,
NL80211_RADAR_CAC_ABORTED,
GFP_KERNEL); GFP_KERNEL);
} }
......
...@@ -1398,10 +1398,12 @@ void ieee80211_dfs_cac_timer_work(struct work_struct *work) ...@@ -1398,10 +1398,12 @@ void ieee80211_dfs_cac_timer_work(struct work_struct *work)
struct ieee80211_sub_if_data *sdata = struct ieee80211_sub_if_data *sdata =
container_of(delayed_work, struct ieee80211_sub_if_data, container_of(delayed_work, struct ieee80211_sub_if_data,
dfs_cac_timer_work); dfs_cac_timer_work);
struct cfg80211_chan_def chandef = sdata->vif.bss_conf.chandef;
ieee80211_vif_release_channel(sdata); ieee80211_vif_release_channel(sdata);
cfg80211_cac_event(sdata->dev, &chandef,
cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_FINISHED, GFP_KERNEL); NL80211_RADAR_CAC_FINISHED,
GFP_KERNEL);
} }
/* MLME */ /* MLME */
......
...@@ -2259,14 +2259,17 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, ...@@ -2259,14 +2259,17 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
void ieee80211_dfs_cac_cancel(struct ieee80211_local *local) void ieee80211_dfs_cac_cancel(struct ieee80211_local *local)
{ {
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
struct cfg80211_chan_def chandef;
mutex_lock(&local->iflist_mtx); mutex_lock(&local->iflist_mtx);
list_for_each_entry(sdata, &local->interfaces, list) { list_for_each_entry(sdata, &local->interfaces, list) {
cancel_delayed_work_sync(&sdata->dfs_cac_timer_work); cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
if (sdata->wdev.cac_started) { if (sdata->wdev.cac_started) {
chandef = sdata->vif.bss_conf.chandef;
ieee80211_vif_release_channel(sdata); ieee80211_vif_release_channel(sdata);
cfg80211_cac_event(sdata->dev, cfg80211_cac_event(sdata->dev,
&chandef,
NL80211_RADAR_CAC_ABORTED, NL80211_RADAR_CAC_ABORTED,
GFP_KERNEL); GFP_KERNEL);
} }
......
...@@ -763,12 +763,12 @@ void cfg80211_radar_event(struct wiphy *wiphy, ...@@ -763,12 +763,12 @@ void cfg80211_radar_event(struct wiphy *wiphy,
EXPORT_SYMBOL(cfg80211_radar_event); EXPORT_SYMBOL(cfg80211_radar_event);
void cfg80211_cac_event(struct net_device *netdev, void cfg80211_cac_event(struct net_device *netdev,
const struct cfg80211_chan_def *chandef,
enum nl80211_radar_event event, gfp_t gfp) enum nl80211_radar_event event, gfp_t gfp)
{ {
struct wireless_dev *wdev = netdev->ieee80211_ptr; struct wireless_dev *wdev = netdev->ieee80211_ptr;
struct wiphy *wiphy = wdev->wiphy; struct wiphy *wiphy = wdev->wiphy;
struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy); struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
struct cfg80211_chan_def chandef;
unsigned long timeout; unsigned long timeout;
trace_cfg80211_cac_event(netdev, event); trace_cfg80211_cac_event(netdev, event);
...@@ -779,14 +779,12 @@ void cfg80211_cac_event(struct net_device *netdev, ...@@ -779,14 +779,12 @@ void cfg80211_cac_event(struct net_device *netdev,
if (WARN_ON(!wdev->channel)) if (WARN_ON(!wdev->channel))
return; return;
cfg80211_chandef_create(&chandef, wdev->channel, NL80211_CHAN_NO_HT);
switch (event) { switch (event) {
case NL80211_RADAR_CAC_FINISHED: case NL80211_RADAR_CAC_FINISHED:
timeout = wdev->cac_start_time + timeout = wdev->cac_start_time +
msecs_to_jiffies(IEEE80211_DFS_MIN_CAC_TIME_MS); msecs_to_jiffies(IEEE80211_DFS_MIN_CAC_TIME_MS);
WARN_ON(!time_after_eq(jiffies, timeout)); WARN_ON(!time_after_eq(jiffies, timeout));
cfg80211_set_dfs_state(wiphy, &chandef, NL80211_DFS_AVAILABLE); cfg80211_set_dfs_state(wiphy, chandef, NL80211_DFS_AVAILABLE);
break; break;
case NL80211_RADAR_CAC_ABORTED: case NL80211_RADAR_CAC_ABORTED:
break; break;
...@@ -796,6 +794,6 @@ void cfg80211_cac_event(struct net_device *netdev, ...@@ -796,6 +794,6 @@ void cfg80211_cac_event(struct net_device *netdev,
} }
wdev->cac_started = false; wdev->cac_started = false;
nl80211_radar_notify(rdev, &chandef, event, netdev, gfp); nl80211_radar_notify(rdev, chandef, event, netdev, gfp);
} }
EXPORT_SYMBOL(cfg80211_cac_event); EXPORT_SYMBOL(cfg80211_cac_event);
...@@ -2168,7 +2168,7 @@ static inline u64 wdev_id(struct wireless_dev *wdev) ...@@ -2168,7 +2168,7 @@ static inline u64 wdev_id(struct wireless_dev *wdev)
} }
static int nl80211_send_chandef(struct sk_buff *msg, static int nl80211_send_chandef(struct sk_buff *msg,
struct cfg80211_chan_def *chandef) const struct cfg80211_chan_def *chandef)
{ {
WARN_ON(!cfg80211_chandef_valid(chandef)); WARN_ON(!cfg80211_chandef_valid(chandef));
...@@ -10874,7 +10874,7 @@ EXPORT_SYMBOL(cfg80211_cqm_txe_notify); ...@@ -10874,7 +10874,7 @@ EXPORT_SYMBOL(cfg80211_cqm_txe_notify);
void void
nl80211_radar_notify(struct cfg80211_registered_device *rdev, nl80211_radar_notify(struct cfg80211_registered_device *rdev,
struct cfg80211_chan_def *chandef, const struct cfg80211_chan_def *chandef,
enum nl80211_radar_event event, enum nl80211_radar_event event,
struct net_device *netdev, gfp_t gfp) struct net_device *netdev, gfp_t gfp)
{ {
......
...@@ -70,7 +70,7 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev, ...@@ -70,7 +70,7 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev,
void void
nl80211_radar_notify(struct cfg80211_registered_device *rdev, nl80211_radar_notify(struct cfg80211_registered_device *rdev,
struct cfg80211_chan_def *chandef, const struct cfg80211_chan_def *chandef,
enum nl80211_radar_event event, enum nl80211_radar_event event,
struct net_device *netdev, gfp_t gfp); struct net_device *netdev, gfp_t gfp);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment