Attachment #170603 for bug #222375




		memcpy(iwe.u.ap_addr.sa_data, pBssEntry->Bssid, ETH_ALEN);

		previous_ev = current_ev;
		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
		if (current_ev == previous_ev)
		break;


		iwe.len = IW_EV_UINT_LEN;

		previous_ev = current_ev;
		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
		if (current_ev == previous_ev)
		break;


		iwe.u.data.flags = 1;
 
		previous_ev = current_ev;
		current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pBssEntry->Ssid);
		if (current_ev == previous_ev)
			break;


		iwe.u.freq.i = 0;
		
		previous_ev = current_ev;
		current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
		if (current_ev == previous_ev)
			break;


		iwe.u.data.length = 0;
		
		previous_ev = current_ev;
		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;

			iwe.u.bitrate.value = rate * 500000;
			
			previous_ev = current_ev;
			current_ev = iwe_stream_add_value(info, p, current_ev, end_buf, &iwe, IW_EV_PARAM_LEN);
			if (current_ev == previous_ev)
			goto full;
		}

			iwe.u.bitrate.value = rate * 500000;
			
			previous_ev = current_ev;
			current_ev = iwe_stream_add_value(info, p, current_ev, end_buf, &iwe, IW_EV_PARAM_LEN);
			if (current_ev == previous_ev)
			goto full;
		}

		set_quality(pAdapter, &iwe.u.qual, pBssEntry->Rssi);

		previous_ev = current_ev;
		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
		if (current_ev == previous_ev)
			break;


					NdisMoveMemory(&custom[7], pEid, EIDLen);
#endif
					previous_ev = current_ev;
					current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
					if (current_ev == previous_ev)
						goto full;
				}

				memcpy(iwe.u.ap_addr.sa_data, &pAdapter->ScanTab.BssEntry[i].Bssid, ETH_ALEN);

        previous_ev = current_ev;
			current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
        if (current_ev == previous_ev)
            break;


		iwe.u.data.flags = 1;
 
        previous_ev = current_ev;
		current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);
        if (current_ev == previous_ev)
            break;
		

		iwe.len = IW_EV_UINT_LEN;

        previous_ev = current_ev;
		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
        if (current_ev == previous_ev)
            break;


		iwe.u.freq.i = 0;
		
		previous_ev = current_ev;
		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_FREQ_LEN);
        if (current_ev == previous_ev)
            break;


			iwe.u.data.flags = IW_ENCODE_DISABLED;

        previous_ev = current_ev;		
        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;


		{
			iwe.u.bitrate.value = RateIdToMbps[pAdapter->ScanTab.BssEntry[i].SupRate[i]/2] * 1000000;
			iwe.u.bitrate.disabled = 0;
			current_val = iwe_stream_add_value(info, current_ev,
				current_val, end_buf, &iwe,
				IW_EV_PARAM_LEN);
		}

		}		
			iwe.u.bitrate.value = max_rate * 500000;
			iwe.u.bitrate.disabled = 0;
			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)

		if (iwe.u.data.length)
		{
		    previous_ev = current_ev;
			current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
            if (current_ev == previous_ev)
                break;
        }

		set_quality(pAdapter, &iwe.u.qual, pAdapter->ScanTab.BssEntry[i].Rssi);

		previous_ev = current_ev;
		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
        if (current_ev == previous_ev)
            break;


		if (iwe.u.data.length)
		{   
		    previous_ev = current_ev;
			current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
            if (current_ev == previous_ev)
                break;
        }

Return to bug 222375

Lines 756-762 Link Here

