* Replacing the Haiku with the FreeBSD copyright in the ieee80211_haiku.h file as it is basically the ieee80211_freebsd.h file. But it only contains code needed by the haiku port. As I regard to the process of adding only needed code as trivial, I sofor removode the Haiku specific copyright completely. Opinions welcome.

* Adding the complete ieee80211 channel structure as it contains alot of useful information which is hard to obtain otherwise (e.g. conversion between frequency and channel number).

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33855 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/libs/compat/freebsd_network/compat/net80211/ieee80211_haiku.h

@@ -1,6 +1,28 @@
-/*
+/*-
- * Copyright 2009 Haiku Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Sam Leffler, Errno Consulting
- * Distributed under the terms of the MIT License.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 #ifndef _FBSD_COMPAT_NET80211_IEEE80211_HAIKU_H_
 #define _FBSD_COMPAT_NET80211_IEEE80211_HAIKU_H_
@@ -11,7 +33,6 @@
 #include <sys/sysctl.h>
 #include <sys/taskqueue.h>
 
-
 /*
  * Common state locking definitions.
  */
@@ -234,7 +255,6 @@ void	ieee80211_load_module(const char *);
 typedef void (*policy##_setup)(int);					\
 SET_DECLARE(policy##_set, policy##_setup);				\
 
-// l338
 /*
  * Scanner modules provide scanning policy.
  */

src/libs/compat/freebsd_network/compat/net80211/ieee80211_ioctl.h

@@ -413,8 +413,12 @@ struct ieee80211req_sta_info {
 	uint16_t	isi_len;		/* total length (mult of 4) */
 	uint16_t	isi_ie_off;		/* offset to IE data */
 	uint16_t	isi_ie_len;		/* IE length */
+#ifdef __HAIKU__
+	struct ieee80211_channel	isi_chan;	/* Handing out the conmplete channel info */
+#else
 	uint16_t	isi_freq;		/* MHz */
 	uint32_t	isi_flags;		/* channel flags */
+#endif
 	uint32_t	isi_state;		/* state flags */
 	uint8_t		isi_authmode;		/* authentication algorithm */
 	int8_t		isi_rssi;		/* receive signal strength */
@@ -786,7 +790,12 @@ struct ieee80211req_scan_result {
 	uint16_t					isr_len;		/* total length (mult of 4) */
 	uint16_t					isr_ie_off;		/* offset to SSID+IE data */
 	uint16_t					isr_ie_len;		/* IE length */
+#ifdef __HAIKU__
 	struct ieee80211_channel	isr_chan;	/* Handing out the conmplete channel info */
+#else
+	uint16_t	isr_freq;		/* MHz */
+	uint16_t	isr_flags;		/* channel flags */
+#endif
 	int8_t						isr_noise;
 	int8_t						isr_rssi;
 	uint8_t						isr_intval;		/* beacon interval */