Fix driver_bsd.c build for FreeBSD

diff --git a/hostapd/driver_bsd.c b/hostapd/driver_bsd.c
index 920dea0..134894e 100644 (file)
--- a/hostapd/driver_bsd.c
+++ b/hostapd/driver_bsd.c
@@ -504,7 +504,7 @@ bsd_new_sta(struct bsd_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN])
 {
        struct hostapd_data *hapd = drv->hapd;
        struct ieee80211req_wpaie ie;
-       int new_assoc, ielen = 0, res;
+       int ielen = 0;
        u8 *iebuf = NULL;
 
        /*
@@ -523,6 +523,7 @@ bsd_new_sta(struct bsd_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN])
        else
                ielen += 2;
 
+no_ie:
        return hostapd_notif_assoc(hapd, addr, iebuf, ielen);
 }
 
@@ -566,7 +567,7 @@ bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
                        break;
                case RTM_IEEE80211_LEAVE:
                        leave = (struct ieee80211_leave_event *) &ifan[1];
-                       hostapd_notif_disassoc(drv, leave->iev_addr);
+                       hostapd_notif_disassoc(drv->hapd, leave->iev_addr);
                        break;
                case RTM_IEEE80211_JOIN:
 #ifdef RTM_IEEE80211_REJOIN

diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 7debba4..6df3612 100644 (file)
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -177,7 +177,7 @@ wpa_driver_bsd_get_ssid(void *priv, u8 *ssid)
 }
 
 static int
-wpa_driver_bsd_set_ssid(void *priv, const char *ssid,
+wpa_driver_bsd_set_ssid(void *priv, const u8 *ssid,
                             size_t ssid_len)
 {
        struct wpa_driver_bsd_data *drv = priv;
@@ -187,7 +187,7 @@ wpa_driver_bsd_set_ssid(void *priv, const char *ssid,
 
 static int
 wpa_driver_bsd_set_wpa_ie(struct wpa_driver_bsd_data *drv,
-       const char *wpa_ie, size_t wpa_ie_len)
+       const u8 *wpa_ie, size_t wpa_ie_len)
 {
        return set80211var(drv, IEEE80211_IOC_OPTIE, wpa_ie, wpa_ie_len);
 }