r358 - in /unstable/madwifi/debian: ./ patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Fri Jul 25 14:21:31 UTC 2008
Author: kelmo-guest
Date: Fri Jul 25 14:21:31 2008
New Revision: 358
URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=358
Log:
* Revert to 0.9.4 codebase. Reopens #434702, #414998, which were demands for
better hardware support. Sorry, but the hardware support came at the
expense of wrecking existing setups for quite a few people.
(Closes: #492251, #491731, #491738)
* Backport patches from 0.9.4 branch of upstream, containing compat fixes
for new releases of Linux (2.6.26 and 2.6.27).
- 10_changeset_r3696.patch
- 11_changeset_r3715.patch
- 12_changeset_r3811.patch
* Backport a few misc fixes from upstream trunk. See each patch header for
details. These may become candidates for next dot point 0.9.4 release.
- 20_changeset_r3770.patch
- 21_changeset_r3724.patch
- 22_changeset_r3726.patch
- 23_changeset_r3699.patch
- 24_changeset_r3751.patch
* Remove call to dh_testroot in clean target of debian/rules.
Added:
unstable/madwifi/debian/patches/10_changeset_r3696.patch
unstable/madwifi/debian/patches/11_changeset_r3715.patch
unstable/madwifi/debian/patches/12_changeset_r3811.patch
unstable/madwifi/debian/patches/20_changeset_r3770.patch
unstable/madwifi/debian/patches/21_changeset_r3724.patch
unstable/madwifi/debian/patches/22_changeset_r3726.patch
unstable/madwifi/debian/patches/23_changeset_r3699.patch
unstable/madwifi/debian/patches/24_changeset_r3751.patch
Modified:
unstable/madwifi/debian/changelog
unstable/madwifi/debian/patches/series
unstable/madwifi/debian/rules
Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=358&op=diff
==============================================================================
--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Fri Jul 25 14:21:31 2008
@@ -1,3 +1,25 @@
+madwifi (1:0.9.4.0-1) unstable; urgency=low
+
+ * Revert to 0.9.4 codebase. Reopens #434702, #414998, which were demands for
+ better hardware support. Sorry, but the hardware support came at the
+ expense of wrecking existing setups for quite a few people.
+ (Closes: #492251, #491731, #491738)
+ * Backport patches from 0.9.4 branch of upstream, containing compat fixes
+ for new releases of Linux (2.6.26 and 2.6.27).
+ - 10_changeset_r3696.patch
+ - 11_changeset_r3715.patch
+ - 12_changeset_r3811.patch
+ * Backport a few misc fixes from upstream trunk. See each patch header for
+ details. These may become candidates for next dot point 0.9.4 release.
+ - 20_changeset_r3770.patch
+ - 21_changeset_r3724.patch
+ - 22_changeset_r3726.patch
+ - 23_changeset_r3699.patch
+ - 24_changeset_r3751.patch
+ * Remove call to dh_testroot in clean target of debian/rules.
+
+ -- Kel Modderman <kel at otaku42.de> Sat, 26 Jul 2008 00:17:33 +1000
+
madwifi (1:0.9.4+r3772.20080716-1) unstable; urgency=low
* New upstream SVN snapshot.
Added: unstable/madwifi/debian/patches/10_changeset_r3696.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/10_changeset_r3696.patch?rev=358&op=file
==============================================================================
--- unstable/madwifi/debian/patches/10_changeset_r3696.patch (added)
+++ unstable/madwifi/debian/patches/10_changeset_r3696.patch Fri Jul 25 14:21:31 2008
@@ -1,0 +1,199 @@
+Fix support for Linux 2.6.26
+
+Replace obsolete skb_append() with skb_queue_after(). Update
+makefiles to deal with obj not being set and the module build time.
+
+Author: Pavel Roskin <proski at gnu.org>
+Commit: http://madwifi.org/changeset/3696
+---
+--- a/Makefile
++++ b/Makefile
+@@ -40,10 +40,7 @@
+ # Makefile for the HAL-based Atheros driver.
+ #
+
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)
+
+ ifneq (svnversion.h,$(MAKECMDGOALS))
+--- a/ath/Makefile
++++ b/ath/Makefile
+@@ -40,10 +40,7 @@
+ # Makefile for the Atheros WLAN driver.
+ #
+
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/..
+
+ ifeq ($(strip $(BUS)),AHB)
+--- a/ath_hal/Makefile
++++ b/ath_hal/Makefile
+@@ -40,10 +40,7 @@
+ # Makefile for the Atheros WLAN driver.
+ #
+
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/..
+
+ include $(TOP)/Makefile.inc
+--- a/ath_rate/Makefile
++++ b/ath_rate/Makefile
+@@ -1,7 +1,4 @@
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/..
+
+ obj-y := amrr/ onoe/ sample/ minstrel/
+--- a/ath_rate/amrr/Makefile
++++ b/ath_rate/amrr/Makefile
+@@ -40,10 +40,7 @@
+ #
+ # Makefile for the Atheros Rate Control Support.
+ #
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/../..
+
+ obj-m += ath_rate_amrr.o
+--- a/ath_rate/minstrel/Makefile
++++ b/ath_rate/minstrel/Makefile
+@@ -38,10 +38,7 @@
+ #
+ # Makefile for the Atheros Rate Control Support.
+ #
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/../..
+
+ obj-m += ath_rate_minstrel.o
+--- a/ath_rate/onoe/Makefile
++++ b/ath_rate/onoe/Makefile
+@@ -40,10 +40,7 @@
+ #
+ # Makefile for the Atheros Rate Control Support.
+ #
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/../..
+
+ obj-m += ath_rate_onoe.o
+--- a/ath_rate/sample/Makefile
++++ b/ath_rate/sample/Makefile
+@@ -38,10 +38,7 @@
+ #
+ # Makefile for the Atheros Rate Control Support.
+ #
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/../..
+
+ obj-m += ath_rate_sample.o
+--- a/include/compat.h
++++ b/include/compat.h
+@@ -175,6 +175,13 @@
+ #define DEV_ATH CTL_UNNUMBERED
+ #endif
+
++/* __skb_append got a third parameter in 2.6.14 */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
++#define __skb_queue_after(_list, _old, _new) __skb_append(_old, _new)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
++#define __skb_queue_after(_list, _old, _new) __skb_append(_old, _new, _list)
++#endif
++
+ #endif /* __KERNEL__ */
+
+ #endif /* _ATH_COMPAT_H_ */
+--- a/net80211/Makefile
++++ b/net80211/Makefile
+@@ -39,10 +39,7 @@
+ #
+ # Makefile for the 802.11 WLAN modules.
+ #
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/..
+ #
+ # There are two authenticator mechanisms: an in-kernel implementation
+--- a/net80211/ieee80211_linux.h
++++ b/net80211/ieee80211_linux.h
+@@ -238,11 +238,6 @@
+ #define ACL_LOCK_ASSERT(_as)
+ #endif
+
+-/* __skb_append got a third parameter in 2.6.14 */
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+-#define __skb_append(a,b,c) __skb_append(a,b)
+-#endif
+-
+ /*
+ * Per-node power-save queue definitions. Beware of control
+ * flow with IEEE80211_NODE_SAVEQ_LOCK/IEEE80211_NODE_SAVEQ_UNLOCK.
+@@ -268,16 +263,16 @@
+ _skb = __skb_dequeue(&(_ni)->ni_savedq); \
+ (_qlen) = skb_queue_len(&(_ni)->ni_savedq); \
+ } while (0)
+-#define _IEEE80211_NODE_SAVEQ_ENQUEUE(_ni, _skb, _qlen, _age) do {\
+- struct sk_buff *tail = skb_peek_tail(&(_ni)->ni_savedq);\
+- if (tail != NULL) { \
+- _age -= M_AGE_GET(tail); \
+- __skb_append(tail, _skb, &(_ni)->ni_savedq); \
+- } else { \
+- __skb_queue_head(&(_ni)->ni_savedq, _skb); \
+- } \
+- M_AGE_SET(_skb, _age); \
+- (_qlen) = skb_queue_len(&(_ni)->ni_savedq); \
++#define _IEEE80211_NODE_SAVEQ_ENQUEUE(_ni, _skb, _qlen, _age) do { \
++ struct sk_buff *tail = skb_peek_tail(&(_ni)->ni_savedq); \
++ if (tail != NULL) { \
++ _age -= M_AGE_GET(tail); \
++ __skb_queue_after(&(_ni)->ni_savedq, tail, _skb); \
++ } else { \
++ __skb_queue_head(&(_ni)->ni_savedq, _skb); \
++ } \
++ M_AGE_SET(_skb, _age); \
++ (_qlen) = skb_queue_len(&(_ni)->ni_savedq); \
+ } while (0)
+
+ /*
+--- a/net80211/ieee80211_power.c
++++ b/net80211/ieee80211_power.c
+@@ -237,7 +237,7 @@
+ tail = skb_peek_tail(&ni->ni_savedq);
+ if (tail != NULL) {
+ age -= M_AGE_GET(tail);
+- __skb_append(tail, skb, &ni->ni_savedq);
++ __skb_queue_after(&ni->ni_savedq, tail, skb);
+ } else
+ __skb_queue_head(&ni->ni_savedq, skb);
+ M_AGE_SET(skb, age);
Added: unstable/madwifi/debian/patches/11_changeset_r3715.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/11_changeset_r3715.patch?rev=358&op=file
==============================================================================
--- unstable/madwifi/debian/patches/11_changeset_r3715.patch (added)
+++ unstable/madwifi/debian/patches/11_changeset_r3715.patch Fri Jul 25 14:21:31 2008
@@ -1,0 +1,55 @@
+Fix compatibility with RHEL 2.6.18
+
+Use macros for skb replacement functions, as it's done in the trunk.
+Inline function would conflict with those backported by Red Hat.
+
+Author: Pavel Roskin <proski at gnu.org>
+Commit: http://madwifi.org/changeset/3715
+---
+--- a/include/compat.h
++++ b/include/compat.h
+@@ -136,35 +136,15 @@
+
+ #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;
+-}
++#define skb_end_pointer(_skb) ((_skb)->end)
++#define skb_tail_pointer(_skb) ((_skb)->tail)
++#define skb_set_network_header(_skb, _offset) \
++ do { (_skb)->nh.raw = (_skb)->data + (_offset); } while (0)
++#define skb_reset_network_header(_skb) \
++ do { (_skb)->nh.raw = (_skb)->data; } while (0)
++#define skb_mac_header(_skb) ((_skb)->mac.raw)
++#define skb_reset_mac_header(_skb) \
++ do { (_skb)->mac.raw = (_skb)->data; } while (0)
+ #endif
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
Added: unstable/madwifi/debian/patches/12_changeset_r3811.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/12_changeset_r3811.patch?rev=358&op=file
==============================================================================
--- unstable/madwifi/debian/patches/12_changeset_r3811.patch (added)
+++ unstable/madwifi/debian/patches/12_changeset_r3811.patch Fri Jul 25 14:21:31 2008
@@ -1,0 +1,193 @@
+Add support for wireless extensions API changes in Linux 2.6.27.
+
+Author: Pavel Roskin <proski at gnu.org>
+Commit: http://madwifi.org/changeset/3811
+---
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
+@@ -1551,11 +1551,19 @@
+
+ struct iwscanreq { /* XXX: right place for this declaration? */
+ struct ieee80211vap *vap;
++ struct iw_request_info *info;
+ char *current_ev;
+ char *end_buf;
+ int mode;
+ };
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(IW_REQUEST_FLAG_COMPAT)
++#define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e)
++#define iwe_stream_add_point(a, b, c, d, e) iwe_stream_add_point(b, c, d, e)
++#define iwe_stream_add_value(a, b, c, d, e, f) \
++ iwe_stream_add_value(b, c, d, e, f)
++#define iwe_stream_lcp_len(a) IW_EV_LCP_LEN
++#endif
+ static int
+ giwscan_cb(void *arg, const struct ieee80211_scan_entry *se)
+ {
+@@ -1590,7 +1598,8 @@
+ IEEE80211_ADDR_COPY(iwe.u.ap_addr.sa_data, se->se_macaddr);
+ else
+ IEEE80211_ADDR_COPY(iwe.u.ap_addr.sa_data, se->se_bssid);
+- current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
++ current_ev = iwe_stream_add_event(req->info, current_ev, end_buf,
++ &iwe, IW_EV_ADDR_LEN);
+
+ /* We ran out of space in the buffer. */
+ if (last_ev == current_ev)
+@@ -1603,11 +1612,11 @@
+ if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
+ iwe.u.data.length = vap->iv_des_nssid > 0 ?
+ vap->iv_des_ssid[0].len : 0;
+- current_ev = iwe_stream_add_point(current_ev,
++ current_ev = iwe_stream_add_point(req->info, current_ev,
+ end_buf, &iwe, vap->iv_des_ssid[0].ssid);
+ } else {
+ iwe.u.data.length = se->se_ssid[1];
+- current_ev = iwe_stream_add_point(current_ev,
++ current_ev = iwe_stream_add_point(req->info, current_ev,
+ end_buf, &iwe, (char *) se->se_ssid+2);
+ }
+
+@@ -1621,8 +1630,8 @@
+ iwe.cmd = SIOCGIWMODE;
+ iwe.u.mode = se->se_capinfo & IEEE80211_CAPINFO_ESS ?
+ IW_MODE_MASTER : IW_MODE_ADHOC;
+- current_ev = iwe_stream_add_event(current_ev,
+- end_buf, &iwe, IW_EV_UINT_LEN);
++ current_ev = iwe_stream_add_event(req->info, current_ev,
++ end_buf, &iwe, IW_EV_UINT_LEN);
+
+ /* We ran out of space in the buffer. */
+ if (last_ev == current_ev)
+@@ -1634,8 +1643,8 @@
+ iwe.cmd = SIOCGIWFREQ;
+ iwe.u.freq.m = se->se_chan->ic_freq * 100000;
+ iwe.u.freq.e = 1;
+- current_ev = iwe_stream_add_event(current_ev,
+- end_buf, &iwe, IW_EV_FREQ_LEN);
++ current_ev = iwe_stream_add_event(req->info, current_ev,
++ end_buf, &iwe, IW_EV_FREQ_LEN);
+
+ /* We ran out of space in the buffer. */
+ if (last_ev == current_ev)
+@@ -1645,8 +1654,8 @@
+ last_ev = current_ev;
+ iwe.cmd = IWEVQUAL;
+ set_quality(&iwe.u.qual, se->se_rssi, ATH_DEFAULT_NOISE);
+- current_ev = iwe_stream_add_event(current_ev,
+- end_buf, &iwe, IW_EV_QUAL_LEN);
++ current_ev = iwe_stream_add_event(req->info, current_ev,
++ end_buf, &iwe, IW_EV_QUAL_LEN);
+
+ /* We ran out of space in the buffer */
+ if (last_ev == current_ev)
+@@ -1660,7 +1669,8 @@
+ else
+ iwe.u.data.flags = IW_ENCODE_DISABLED;
+ iwe.u.data.length = 0;
+- current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
++ current_ev = iwe_stream_add_point(req->info, current_ev,
++ end_buf, &iwe, "");
+
+ /* We ran out of space in the buffer. */
+ if (last_ev == current_ev)
+@@ -1669,28 +1679,28 @@
+ memset(&iwe, 0, sizeof(iwe));
+ last_ev = current_ev;
+ iwe.cmd = SIOCGIWRATE;
+- current_val = current_ev + IW_EV_LCP_LEN;
++ current_val = current_ev + iwe_stream_lcp_len(req->info);
+ /* NB: not sorted, does it matter? */
+ for (j = 0; j < se->se_rates[1]; j++) {
+ int r = se->se_rates[2 + j] & IEEE80211_RATE_VAL;
+ if (r != 0) {
+ iwe.u.bitrate.value = r * (1000000 / 2);
+- current_val = iwe_stream_add_value(current_ev,
+- current_val, end_buf, &iwe,
+- IW_EV_PARAM_LEN);
++ current_val = iwe_stream_add_value(req->info,
++ current_ev, current_val, end_buf,
++ &iwe, IW_EV_PARAM_LEN);
+ }
+ }
+ for (j = 0; j < se->se_xrates[1]; j++) {
+ int r = se->se_xrates[2+j] & IEEE80211_RATE_VAL;
+ if (r != 0) {
+ iwe.u.bitrate.value = r * (1000000 / 2);
+- current_val = iwe_stream_add_value(current_ev,
+- current_val, end_buf, &iwe,
+- IW_EV_PARAM_LEN);
++ current_val = iwe_stream_add_value(req->info,
++ current_ev, current_val, end_buf,
++ &iwe, IW_EV_PARAM_LEN);
+ }
+ }
+ /* remove fixed header if no rates were added */
+- if ((current_val - current_ev) > IW_EV_LCP_LEN) {
++ if ((current_val - current_ev) > iwe_stream_lcp_len(req->info)) {
+ current_ev = current_val;
+ } else {
+ /* We ran out of space in the buffer. */
+@@ -1704,7 +1714,8 @@
+ iwe.cmd = IWEVCUSTOM;
+ snprintf(buf, sizeof(buf), "bcn_int=%d", se->se_intval);
+ iwe.u.data.length = strlen(buf);
+- current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
++ current_ev = iwe_stream_add_point(req->info, current_ev,
++ end_buf, &iwe, buf);
+
+ /* We ran out of space in the buffer. */
+ if (last_ev == current_ev)
+@@ -1728,8 +1739,8 @@
+ rsn_leader, sizeof(rsn_leader) - 1);
+ #endif
+ if (iwe.u.data.length != 0) {
+- current_ev = iwe_stream_add_point(current_ev, end_buf,
+- &iwe, buf);
++ current_ev = iwe_stream_add_point(req->info,
++ current_ev, end_buf, &iwe, buf);
+
+ /* We ran out of space in the buffer */
+ if (last_ev == current_ev)
+@@ -1754,8 +1765,8 @@
+ wpa_leader, sizeof(wpa_leader) - 1);
+ #endif
+ if (iwe.u.data.length != 0) {
+- current_ev = iwe_stream_add_point(current_ev, end_buf,
+- &iwe, buf);
++ current_ev = iwe_stream_add_point(req->info,
++ current_ev, end_buf, &iwe, buf);
+
+ /* We ran out of space in the buffer. */
+ if (last_ev == current_ev)
+@@ -1773,8 +1784,8 @@
+ se->se_wme_ie, se->se_wme_ie[1] + 2,
+ wme_leader, sizeof(wme_leader) - 1);
+ if (iwe.u.data.length != 0) {
+- current_ev = iwe_stream_add_point(current_ev, end_buf,
+- &iwe, buf);
++ current_ev = iwe_stream_add_point(req->info,
++ current_ev, end_buf, &iwe, buf);
+
+ /* We ran out of space in the buffer. */
+ if (last_ev == current_ev)
+@@ -1791,8 +1802,8 @@
+ se->se_ath_ie, se->se_ath_ie[1] + 2,
+ ath_leader, sizeof(ath_leader) - 1);
+ if (iwe.u.data.length != 0) {
+- current_ev = iwe_stream_add_point(current_ev, end_buf,
+- &iwe, buf);
++ current_ev = iwe_stream_add_point(req->info,
++ current_ev, end_buf, &iwe, buf);
+
+ /* We ran out of space in the buffer. */
+ if (last_ev == current_ev)
+@@ -1815,6 +1826,7 @@
+ int res = 0;
+
+ req.vap = vap;
++ req.info = info;
+ req.current_ev = extra;
+ if (data->length == 0) {
+ req.end_buf = extra + IW_SCAN_MAX_DATA;
Added: unstable/madwifi/debian/patches/20_changeset_r3770.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/20_changeset_r3770.patch?rev=358&op=file
==============================================================================
--- unstable/madwifi/debian/patches/20_changeset_r3770.patch (added)
+++ unstable/madwifi/debian/patches/20_changeset_r3770.patch Fri Jul 25 14:21:31 2008
@@ -1,0 +1,43 @@
+Treat svnversion.h as a real target, not a phony one
+
+Allow Linux 2.6 build system to generate svnversion.h if it's missing.
+This is useful for Debian "Linux module extra" package build
+infrastructure. Original patch from Kel Modderman.
+
+Author: Pavel Roskin <proski at gnu.org>
+Commit: http://madwifi.org/changeset/3770
+---
+--- a/Makefile
++++ b/Makefile
+@@ -43,15 +43,13 @@
+ obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)
+
+-ifneq (svnversion.h,$(MAKECMDGOALS))
+ include $(TOP)/Makefile.inc
+-endif
+
+ obj-y := ath/ ath_hal/ ath_rate/ net80211/
+
+ all: modules tools
+
+-modules: configcheck svnversion.h
++modules: configcheck $(TOP)/svnversion.h
+ ifdef LINUX24
+ for i in $(obj-y); do \
+ $(MAKE) -C $$i || exit 1; \
+@@ -60,9 +58,11 @@
+ $(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
+ endif
+
+-.PHONY: svnversion.h
+-svnversion.h:
+- @if [ -d .svn ]; then \
++$(addprefix $(obj)/, $(obj-y:/=)): $(TOP)/svnversion.h
++
++$(TOP)/svnversion.h:
++ @cd $(TOP) && \
++ if [ -d .svn ]; then \
+ ver=`svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'`; \
+ echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \
+ elif [ -s SNAPSHOT ]; then \
Added: unstable/madwifi/debian/patches/21_changeset_r3724.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/21_changeset_r3724.patch?rev=358&op=file
==============================================================================
--- unstable/madwifi/debian/patches/21_changeset_r3724.patch (added)
+++ unstable/madwifi/debian/patches/21_changeset_r3724.patch Fri Jul 25 14:21:31 2008
@@ -1,0 +1,27 @@
+Fix needed for wpa_supplicant when run with ap_scan=1 parameter.
+
+Author: Benoit PAPILLAULT <benoit.papillault at free.fr>
+Commit: http://madwifi.org/changeset/3724
+---
+--- a/net80211/ieee80211_scan.c
++++ b/net80211/ieee80211_scan.c
+@@ -428,6 +428,19 @@
+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
+ "%s: %s scan already in progress\n", __func__,
+ ss->ss_flags & IEEE80211_SCAN_ACTIVE ? "active" : "passive");
++
++ /* If the running scanning has the flag SCAN_NOPICK set, but
++ * the requested scan has not, then we update the running scan
++ * flag. This is needed when wpa_supplicant is used with
++ * ap_scan=1. Without it, the driver will never associate. */
++
++ if (((flags & IEEE80211_SCAN_NOPICK) == 0)
++ && (ss->ss_flags & IEEE80211_SCAN_NOPICK)) {
++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
++ "%s: clearing SCAN_NOPICK flag\n",
++ __func__);
++ ss->ss_flags &= ~IEEE80211_SCAN_NOPICK;
++ }
+ }
+ IEEE80211_UNLOCK_IRQ(ic);
+
Added: unstable/madwifi/debian/patches/22_changeset_r3726.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/22_changeset_r3726.patch?rev=358&op=file
==============================================================================
--- unstable/madwifi/debian/patches/22_changeset_r3726.patch (added)
+++ unstable/madwifi/debian/patches/22_changeset_r3726.patch Fri Jul 25 14:21:31 2008
@@ -1,0 +1,16 @@
+Fix format string bugs.
+
+Author: Kel Modderman <kel at otaku42.de>
+Commit: http://madwifi.org/changeset/3726
+---
+--- a/net80211/ieee80211_linux.c
++++ b/net80211/ieee80211_linux.c
+@@ -335,7 +335,7 @@
+ {
+ #ifdef CONFIG_KMOD
+ int rv;
+- rv = request_module(modname);
++ rv = request_module("%s", modname);
+ if (rv < 0)
+ printk(KERN_ERR "failed to automatically load module: %s; " \
+ "errno: %d\n", modname, rv);
Added: unstable/madwifi/debian/patches/23_changeset_r3699.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/23_changeset_r3699.patch?rev=358&op=file
==============================================================================
--- unstable/madwifi/debian/patches/23_changeset_r3699.patch (added)
+++ unstable/madwifi/debian/patches/23_changeset_r3699.patch Fri Jul 25 14:21:31 2008
@@ -1,0 +1,99 @@
+Cleanup up extra kbuild by-product, modules.order.
+
+Author: Kel Modderman <kel at otaku42.de>
+Commit: http://madwifi.org/changeset/3699
+---
+--- a/Makefile
++++ b/Makefile
+@@ -105,7 +105,7 @@
+ done
+ -$(MAKE) -C $(TOOLS) clean
+ rm -rf .tmp_versions
+- rm -f *.symvers svnversion.h
++ rm -f modules.order *.symvers svnversion.h
+
+ info:
+ @echo "The following settings will be used for compilation:"
+--- a/ath/Makefile
++++ b/ath/Makefile
+@@ -71,7 +71,7 @@
+
+ clean:
+ rm -f *~ *.o *.ko *.mod.c .*.cmd
+- rm -f .depend .version .*.o.flags .*.o.d
++ rm -f modules.order .depend .version .*.o.flags .*.o.d
+ rm -rf .tmp_versions
+
+ ath_$(BUSNAME).o: $(ath_$(BUSNAME)-objs)
+--- a/ath_hal/Makefile
++++ b/ath_hal/Makefile
+@@ -91,7 +91,7 @@
+
+ clean:
+ rm -f *~ *.o *.ko *.mod.c uudecode .*.cmd
+- rm -f .depend .version .*.o.flags .*.o.d
++ rm -f modules.order .depend .version .*.o.flags .*.o.d
+ rm -rf .tmp_versions
+
+ ath_hal.o: $(ath_hal-objs)
+--- a/ath_rate/Makefile
++++ b/ath_rate/Makefile
+@@ -23,3 +23,5 @@
+ for i in $(obj-y); do \
+ $(MAKE) -C $$i clean; \
+ done
++
++ rm -f modules.order
+--- a/ath_rate/amrr/Makefile
++++ b/ath_rate/amrr/Makefile
+@@ -63,7 +63,7 @@
+
+ clean:
+ -rm -f *~ *.o *.ko *.mod.c
+- -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
++ -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
+ -rm -rf .tmp_versions
+
+ ath_rate_amrr.o: $(ath_rate_amrr-objs)
+--- a/ath_rate/minstrel/Makefile
++++ b/ath_rate/minstrel/Makefile
+@@ -61,7 +61,7 @@
+
+ clean:
+ -rm -f *~ *.o *.ko *.mod.c
+- -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
++ -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
+ -rm -rf .tmp_versions
+
+ ath_rate_minstrel.o: $(ath_rate_minstrel-objs)
+--- a/ath_rate/onoe/Makefile
++++ b/ath_rate/onoe/Makefile
+@@ -63,7 +63,7 @@
+
+ clean:
+ -rm -f *~ *.o *.ko *.mod.c
+- -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
++ -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
+ -rm -rf .tmp_versions
+
+ ath_rate_onoe.o: $(ath_rate_onoe-objs)
+--- a/ath_rate/sample/Makefile
++++ b/ath_rate/sample/Makefile
+@@ -61,7 +61,7 @@
+
+ clean:
+ -rm -f *~ *.o *.ko *.mod.c
+- -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
++ -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
+ -rm -rf .tmp_versions
+
+ ath_rate_sample.o: $(ath_rate_sample-objs)
+--- a/net80211/Makefile
++++ b/net80211/Makefile
+@@ -115,5 +115,5 @@
+
+ clean:
+ -rm -f *~ *.o *.ko *.mod.c
+- -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
++ -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
+ -rm -rf .tmp_versions
Added: unstable/madwifi/debian/patches/24_changeset_r3751.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/24_changeset_r3751.patch?rev=358&op=file
==============================================================================
--- unstable/madwifi/debian/patches/24_changeset_r3751.patch (added)
+++ unstable/madwifi/debian/patches/24_changeset_r3751.patch Fri Jul 25 14:21:31 2008
@@ -1,0 +1,26 @@
+Compile fix for Linux 2.4 - provide request_module() with 2 arguments
+
+Author: Pavel Roskin <proski at gnu.org>
+Commit: http://madwifi.org/changeset/3751
+---
+--- a/include/compat.h
++++ b/include/compat.h
+@@ -41,6 +41,7 @@
+ /* Compatibility with older Linux kernels */
+ #ifdef __KERNEL__
+ #include <linux/types.h>
++#include <linux/kmod.h>
+ #endif
+ #if !defined(__KERNEL__) || !defined (__bitwise)
+ #define __le16 u_int16_t
+@@ -162,6 +163,10 @@
+ #define __skb_queue_after(_list, _old, _new) __skb_append(_old, _new, _list)
+ #endif
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++#define request_module(_fmt, _modname) request_module(_modname)
++#endif
++
+ #endif /* __KERNEL__ */
+
+ #endif /* _ATH_COMPAT_H_ */
Modified: unstable/madwifi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/series?rev=358&op=diff
==============================================================================
--- unstable/madwifi/debian/patches/series (original)
+++ unstable/madwifi/debian/patches/series Fri Jul 25 14:21:31 2008
@@ -1,1 +1,9 @@
01_mips-compile-flags-fix.patch
+10_changeset_r3696.patch
+11_changeset_r3715.patch
+12_changeset_r3811.patch
+20_changeset_r3770.patch
+21_changeset_r3724.patch
+22_changeset_r3726.patch
+23_changeset_r3699.patch
+24_changeset_r3751.patch
Modified: unstable/madwifi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/rules?rev=358&op=diff
==============================================================================
--- unstable/madwifi/debian/rules (original)
+++ unstable/madwifi/debian/rules Fri Jul 25 14:21:31 2008
@@ -12,7 +12,6 @@
clean: unpatch
dh_testdir
- dh_testroot
dh_clean build-stamp
install: build
@@ -60,10 +59,10 @@
UPSVERS := $(shell echo $(DEBVERS) | cut -d'+' -f1 | tr '~' '-')
SVNVERS := $(shell echo $(DEBVERS) | sed -n 's/.*+\(.*\)/\1/p' | tr '.' '-')
ifneq "$(SVNVERS)" ""
-#ORIGTAR := madwifi-trunk-$(SVNVERS).tar.gz
-ORIGTAR := madwifi-hal-0.10.5.6-$(SVNVERS).tar.gz
-#ORIGURL := http://snapshots.madwifi.org/madwifi-trunk/
-ORIGURL := http://snapshots.madwifi.org/madwifi-hal-0.10.5.6/
+ORIGTAR := madwifi-trunk-$(SVNVERS).tar.gz
+#ORIGTAR := madwifi-hal-0.10.5.6-$(SVNVERS).tar.gz
+ORIGURL := http://snapshots.madwifi.org/madwifi-trunk/
+#ORIGURL := http://snapshots.madwifi.org/madwifi-hal-0.10.5.6/
else
ORIGTAR := madwifi-$(UPSVERS).tar.gz
ORIGURL := http://optusnet.dl.sourceforge.net/sourceforge/madwifi/
More information about the Pkg-madwifi-maintainers
mailing list