cfg80211: change netdev registration/unregistration semantics

torvalds/linux@2fe8ef1 aircrack-ng/rtl8812au#875 (comment)
ntzb · Jun 6, 2024 · 891e3db · 891e3db
1 parent 08a0c2b
commit 891e3db
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
@@ -4956,7 +4956,7 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct ne
 	mon_wdev->iftype = NL80211_IFTYPE_MONITOR;
 	mon_ndev->ieee80211_ptr = mon_wdev;
 
-	ret = register_netdevice(mon_ndev);
+	ret = cfg80211_register_netdevice(mon_ndev);
 	if (ret)
 		goto out;
 
@@ -5110,7 +5110,7 @@ static int cfg80211_rtw_del_virtual_intf(struct wiphy *wiphy,
 		pwdev_priv = adapter_wdev_data(adapter);
 
 		if (ndev == pwdev_priv->pmon_ndev) {
-			unregister_netdevice(ndev);
+			cfg80211_unregister_netdevice(ndev);
 			pwdev_priv->pmon_ndev = NULL;
 			pwdev_priv->ifname_mon[0] = '\0';
 			RTW_INFO(FUNC_NDEV_FMT" remove monitor ndev\n", FUNC_NDEV_ARG(ndev));

diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
@@ -663,7 +663,7 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
 	if (rtnl_lock_needed)
 		ret = (register_netdev(ndev) == 0) ? _SUCCESS : _FAIL;
 	else
-		ret = (register_netdevice(ndev) == 0) ? _SUCCESS : _FAIL;
+		ret = (cfg80211_register_netdevice(ndev) == 0) ? _SUCCESS : _FAIL;
 
 	if (ret == _SUCCESS)
 		adapter->registered = 1;
@@ -705,7 +705,7 @@ void rtw_os_ndev_unregister(_adapter *adapter)
 		if (rtnl_lock_needed)
 			unregister_netdev(netdev);
 		else
-			unregister_netdevice(netdev);
+			cfg80211_unregister_netdevice(netdev);
 	}
 
 	adapter->registered = 0;

diff --git a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c
@@ -98,7 +98,7 @@ static struct wireless_dev *rtw_regd_alloc_du_wdev(struct wiphy *wiphy)
 	wdev->iftype = NL80211_IFTYPE_AP;
 	ndev->ieee80211_ptr = wdev;
 
-	ret = register_netdevice(ndev);
+	ret = cfg80211_register_netdevice(ndev);
 
 out:
 	if (ret && wdev) {
@@ -125,7 +125,7 @@ void rtw_regd_free_du_wdev(struct wiphy *wiphy)
 	if (rtnl_lock_needed)
 		rtnl_lock();
 
-	unregister_netdevice(wiphy_data->du_wdev->netdev);
+	cfg80211_unregister_netdevice(wiphy_data->du_wdev->netdev);
 
 	if (rtnl_lock_needed)
 		rtnl_unlock();

diff --git a/os_dep/osdep_service_linux.c b/os_dep/osdep_service_linux.c
@@ -873,7 +873,7 @@ int rtw_change_ifname(_adapter *padapter, const char *ifname)
 	if (rtnl_lock_needed)
 		unregister_netdev(cur_pnetdev);
 	else
-		unregister_netdevice(cur_pnetdev);
+		cfg80211_unregister_netdevice(cur_pnetdev);
 
 	rereg_priv->old_pnetdev = cur_pnetdev;
 
@@ -892,7 +892,7 @@ int rtw_change_ifname(_adapter *padapter, const char *ifname)
 	if (rtnl_lock_needed)
 		ret = register_netdev(pnetdev);
 	else
-		ret = register_netdevice(pnetdev);
+		ret = cfg80211_register_netdevice(pnetdev);
 
 	if (ret != 0) {
 		goto error;