r168 - unstable/rt73/debian/patches

[Ben Hutchings]

Author: benh
Date: 2009-04-08 01:46:00 +0000 (Wed, 08 Apr 2009)
New Revision: 168

Added:
   unstable/rt73/debian/patches/006_iwe_stream_update.diff
Modified:
   unstable/rt73/debian/patches/series
Log:
Pass the extra argument to iwe_stream_add_*() functions required from 2.6.27.
Define wrapper macro for earlier kernel versions.


Added: unstable/rt73/debian/patches/006_iwe_stream_update.diff
===================================================================
--- unstable/rt73/debian/patches/006_iwe_stream_update.diff	                        (rev 0)
+++ unstable/rt73/debian/patches/006_iwe_stream_update.diff	2009-04-08 01:46:00 UTC (rev 168)
@@ -0,0 +1,111 @@
+Pass the extra argument to iwe_stream_add_*() functions required from 2.6.27.
+Define wrapper macro for earlier kernel versions.
+
+--- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_info.c
++++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_info.c
+@@ -49,6 +49,15 @@
+ #define IW_ESSID_MAX_SIZE	32
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
++#define iwe_stream_add_event(info, stream, ends, iwe, event_len)	\
++	iwe_stream_add_event(stream, ends, iwe, event_len)
++#define iwe_stream_add_point(info, stream, ends, iwe, extra)		\
++	iwe_stream_add_point(stream, ends, iwe, extra)
++#define iwe_stream_add_value(info, event, value, ends, iwe, event_len)	\
++	iwe_stream_add_value(event, value, ends, iwe, event_len)
++#endif
++
+ extern UCHAR	CipherWpa2Template[];
+ extern UCHAR	CipherWpa2TemplateLen;
+ extern UCHAR	CipherWpaPskTkip[];
+@@ -679,7 +688,7 @@
+         memcpy(iwe.u.ap_addr.sa_data, &pAdapter->ScanTab.BssEntry[i].Bssid, ETH_ALEN);
+ 
+         previous_ev = current_ev;
+-        current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
++        current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
+         if (current_ev == previous_ev)
+             break;
+ 
+@@ -691,7 +700,7 @@
+ 		iwe.u.data.flags = 1;
+ 
+         previous_ev = current_ev;
+-		current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);
++		current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);
+         if (current_ev == previous_ev)
+             break;
+ 
+@@ -714,7 +723,7 @@
+ 		iwe.len = IW_EV_UINT_LEN;
+ 
+         previous_ev = current_ev;
+-		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
++		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
+         if (current_ev == previous_ev)
+             break;
+ 
+@@ -730,7 +739,7 @@
+ 		iwe.u.freq.i = 0;
+ 
+ 		previous_ev = current_ev;
+-		current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
++		current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
+         if (current_ev == previous_ev)
+             break;
+ 
+@@ -744,7 +753,7 @@
+ 			iwe.u.data.flags = IW_ENCODE_DISABLED;
+ 
+         previous_ev = current_ev;
+-        current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe,  (char *)pAdapter->SharedKey[(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
++        current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe,  (char *)pAdapter->SharedKey[(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
+         if (current_ev == previous_ev)
+             break;
+ 
+@@ -759,7 +768,7 @@
+ 		{
+ 			iwe.u.bitrate.value = RateIdToMbps[pAdapter->ScanTab.BssEntry[i].SupRate[i]/2] * 1000000;
+ 			iwe.u.bitrate.disabled = 0;
+-			current_val = iwe_stream_add_value(current_ev,
++			current_val = iwe_stream_add_value(info, current_ev,
+ 				current_val, end_buf, &iwe,
+ 				IW_EV_PARAM_LEN);
+ 		}
+@@ -814,7 +823,7 @@
+ 		}
+ 		iwe.u.bitrate.value = max_rate * 500000;
+ 		iwe.u.bitrate.disabled = 0;
+-		current_val = iwe_stream_add_value(current_ev,
++		current_val = iwe_stream_add_value(info, current_ev,
+ 			current_val, end_buf, &iwe,
+ 			IW_EV_PARAM_LEN);
+ 		if((current_val-current_ev)>IW_EV_LCP_LEN)
+@@ -830,7 +839,7 @@
+ 		if (iwe.u.data.length)
+ 		{
+ 		    previous_ev = current_ev;
+-			current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);
++			current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
+             if (current_ev == previous_ev)
+                 break;
+         }
+@@ -841,7 +850,7 @@
+ 		set_quality(pAdapter, &iwe.u.qual, pAdapter->ScanTab.BssEntry[i].Rssi);
+ 
+ 		previous_ev = current_ev;
+-		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
++		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
+         if (current_ev == previous_ev)
+             break;
+ 
+@@ -856,7 +865,7 @@
+ 		if (iwe.u.data.length)
+ 		{
+ 		    previous_ev = current_ev;
+-			current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);
++			current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
+             if (current_ev == previous_ev)
+                 break;
+         }

Modified: unstable/rt73/debian/patches/series
===================================================================
--- unstable/rt73/debian/patches/series	2009-04-08 01:45:07 UTC (rev 167)
+++ unstable/rt73/debian/patches/series	2009-04-08 01:46:00 UTC (rev 168)
@@ -4,3 +4,4 @@
 003_fix_probe_request_overflow.diff
 004_use_netdev_functions.diff
 005_use_kill_pid.diff
+006_iwe_stream_update.diff