git.openwrt.org Git - openwrt/staging/nbd.git/blob

   1 From: Aditya Kumar Singh <quic_adisi@quicinc.com>
   2 Date: Fri, 6 Sep 2024 12:14:20 +0530
   3 Subject: [PATCH] wifi: mac80211: remove label usage in
   4  ieee80211_start_radar_detection()
   5
   6 After locks rework [1], ieee80211_start_radar_detection() function is no
   7 longer acquiring any lock as such explicitly. Hence, it is not unlocking
   8 anything as well. However, label "out_unlock" is still used which creates
   9 confusion. Also, now there is no need of goto label as such.
  10
  11 Get rid of the goto logic and use direct return statements.
  12
  13 [1]: https://lore.kernel.org/all/20230828135928.b1c6efffe9ad.I4aec875e25abc9ef0b5ad1e70b5747fd483fbd3c@changeid/
  14
  15 Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
  16 Link: https://patch.msgid.link/20240906064426.2101315-3-quic_adisi@quicinc.com
  17 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  18 ---
  19
  20 --- a/net/mac80211/cfg.c
  21 +++ b/net/mac80211/cfg.c
  22 @@ -3468,10 +3468,8 @@ static int ieee80211_start_radar_detecti
  23
  24         lockdep_assert_wiphy(local->hw.wiphy);
  25
  26 -       if (!list_empty(&local->roc_list) || local->scanning) {
  27 -               err = -EBUSY;
  28 -               goto out_unlock;
  29 -       }
  30 +       if (!list_empty(&local->roc_list) || local->scanning)
  31 +               return -EBUSY;
  32
  33         /* whatever, but channel contexts should not complain about that one */
  34         sdata->deflink.smps_mode = IEEE80211_SMPS_OFF;
  35 @@ -3480,13 +3478,12 @@ static int ieee80211_start_radar_detecti
  36         err = ieee80211_link_use_channel(&sdata->deflink, &chanreq,
  37                                          IEEE80211_CHANCTX_SHARED);
  38         if (err)
  39 -               goto out_unlock;
  40 +               return err;
  41
  42         wiphy_delayed_work_queue(wiphy, &sdata->deflink.dfs_cac_timer_work,
  43                                  msecs_to_jiffies(cac_time_ms));
  44
  45 - out_unlock:
  46 -       return err;
  47 +       return 0;
  48  }
  49
  50  static void ieee80211_end_cac(struct wiphy *wiphy,