From: Masashi Honma <honma@ictec.co.jp>
Date: Sat, 13 Feb 2010 11:54:27 +0000 (+0200)
Subject: FreeBSD: Enable channel control
X-Git-Tag: hostap_0_7_2~195
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=362468d117edd3b747121e0454049585dd2306bd

FreeBSD: Enable channel control

This patch enables FreeBSD channel control.

I have tested on FreeBSD 7.2 with these cases.

[hostapd]
RSN-PSK(CCMP)/WPA-PSK(TKIP)

[wpa_supplicant(STA)]
RSN-PSK(CCMP)/WPA-PSK(TKIP)

[wpa_supplicant(AP)]
RSN-PSK(CCMP)/WPA-PSK(TKIP)
---

diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 628c929..c4327ce 100644
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -537,6 +537,7 @@ bsd_set_freq(void *priv, u16 channel)
 	struct bsd_driver_data *drv = priv;
 #ifdef SIOCS80211CHANNEL
 	struct ieee80211chanreq creq;
+#endif /* SIOCS80211CHANNEL */
 	u32 mode;
 
 	if (channel < 14)
@@ -551,15 +552,14 @@ bsd_set_freq(void *priv, u16 channel)
 		return -1;
 	}
 
+#ifdef SIOCS80211CHANNEL
 	os_memset(&creq, 0, sizeof(creq));
 	os_strlcpy(creq.i_name, drv->ifname, sizeof(creq.i_name));
 	creq.i_channel = channel;
 	return ioctl(drv->sock, SIOCS80211CHANNEL, &creq);
-#else
-	wpa_printf(MSG_ERROR, "bsd_set_freq: SIOCS80211CHANNEL not "
-		   "defined");
-	return -1;
-#endif
+#else /* SIOCS80211CHANNEL */
+	return set80211param(priv, IEEE80211_IOC_CHANNEL, channel);
+#endif /* SIOCS80211CHANNEL */
 }