Skip to content

Commit

Permalink
wifi: nl80211: fix nl80211_start_radar_detection return value
Browse files Browse the repository at this point in the history
Since the wiphy_guard changes, rdev_start_radar_detection's return value
in nl80211_start_radar_detection is ignored and we always returned 0.

Fixes: f42d22d ("wifi: cfg80211: define and use wiphy guard")
Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
Link: https://patch.msgid.link/20250109161040.325742-1-nico.escande@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Nicolas Escande authored and Johannes Berg committed Jan 13, 2025
1 parent 9add053 commit 2215914
Showing 1 changed file with 19 additions and 18 deletions.
37 changes: 19 additions & 18 deletions net/wireless/nl80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -10159,25 +10159,26 @@ static int nl80211_start_radar_detection(struct sk_buff *skb,

err = rdev_start_radar_detection(rdev, dev, &chandef, cac_time_ms,
link_id);
if (!err) {
switch (wdev->iftype) {
case NL80211_IFTYPE_AP:
case NL80211_IFTYPE_P2P_GO:
wdev->links[0].ap.chandef = chandef;
break;
case NL80211_IFTYPE_ADHOC:
wdev->u.ibss.chandef = chandef;
break;
case NL80211_IFTYPE_MESH_POINT:
wdev->u.mesh.chandef = chandef;
break;
default:
break;
}
wdev->links[link_id].cac_started = true;
wdev->links[link_id].cac_start_time = jiffies;
wdev->links[link_id].cac_time_ms = cac_time_ms;
if (err)
return err;

switch (wdev->iftype) {
case NL80211_IFTYPE_AP:
case NL80211_IFTYPE_P2P_GO:
wdev->links[0].ap.chandef = chandef;
break;
case NL80211_IFTYPE_ADHOC:
wdev->u.ibss.chandef = chandef;
break;
case NL80211_IFTYPE_MESH_POINT:
wdev->u.mesh.chandef = chandef;
break;
default:
break;
}
wdev->links[link_id].cac_started = true;
wdev->links[link_id].cac_start_time = jiffies;
wdev->links[link_id].cac_time_ms = cac_time_ms;

return 0;
}
Expand Down

0 comments on commit 2215914

Please sign in to comment.