r340 - in /unstable/madwifi/debian: changelog patches/02_2.6.26_compat_wext.patch patches/series

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Tue Jul  8 10:30:27 2008
New Revision: 340

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=340
Log:
Add upstream changeset r3760 in form of 02_2.6.26_compat_wext.patch.

Added:
    unstable/madwifi/debian/patches/02_2.6.26_compat_wext.patch
Modified:
    unstable/madwifi/debian/changelog
    unstable/madwifi/debian/patches/series

Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=340&op=diff
==============================================================================
--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Tue Jul  8 10:30:27 2008
@@ -4,8 +4,9 @@
     - initial Linux 2.6.26 compat
   * Modify debian/rules get-orig-source target to pull SVN snapshot from
     hal-0.10.5.6 branch.
-
- -- Kel Modderman <kel at otaku42.de>  Tue, 08 Jul 2008 00:58:41 +1000
+  * Add upstream changeset r3760 in form of 02_2.6.26_compat_wext.patch.
+
+ -- Kel Modderman <kel at otaku42.de>  Tue, 08 Jul 2008 20:30:03 +1000
 
 madwifi (1:0.9.4+r3698.20080604.hal20080528-1) unstable; urgency=low
 

Added: unstable/madwifi/debian/patches/02_2.6.26_compat_wext.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/02_2.6.26_compat_wext.patch?rev=340&op=file
==============================================================================
--- unstable/madwifi/debian/patches/02_2.6.26_compat_wext.patch (added)
+++ unstable/madwifi/debian/patches/02_2.6.26_compat_wext.patch Tue Jul  8 10:30:27 2008
@@ -1,0 +1,37 @@
+https://madwifi.org/changeset/3760
+
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
+@@ -1777,10 +1777,11 @@
+ };
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+-#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)	\
++#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(...)			IW_EV_LCP_LEN
+ #endif
+ static int
+ giwscan_cb(void *arg, const struct ieee80211_scan_entry *se)
+@@ -1888,7 +1889,7 @@
+ 	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;
+@@ -1909,7 +1910,7 @@
+ 		}
+ 	}
+ 	/* 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. */

Modified: unstable/madwifi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/series?rev=340&op=diff
==============================================================================
--- unstable/madwifi/debian/patches/series (original)
+++ unstable/madwifi/debian/patches/series Tue Jul  8 10:30:27 2008
@@ -1,1 +1,2 @@
 01_mips-compile-flags-fix.patch
+02_2.6.26_compat_wext.patch