*** iw_ndis.c.orig	2008-08-02 10:30:34.000000000 +0200
--- iw_ndis.c	2008-08-02 10:44:28.000000000 +0200
***************
*** 1025,1028 ****
--- 1025,1029 ----
  	struct ndis_wlan_bssid *bssid;
  	struct ndis_wlan_bssid_ex *bssid_ex;
+ 	struct iw_request_info *info;
  
  	ENTER2("%p, %p", event, item);
***************
*** 1035,1039 ****
  	iwe.len = IW_EV_ADDR_LEN;
  	memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN);
! 	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_ADDR_LEN);
  
  	/* add essid */
--- 1036,1040 ----
  	iwe.len = IW_EV_ADDR_LEN;
  	memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN);
! 	event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_ADDR_LEN);
  
  	/* add essid */
***************
*** 1045,1049 ****
  	iwe.u.data.flags = 1;
  	iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
! 	event = iwe_stream_add_point(event, end_buf, &iwe, bssid->ssid.essid);
  
  	/* add protocol name */
--- 1046,1050 ----
  	iwe.u.data.flags = 1;
  	iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
! 	event = iwe_stream_add_point(info, event, end_buf, &iwe, bssid->ssid.essid);
  
  	/* add protocol name */
***************
*** 1051,1055 ****
  	iwe.cmd = SIOCGIWNAME;
  	strncpy(iwe.u.name, network_type_to_name(bssid->net_type), IFNAMSIZ);
! 	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_CHAR_LEN);
  
  	/* add mode */
--- 1052,1056 ----
  	iwe.cmd = SIOCGIWNAME;
  	strncpy(iwe.u.name, network_type_to_name(bssid->net_type), IFNAMSIZ);
! 	event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_CHAR_LEN);
  
  	/* add mode */
***************
*** 1062,1066 ****
  	else // if (bssid->mode == Ndis802_11AutoUnknown)
  		iwe.u.mode = IW_MODE_AUTO;
! 	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_UINT_LEN);
  
  	/* add freq */
--- 1063,1067 ----
  	else // if (bssid->mode == Ndis802_11AutoUnknown)
  		iwe.u.mode = IW_MODE_AUTO;
! 	event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_UINT_LEN);
  
  	/* add freq */
***************
*** 1077,1081 ****
  	iwe.u.freq.e += 3;
  	iwe.len = IW_EV_FREQ_LEN;
! 	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_FREQ_LEN);
  
  	/* add qual */
--- 1078,1082 ----
  	iwe.u.freq.e += 3;
  	iwe.len = IW_EV_FREQ_LEN;
! 	event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_FREQ_LEN);
  
  	/* add qual */
***************
*** 1091,1095 ****
  	iwe.u.qual.qual  = i;
  	iwe.len = IW_EV_QUAL_LEN;
! 	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_QUAL_LEN);
  
  	/* add key info */
--- 1092,1096 ----
  	iwe.u.qual.qual  = i;
  	iwe.len = IW_EV_QUAL_LEN;
! 	event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_QUAL_LEN);
  
  	/* add key info */
***************
*** 1102,1106 ****
  	iwe.u.data.length = 0;
  	iwe.len = IW_EV_POINT_LEN;
! 	event = iwe_stream_add_point(event, end_buf, &iwe, bssid->ssid.essid);
  
  	/* add rate */
--- 1103,1107 ----
  	iwe.u.data.length = 0;
  	iwe.len = IW_EV_POINT_LEN;
! 	event = iwe_stream_add_point(info, event, end_buf, &iwe, bssid->ssid.essid);
  
  	/* add rate */
***************
*** 1116,1120 ****
  			iwe.u.bitrate.value = ((bssid->rates[i] & 0x7f) *
  					       500000);
! 			current_val = iwe_stream_add_value(event, current_val,
  							   end_buf, &iwe,
  							   IW_EV_PARAM_LEN);
--- 1117,1121 ----
  			iwe.u.bitrate.value = ((bssid->rates[i] & 0x7f) *
  					       500000);
! 			current_val = iwe_stream_add_value(info, event, current_val,
  							   end_buf, &iwe,
  							   IW_EV_PARAM_LEN);
***************
*** 1129,1133 ****
  	sprintf(buf, "bcn_int=%d", bssid->config.beacon_period);
  	iwe.u.data.length = strlen(buf);
! 	event = iwe_stream_add_point(event, end_buf, &iwe, buf);
  
  	memset(&iwe, 0, sizeof(iwe));
--- 1130,1134 ----
  	sprintf(buf, "bcn_int=%d", bssid->config.beacon_period);
  	iwe.u.data.length = strlen(buf);
! 	event = iwe_stream_add_point(info, event, end_buf, &iwe, buf);
  
  	memset(&iwe, 0, sizeof(iwe));
***************
*** 1135,1139 ****
  	sprintf(buf, "atim=%u", bssid->config.atim_window);
  	iwe.u.data.length = strlen(buf);
! 	event = iwe_stream_add_point(event, end_buf, &iwe, buf);
  
  	TRACE2("%d, %u", bssid->length, (unsigned int)sizeof(*bssid));
--- 1136,1140 ----
  	sprintf(buf, "atim=%u", bssid->config.atim_window);
  	iwe.u.data.length = strlen(buf);
! 	event = iwe_stream_add_point(info, event, end_buf, &iwe, buf);
  
  	TRACE2("%d, %u", bssid->length, (unsigned int)sizeof(*bssid));
***************
*** 1156,1160 ****
  				iwe.cmd = IWEVGENIE;
  				iwe.u.data.length = ielen;
! 				event = iwe_stream_add_point(event, end_buf,
  							     &iwe, iep);
  			}
--- 1157,1161 ----
  				iwe.cmd = IWEVGENIE;
  				iwe.u.data.length = ielen;
! 				event = iwe_stream_add_point(info, event, end_buf,
  							     &iwe, iep);
  			}