[pkg-wpa-devel] r916 - in /hostapd/trunk/debian: changelog patches/20_madwifi_headers.dpatch

paravoid at users.alioth.debian.org paravoid at users.alioth.debian.org
Wed Dec 12 01:34:25 UTC 2007 

Author: paravoid
Date: Wed Dec 12 01:34:25 2007
New Revision: 916

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=916
Log:
* Update to madwifi 0.9.3.3 headers; no functional changes.

Modified:
    hostapd/trunk/debian/changelog
    hostapd/trunk/debian/patches/20_madwifi_headers.dpatch

Modified: hostapd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/changelog?rev=916&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Wed Dec 12 01:34:25 2007
@@ -7,8 +7,9 @@
   * Added Homepage field.
   * Refer to GPL-2 explicitely, as this is a GPL v2-only software.
   * Remove remnants of patches for dscape/mac80211.
-
- -- Faidon Liambotis <paravoid at debian.org>  Wed, 12 Dec 2007 03:21:58 +0200
+  * Update to madwifi 0.9.3.3 headers; no functional changes.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Wed, 12 Dec 2007 03:33:38 +0200
 
 hostapd (1:0.5.8-1) unstable; urgency=low
 

Modified: hostapd/trunk/debian/patches/20_madwifi_headers.dpatch
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/20_madwifi_headers.dpatch?rev=916&op=diff
==============================================================================
--- hostapd/trunk/debian/patches/20_madwifi_headers.dpatch (original)
+++ hostapd/trunk/debian/patches/20_madwifi_headers.dpatch Wed Dec 12 01:34:25 2007
@@ -2,13 +2,13 @@
 ## madwifi_headers.dpatch by Kel Modderman <kel at otaku42.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: MadWifi (0.9.3) headers.
+## DP: MadWifi (0.9.3.3) headers.
 
 @DPATCH@
 diff -Nrup hostapd.orig/driver_madwifi/include/compat.h hostapd/driver_madwifi/include/compat.h
---- hostapd.orig/driver_madwifi/include/compat.h	1970-01-01 10:00:00.000000000 +1000
-+++ hostapd/driver_madwifi/include/compat.h	2007-07-24 21:32:14.222289485 +1000
-@@ -0,0 +1,135 @@
+--- hostapd.orig/driver_madwifi/include/compat.h	1970-01-01 02:00:00.000000000 +0200
++++ hostapd/driver_madwifi/include/compat.h	2007-12-12 03:29:04.000000000 +0200
+@@ -0,0 +1,168 @@
 +/*-
 + * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
 + * All rights reserved.
@@ -44,7 +44,7 @@
 + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 + * THE POSSIBILITY OF SUCH DAMAGES.
 + *
-+ * $Id: compat.h 2169 2007-03-02 17:42:33Z proski $
++ * $Id: compat.h 2601 2007-07-24 14:14:47Z kelmo $
 + */
 +#ifndef _ATH_COMPAT_H_
 +#define _ATH_COMPAT_H_
@@ -141,12 +141,45 @@
 +#define __iomem
 +#endif
 +
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
++#include <linux/skbuff.h>
++static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
++{
++	return skb->end;
++}
++
++static inline unsigned char *skb_tail_pointer(const struct sk_buff *skb)
++{
++	return skb->tail;
++}
++
++static inline void skb_set_network_header(struct sk_buff *skb, const int offset)
++{
++	skb->nh.raw = skb->data + offset;
++}
++
++static inline void skb_reset_network_header(struct sk_buff *skb)
++{
++	skb->nh.raw = skb->data;
++}
++
++static inline unsigned char *skb_mac_header(const struct sk_buff *skb)
++{
++	return skb->mac.raw;
++}
++
++static inline void skb_reset_mac_header(struct sk_buff *skb)
++{
++	skb->mac.raw = skb->data;
++}
++#endif
++
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ATH_COMPAT_H_ */
 diff -Nrup hostapd.orig/driver_madwifi/net80211/ieee80211_crypto.h hostapd/driver_madwifi/net80211/ieee80211_crypto.h
---- hostapd.orig/driver_madwifi/net80211/ieee80211_crypto.h	1970-01-01 10:00:00.000000000 +1000
-+++ hostapd/driver_madwifi/net80211/ieee80211_crypto.h	2007-07-24 21:32:14.237287197 +1000
+--- hostapd.orig/driver_madwifi/net80211/ieee80211_crypto.h	1970-01-01 02:00:00.000000000 +0200
++++ hostapd/driver_madwifi/net80211/ieee80211_crypto.h	2007-12-12 03:28:38.000000000 +0200
 @@ -0,0 +1,205 @@
 +/*-
 + * Copyright (c) 2001 Atsushi Onoe
@@ -354,9 +387,9 @@
 +#endif /* defined(__KERNEL__) || defined(_KERNEL) */
 +#endif /* _NET80211_IEEE80211_CRYPTO_H_ */
 diff -Nrup hostapd.orig/driver_madwifi/net80211/_ieee80211.h hostapd/driver_madwifi/net80211/_ieee80211.h
