i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freebsd_network: Drop the scan_done_sem.

Browse Source 
It's not used anymore. Thanks to madmax for noticing!
This commit is contained in:
Augustin Cavalier
2026-06-10 11:57:17 -04:00
parent 7288df8b9c
commit dd5feaa4a6
4 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd_network/compat/net/if_var.h
-3
View File
@@ -295,9 +295,6 @@ struct ifnet {
sem_id link_state_sem; sem_id link_state_sem;
int32 open_count; int32 open_count;
int32 flags; int32 flags;
/* WLAN specific additions */
sem_id scan_done_sem;
}; };
typedef void if_init_f_t(void *); typedef void if_init_f_t(void *);
src/libs/compat/freebsd_network/if.c
-3
View File
@@ -167,9 +167,6 @@ if_alloc_inplace(struct ifnet *ifp, u_char type)
ifp->if_type = type; ifp->if_type = type;
ifq_init(&ifp->receive_queue, semName); ifq_init(&ifp->receive_queue, semName);
ifp->scan_done_sem = -1;
// WLAN specific, doesn't hurt when initialized for other devices
// Search for the first free device slot, and use that one // Search for the first free device slot, and use that one
IFNET_WLOCK(); IFNET_WLOCK();
if (ifindex_alloc_locked(&index) != ENOERR) { if (ifindex_alloc_locked(&index) != ENOERR) {
src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.cpp
+1 -8
View File
@@ -165,8 +165,6 @@ start_wlan(device_t device)
KASSERT(gDevices[gDeviceCount - 1] == vap->iv_ifp, KASSERT(gDevices[gDeviceCount - 1] == vap->iv_ifp,
("start_wlan: gDevices[i] != vap->iv_ifp")); ("start_wlan: gDevices[i] != vap->iv_ifp"));
vap->iv_ifp->scan_done_sem = create_sem(0, "wlan scan done");
// We aren't connected to a WLAN, yet. // We aren't connected to a WLAN, yet.
if_link_state_change(vap->iv_ifp, LINK_STATE_DOWN); if_link_state_change(vap->iv_ifp, LINK_STATE_DOWN);
@@ -184,8 +182,6 @@ stop_wlan(device_t device)
if (ifp == NULL) if (ifp == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
delete_sem(ifp->scan_done_sem);
struct ieee80211vap* vap = (ieee80211vap*)ifp->if_softc; struct ieee80211vap* vap = (ieee80211vap*)ifp->if_softc;
struct ieee80211com* ic = vap->iv_ic; struct ieee80211com* ic = vap->iv_ic;
@@ -222,7 +218,7 @@ wlan_close(void* cookie)
ifp->if_flags &= ~IFF_UP; ifp->if_flags &= ~IFF_UP;
ifp->if_ioctl(ifp, SIOCSIFFLAGS, NULL); ifp->if_ioctl(ifp, SIOCSIFFLAGS, NULL);
return release_sem_etc(ifp->scan_done_sem, 1, B_RELEASE_ALL); return B_OK;
} }
@@ -902,9 +898,6 @@ ieee80211_notify_node_leave(struct ieee80211_node* ni)
void void
ieee80211_notify_scan_done(struct ieee80211vap* vap) ieee80211_notify_scan_done(struct ieee80211vap* vap)
{ {
release_sem_etc(vap->iv_ifp->scan_done_sem, 1,
B_DO_NOT_RESCHEDULE | B_RELEASE_ALL);
TRACE("%s\n", __FUNCTION__); TRACE("%s\n", __FUNCTION__);
if (sNotificationModule != NULL) { if (sNotificationModule != NULL) {
src/libs/compat/openbsd_wlan/net80211/ieee80211_haiku.cpp
-3
View File
@@ -493,9 +493,6 @@ ieee80211_rtm_80211info_task(void* arg)
void void
ieee80211_notify_scan_done(struct ieee80211vap* vap) ieee80211_notify_scan_done(struct ieee80211vap* vap)
{ {
release_sem_etc(vap->iv_ifp->scan_done_sem, 1,
B_DO_NOT_RESCHEDULE | B_RELEASE_ALL);
TRACE("%s\n", __FUNCTION__); TRACE("%s\n", __FUNCTION__);
if (sNotificationModule != NULL) { if (sNotificationModule != NULL) {