wifi: cfg80211: fix regulatory disconnect with OCB/NAN

[ Upstream commit e8c2af660ba0790afd14d5cbc2fd05c6dc85e207 ]

Since regulatory disconnect was added, OCB and NAN interface
types were added, which made it completely unusable for any
driver that allowed OCB/NAN. Add OCB/NAN (though NAN doesn't
do anything, we don't have any info) and also remove all the
logic that opts out, so it won't be broken again if/when new
interface types are added.

Fixes: 6e0bd6c35b02 ("cfg80211: 802.11p OCB mode handling")
Fixes: cb3b7d87652a ("cfg80211: add start / stop NAN commands")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20230616222844.2794d1625a26.I8e78a3789a29e6149447b3139df724a6f1b46fc3@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 896191f..b2cb4a9 100644 (file)
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -140,17 +140,6 @@ struct regulatory_request {
  *      otherwise initiating radiation is not allowed. This will enable the
  *      relaxations enabled under the CFG80211_REG_RELAX_NO_IR configuration
  *      option
- * @REGULATORY_IGNORE_STALE_KICKOFF: the regulatory core will _not_ make sure
- *     all interfaces on this wiphy reside on allowed channels. If this flag
- *     is not set, upon a regdomain change, the interfaces are given a grace
- *     period (currently 60 seconds) to disconnect or move to an allowed
- *     channel. Interfaces on forbidden channels are forcibly disconnected.
- *     Currently these types of interfaces are supported for enforcement:
- *     NL80211_IFTYPE_ADHOC, NL80211_IFTYPE_STATION, NL80211_IFTYPE_AP,
- *     NL80211_IFTYPE_AP_VLAN, NL80211_IFTYPE_MONITOR,
- *     NL80211_IFTYPE_P2P_CLIENT, NL80211_IFTYPE_P2P_GO,
- *     NL80211_IFTYPE_P2P_DEVICE. The flag will be set by default if a device
- *     includes any modes unsupported for enforcement checking.
  * @REGULATORY_WIPHY_SELF_MANAGED: for devices that employ wiphy-specific
  *     regdom management. These devices will ignore all regdom changes not
  *     originating from their own wiphy.
@@ -177,7 +166,7 @@ enum ieee80211_regulatory_flags {
        REGULATORY_COUNTRY_IE_FOLLOW_POWER      = BIT(3),
        REGULATORY_COUNTRY_IE_IGNORE            = BIT(4),
        REGULATORY_ENABLE_RELAX_NO_IR           = BIT(5),
-       REGULATORY_IGNORE_STALE_KICKOFF         = BIT(6),
+       /* reuse bit 6 next time */
        REGULATORY_WIPHY_SELF_MANAGED           = BIT(7),
 };
 

diff --git a/net/wireless/core.c b/net/wireless/core.c
index b3ec9ea..609b79f 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -721,22 +721,6 @@ int wiphy_register(struct wiphy *wiphy)
                        return -EINVAL;
        }
 
-       /*
-        * if a wiphy has unsupported modes for regulatory channel enforcement,
-        * opt-out of enforcement checking
-        */
-       if (wiphy->interface_modes & ~(BIT(NL80211_IFTYPE_STATION) |
-                                      BIT(NL80211_IFTYPE_P2P_CLIENT) |
-                                      BIT(NL80211_IFTYPE_AP) |
-                                      BIT(NL80211_IFTYPE_MESH_POINT) |
-                                      BIT(NL80211_IFTYPE_P2P_GO) |
-                                      BIT(NL80211_IFTYPE_ADHOC) |
-                                      BIT(NL80211_IFTYPE_P2P_DEVICE) |
-                                      BIT(NL80211_IFTYPE_NAN) |
-                                      BIT(NL80211_IFTYPE_AP_VLAN) |
-                                      BIT(NL80211_IFTYPE_MONITOR)))
-               wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF;
-
        if (WARN_ON((wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) &&
                    (wiphy->regulatory_flags &
                                        (REGULATORY_CUSTOM_REG |

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 5221809..3b44fa5 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2429,9 +2429,17 @@ static bool reg_wdev_chan_valid(struct wiphy *wiphy, struct wireless_dev *wdev)
                case NL80211_IFTYPE_P2P_DEVICE:
                        /* no enforcement required */
                        break;
+               case NL80211_IFTYPE_OCB:
+                       if (!wdev->u.ocb.chandef.chan)
+                               continue;
+                       chandef = wdev->u.ocb.chandef;
+                       break;
+               case NL80211_IFTYPE_NAN:
+                       /* we have no info, but NAN is also pretty universal */
+                       continue;
                default:
                        /* others not implemented for now */
-                       WARN_ON(1);
+                       WARN_ON_ONCE(1);
                        break;
                }
 
@@ -2490,9 +2498,7 @@ static void reg_check_chans_work(struct work_struct *work)
        rtnl_lock();
 
        list_for_each_entry(rdev, &cfg80211_rdev_list, list)
-               if (!(rdev->wiphy.regulatory_flags &
-                     REGULATORY_IGNORE_STALE_KICKOFF))
-                       reg_leave_invalid_chans(&rdev->wiphy);
+               reg_leave_invalid_chans(&rdev->wiphy);
 
        rtnl_unlock();
 }