From 26d28d0d1d2e258e009357b05f021b1cf74f0d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 10 May 2011 21:59:55 +0000 Subject: [PATCH] enable KASSERT in net80211 and fixes wrong uses of the macro. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41425 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.cpp | 4 ++-- src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.cpp b/src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.cpp index 1ffcdb24c8..9bc487afd4 100644 --- a/src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.cpp +++ b/src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.cpp @@ -147,7 +147,7 @@ start_wlan(device_t device) // ic_vap_create() established that gDevices[i] links to vap->iv_ifp now KASSERT(gDevices[i] == 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"); @@ -182,7 +182,7 @@ stop_wlan(device_t device) ic->ic_vap_delete(vap); // ic_vap_delete freed gDevices[i] - KASSERT(gDevices[i] == NULL, "stop_wlan: gDevices[i] != NULL"); + KASSERT(gDevices[i] == NULL, ("stop_wlan: gDevices[i] != NULL")); // assign the base device ifp again gDevices[i] = ic->ic_ifp; diff --git a/src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.h b/src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.h index ce6846afc6..c2735078f1 100644 --- a/src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.h +++ b/src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.h @@ -40,6 +40,7 @@ extern "C" { # endif +#define INVARIANTS 1 #include #include