---- hostapd.orig/driver_madwifi/net80211/_ieee80211.h	1970-01-01 10:00:00.000000000 +1000
-+++ hostapd/driver_madwifi/net80211/_ieee80211.h	2007-07-24 21:32:14.225289028 +1000
-@@ -0,0 +1,243 @@
+--- hostapd.orig/driver_madwifi/net80211/_ieee80211.h	1970-01-01 02:00:00.000000000 +0200
++++ hostapd/driver_madwifi/net80211/_ieee80211.h	2007-12-12 03:29:04.000000000 +0200
+@@ -0,0 +1,246 @@
 +/*-
 + * Copyright (c) 2001 Atsushi Onoe
 + * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -388,7 +421,7 @@
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + *
-+ * $Id: _ieee80211.h 1441 2006-02-06 16:03:21Z mrenzmann $
++ * $Id: _ieee80211.h 2749 2007-10-16 08:58:14Z kelmo $
 + */
 +#ifndef _NET80211__IEEE80211_H_
 +#define _NET80211__IEEE80211_H_
@@ -487,7 +520,8 @@
 +#define	IEEE80211_CHAN_ANY	0xffff	/* token for ``any channel'' */
 +#define	IEEE80211_CHAN_ANYC 	((struct ieee80211_channel *) IEEE80211_CHAN_ANY)
 +
-+#define	IEEE80211_RADAR_11HCOUNT	1
++#define	IEEE80211_RADAR_11HCOUNT		1
++#define IEEE80211_DEFAULT_CHANCHANGE_TBTT_COUNT	3
 +#define	IEEE80211_RADAR_TEST_MUTE_CHAN	36	/* Move to channel 36 for mute test */
 +
 +/* bits 0-3 are for private use by drivers */
@@ -583,6 +617,8 @@
 + */
 +#define	IEEE80211_RATE_SIZE	8		/* 802.11 standard */
 +#define	IEEE80211_RATE_MAXSIZE	15		/* max rates we'll handle */
++#define	IEEE80211_SANITISE_RATESIZE(_rsz) \
++	((_rsz > IEEE80211_RATE_MAXSIZE) ? IEEE80211_RATE_MAXSIZE : _rsz)
 +
 +struct ieee80211_rateset {
 +	u_int8_t rs_nrates;
@@ -601,8 +637,8 @@
 +};
 +#endif /* _NET80211__IEEE80211_H_ */
 diff -Nrup hostapd.orig/driver_madwifi/net80211/ieee80211.h hostapd/driver_madwifi/net80211/ieee80211.h
---- hostapd.orig/driver_madwifi/net80211/ieee80211.h	1970-01-01 10:00:00.000000000 +1000
-+++ hostapd/driver_madwifi/net80211/ieee80211.h	2007-07-24 21:32:14.234287655 +1000
+--- hostapd.orig/driver_madwifi/net80211/ieee80211.h	1970-01-01 02:00:00.000000000 +0200
++++ hostapd/driver_madwifi/net80211/ieee80211.h	2007-12-12 03:28:38.000000000 +0200
 @@ -0,0 +1,939 @@
 +/*-
 + * Copyright (c) 2001 Atsushi Onoe
@@ -1544,8 +1580,8 @@
 +
 +#endif /* _NET80211_IEEE80211_H_ */
 diff -Nrup hostapd.orig/driver_madwifi/net80211/ieee80211_ioctl.h hostapd/driver_madwifi/net80211/ieee80211_ioctl.h
---- hostapd.orig/driver_madwifi/net80211/ieee80211_ioctl.h	1970-01-01 10:00:00.000000000 +1000
-+++ hostapd/driver_madwifi/net80211/ieee80211_ioctl.h	2007-07-24 21:32:14.240286740 +1000
+--- hostapd.orig/driver_madwifi/net80211/ieee80211_ioctl.h	1970-01-01 02:00:00.000000000 +0200
++++ hostapd/driver_madwifi/net80211/ieee80211_ioctl.h	2007-12-12 03:28:38.000000000 +0200
 @@ -0,0 +1,660 @@
 +/*-
 + * Copyright (c) 2001 Atsushi Onoe

More information about the Pkg-wpa-devel mailing list