--- ../../temp/2008_0723_RT61_Linux_STA_v1.1.2.2/Module/rtmp_info.c	2008-05-06 00:26:32.000000000 +1000
+++ ../../temp/rtmp_info.c	2008-11-03 19:25:12.000000000 +1100
@@ -756,7 +756,7 @@
 		memcpy(iwe.u.ap_addr.sa_data, pBssEntry->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;
 
@@ -773,7 +773,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;
 
@@ -785,7 +785,7 @@
 		iwe.u.data.flags = 1;
  
 		previous_ev = current_ev;
-		current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pBssEntry->Ssid);
+		current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pBssEntry->Ssid);
 		if (current_ev == previous_ev)
 			break;
 
@@ -798,7 +798,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;
 
@@ -813,7 +813,7 @@
 		iwe.u.data.length = 0;
 		
 		previous_ev = current_ev;
-		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+		current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe,
 				(char *)pAdapter->SharedKey[pAdapter->PortCfg.DefaultKeyId].Key);
 		if (current_ev == previous_ev)
 			break;
@@ -839,7 +839,7 @@
 			iwe.u.bitrate.value = rate * 500000;
 			
 			previous_ev = current_ev;
-			current_ev = iwe_stream_add_value(p, current_ev, end_buf, &iwe, IW_EV_PARAM_LEN);
+			current_ev = iwe_stream_add_value(info, p, current_ev, end_buf, &iwe, IW_EV_PARAM_LEN);
 			if (current_ev == previous_ev)
 			goto full;
 		}
@@ -849,7 +849,7 @@
 			iwe.u.bitrate.value = rate * 500000;
 			
 			previous_ev = current_ev;
-			current_ev = iwe_stream_add_value(p, current_ev, end_buf, &iwe, IW_EV_PARAM_LEN);
+			current_ev = iwe_stream_add_value(info, p, current_ev, end_buf, &iwe, IW_EV_PARAM_LEN);
 			if (current_ev == previous_ev)
 			goto full;
 		}
@@ -861,7 +861,7 @@
 		set_quality(pAdapter, &iwe.u.qual, pBssEntry->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;
 
@@ -921,7 +921,7 @@
 					NdisMoveMemory(&custom[7], pEid, EIDLen);
 #endif
 					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)
 						goto full;
 				}
@@ -1014,7 +1014,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;
 
@@ -1026,7 +1026,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;
 		
@@ -1049,7 +1049,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;
 
@@ -1065,7 +1065,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;
 
@@ -1079,7 +1079,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;
 
@@ -1094,7 +1094,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);
 		}
@@ -1148,7 +1148,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)
@@ -1164,7 +1164,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;
         }
@@ -1175,7 +1175,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;
 
@@ -1190,7 +1190,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;
         }