(-)../../temp/2008_0723_RT61_Linux_STA_v1.1.2.2/Module/rtmp_info.c (-19 / +19 lines)
756	memcpy(iwe.u.ap_addr.sa_data, pBssEntry->Bssid, ETH_ALEN);	756	memcpy(iwe.u.ap_addr.sa_data, pBssEntry->Bssid, ETH_ALEN);
757		757
758	previous_ev = current_ev;	758	previous_ev = current_ev;
759	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);	759	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
760	if (current_ev == previous_ev)	760	if (current_ev == previous_ev)
761	break;	761	break;
762		762
Lines 773-779 Link Here
773	iwe.len = IW_EV_UINT_LEN;	773	iwe.len = IW_EV_UINT_LEN;
774		774
775	previous_ev = current_ev;	775	previous_ev = current_ev;
776	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_UINT_LEN);	776	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_UINT_LEN);
777	if (current_ev == previous_ev)	777	if (current_ev == previous_ev)
778	break;	778	break;
779		779
Lines 785-791 Link Here
785	iwe.u.data.flags = 1;	785	iwe.u.data.flags = 1;
786		786
787	previous_ev = current_ev;	787	previous_ev = current_ev;
788	current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pBssEntry->Ssid);	788	current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pBssEntry->Ssid);
789	if (current_ev == previous_ev)	789	if (current_ev == previous_ev)
790	break;	790	break;
791		791
Lines 798-804 Link Here
798	iwe.u.freq.i = 0;	798	iwe.u.freq.i = 0;
799		799
800	previous_ev = current_ev;	800	previous_ev = current_ev;
801	current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);	801	current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
802	if (current_ev == previous_ev)	802	if (current_ev == previous_ev)
803	break;	803	break;
804		804
Lines 813-819 Link Here
813	iwe.u.data.length = 0;	813	iwe.u.data.length = 0;
814		814
815	previous_ev = current_ev;	815	previous_ev = current_ev;
816	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,	816	current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe,
817	(char *)pAdapter->SharedKey[pAdapter->PortCfg.DefaultKeyId].Key);	817	(char *)pAdapter->SharedKey[pAdapter->PortCfg.DefaultKeyId].Key);
818	if (current_ev == previous_ev)	818	if (current_ev == previous_ev)
819	break;	819	break;
Lines 839-845 Link Here
839	iwe.u.bitrate.value = rate * 500000;	839	iwe.u.bitrate.value = rate * 500000;
840		840
841	previous_ev = current_ev;	841	previous_ev = current_ev;
842	current_ev = iwe_stream_add_value(p, current_ev, end_buf, &iwe, IW_EV_PARAM_LEN);	842	current_ev = iwe_stream_add_value(info, p, current_ev, end_buf, &iwe, IW_EV_PARAM_LEN);
843	if (current_ev == previous_ev)	843	if (current_ev == previous_ev)
844	goto full;	844	goto full;
845	}	845	}
Lines 849-855 Link Here
849	iwe.u.bitrate.value = rate * 500000;	849	iwe.u.bitrate.value = rate * 500000;
850		850
851	previous_ev = current_ev;	851	previous_ev = current_ev;
852	current_ev = iwe_stream_add_value(p, current_ev, end_buf, &iwe, IW_EV_PARAM_LEN);	852	current_ev = iwe_stream_add_value(info, p, current_ev, end_buf, &iwe, IW_EV_PARAM_LEN);
853	if (current_ev == previous_ev)	853	if (current_ev == previous_ev)
854	goto full;	854	goto full;
855	}	855	}
Lines 861-867 Link Here
861	set_quality(pAdapter, &iwe.u.qual, pBssEntry->Rssi);	861	set_quality(pAdapter, &iwe.u.qual, pBssEntry->Rssi);
862		862
863	previous_ev = current_ev;	863	previous_ev = current_ev;
864	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);	864	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
865	if (current_ev == previous_ev)	865	if (current_ev == previous_ev)
866	break;	866	break;
867		867
Lines 921-927 Link Here
921	NdisMoveMemory(&custom[7], pEid, EIDLen);	921	NdisMoveMemory(&custom[7], pEid, EIDLen);
922	#endif	922	#endif
923	previous_ev = current_ev;	923	previous_ev = current_ev;
924	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);	924	current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
925	if (current_ev == previous_ev)	925	if (current_ev == previous_ev)
926	goto full;	926	goto full;
927	}	927	}
Lines 1014-1020 Link Here
1014	memcpy(iwe.u.ap_addr.sa_data, &pAdapter->ScanTab.BssEntry[i].Bssid, ETH_ALEN);	1014	memcpy(iwe.u.ap_addr.sa_data, &pAdapter->ScanTab.BssEntry[i].Bssid, ETH_ALEN);
1015		1015
1016	previous_ev = current_ev;	1016	previous_ev = current_ev;
1017	current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);	1017	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
1018	if (current_ev == previous_ev)	1018	if (current_ev == previous_ev)
1019	break;	1019	break;
1020		1020
Lines 1026-1032 Link Here
1026	iwe.u.data.flags = 1;	1026	iwe.u.data.flags = 1;
1027		1027
1028	previous_ev = current_ev;	1028	previous_ev = current_ev;
1029	current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);	1029	current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);
1030	if (current_ev == previous_ev)	1030	if (current_ev == previous_ev)
1031	break;	1031	break;
1032		1032
Lines 1049-1055 Link Here
1049	iwe.len = IW_EV_UINT_LEN;	1049	iwe.len = IW_EV_UINT_LEN;
1050		1050
1051	previous_ev = current_ev;	1051	previous_ev = current_ev;
1052	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_UINT_LEN);	1052	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_UINT_LEN);
1053	if (current_ev == previous_ev)	1053	if (current_ev == previous_ev)
1054	break;	1054	break;
1055		1055
Lines 1065-1071 Link Here
1065	iwe.u.freq.i = 0;	1065	iwe.u.freq.i = 0;
1066		1066
1067	previous_ev = current_ev;	1067	previous_ev = current_ev;
1068	current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);	1068	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_FREQ_LEN);
1069	if (current_ev == previous_ev)	1069	if (current_ev == previous_ev)
1070	break;	1070	break;
1071		1071
Lines 1079-1085 Link Here
1079	iwe.u.data.flags = IW_ENCODE_DISABLED;	1079	iwe.u.data.flags = IW_ENCODE_DISABLED;
1080		1080
1081	previous_ev = current_ev;	1081	previous_ev = current_ev;
1082	current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe, (char *)pAdapter->SharedKey[(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);	1082	current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe, (char *)pAdapter->SharedKey[(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
1083	if (current_ev == previous_ev)	1083	if (current_ev == previous_ev)
1084	break;	1084	break;
1085		1085
Lines 1094-1100 Link Here
1094	{	1094	{
1095	iwe.u.bitrate.value = RateIdToMbps[pAdapter->ScanTab.BssEntry[i].SupRate[i]/2] * 1000000;	1095	iwe.u.bitrate.value = RateIdToMbps[pAdapter->ScanTab.BssEntry[i].SupRate[i]/2] * 1000000;
1096	iwe.u.bitrate.disabled = 0;	1096	iwe.u.bitrate.disabled = 0;
1097	current_val = iwe_stream_add_value(current_ev,	1097	current_val = iwe_stream_add_value(info, current_ev,
1098	current_val, end_buf, &iwe,	1098	current_val, end_buf, &iwe,
1099	IW_EV_PARAM_LEN);	1099	IW_EV_PARAM_LEN);
1100	}	1100	}
Lines 1148-1154 Link Here
1148	}	1148	}
1149	iwe.u.bitrate.value = max_rate * 500000;	1149	iwe.u.bitrate.value = max_rate * 500000;
1150	iwe.u.bitrate.disabled = 0;	1150	iwe.u.bitrate.disabled = 0;
1151	current_val = iwe_stream_add_value(current_ev,	1151	current_val = iwe_stream_add_value(info,current_ev,
1152	current_val, end_buf, &iwe,	1152	current_val, end_buf, &iwe,
1153	IW_EV_PARAM_LEN);	1153	IW_EV_PARAM_LEN);
1154	if((current_val-current_ev)>IW_EV_LCP_LEN)	1154	if((current_val-current_ev)>IW_EV_LCP_LEN)
Lines 1164-1170 Link Here
1164	if (iwe.u.data.length)	1164	if (iwe.u.data.length)
1165	{	1165	{
1166	previous_ev = current_ev;	1166	previous_ev = current_ev;
1167	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);	1167	current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
1168	if (current_ev == previous_ev)	1168	if (current_ev == previous_ev)
1169	break;	1169	break;
1170	}	1170	}
Lines 1175-1181 Link Here
1175	set_quality(pAdapter, &iwe.u.qual, pAdapter->ScanTab.BssEntry[i].Rssi);	1175	set_quality(pAdapter, &iwe.u.qual, pAdapter->ScanTab.BssEntry[i].Rssi);
1176		1176
1177	previous_ev = current_ev;	1177	previous_ev = current_ev;
1178	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);	1178	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
1179	if (current_ev == previous_ev)	1179	if (current_ev == previous_ev)
1180	break;	1180	break;
1181		1181
Lines 1190-1196 Link Here
1190	if (iwe.u.data.length)	1190	if (iwe.u.data.length)
1191	{	1191	{
1192	previous_ev = current_ev;	1192	previous_ev = current_ev;
1193	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);	1193	current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
1194	if (current_ev == previous_ev)	1194	if (current_ev == previous_ev)
1195	break;	1195	break;
1196	}	1196	}