r160 - unstable/rt2500/debian/patches

[Ben Hutchings]

Author: benh
Date: 2009-04-08 01:28:11 +0000 (Wed, 08 Apr 2009)
New Revision: 160

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


Added: unstable/rt2500/debian/patches/009_iwe_stream_update.diff
===================================================================
--- unstable/rt2500/debian/patches/009_iwe_stream_update.diff	                        (rev 0)
+++ unstable/rt2500/debian/patches/009_iwe_stream_update.diff	2009-04-08 01:28:11 UTC (rev 160)
@@ -0,0 +1,79 @@
+--- rt2500-1.1.0-b4+cvs20080623.orig/Module/rtmp_info.c
++++ rt2500-1.1.0-b4+cvs20080623/Module/rtmp_info.c
+@@ -54,6 +54,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
++
+ #define NR_WEP_KEYS 4
+ #define WEP_SMALL_KEY_LEN (40/8)
+ #define WEP_LARGE_KEY_LEN (104/8)
+@@ -491,7 +500,7 @@
+ 		iwe.cmd = SIOCGIWAP;
+ 		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+ 				memcpy(iwe.u.ap_addr.sa_data, &pAdapter->PortCfg.BssTab.BssEntry[i].Bssid, ETH_ALEN);
+-			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);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = SIOCGIWMODE;
+@@ -509,13 +518,13 @@
+ 		}
+ 
+ 		iwe.len = IW_EV_UINT_LEN;
+-		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);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = SIOCGIWESSID;
+ 		iwe.u.data.length = pAdapter->PortCfg.BssTab.BssEntry[i].SsidLen;
+ 		iwe.u.data.flags = 1;
+-		current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
++		current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = SIOCGIWENCODE;
+@@ -523,7 +532,7 @@
+ 			iwe.u.data.flags =IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
+ 		else
+ 			iwe.u.data.flags = IW_ENCODE_DISABLED;
+-		current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe,  pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
++		current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe,  pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
+ 
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+@@ -534,7 +543,7 @@
+ 		{
+ 			iwe.u.bitrate.value = RateIdToMbps[pAdapter->PortCfg.BssTab.BssEntry[i].Rates[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);
+ 		}
+@@ -547,7 +556,7 @@
+ 			iwe.u.freq.m = pAdapter->PortCfg.BssTab.BssEntry[i].Channel;
+ 		iwe.u.freq.e = 0;
+ 		iwe.u.freq.i = 0;
+-		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);
+ 		//================================
+ 		memset(&iwe, 0, sizeof(iwe));
+                 iwe.cmd = IWEVQUAL;
+@@ -559,7 +568,7 @@
+ 		iwe.u.qual.noise = pAdapter->PortCfg.BssTab.BssEntry[i].Noise;
+                 //iwe.u.qual.noise = (pAdapter->PortCfg.LastR17Value > BBP_R17_DYNAMIC_UP_BOUND) ? BBP_R17_DYNAMIC_UP_BOUND : ((ULONG) pAdapter->PortCfg.LastR17Value);           // // noise level (dBm)
+ 
+-                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);
+ 
+ 
+                 //================================

Modified: unstable/rt2500/debian/patches/series
===================================================================
--- unstable/rt2500/debian/patches/series	2009-04-08 01:27:08 UTC (rev 159)
+++ unstable/rt2500/debian/patches/series	2009-04-08 01:28:11 UTC (rev 160)
@@ -3,3 +3,4 @@
 006_fix_probe_request_overflow.diff
 007_no_config_file.diff
 008_use_netdev_functions.diff
+009_iwe_stream_update.diff