| 1 |
diff -Naur rt73-k2wrlz-3.0.1/Module/rtmp_info.c rt73-k2wrlz-3.0.1_rawtx/Module/rtmp_info.c |
| 2 |
--- rt73-k2wrlz-3.0.1/Module/rtmp_info.c 2008-07-24 02:05:27.000000000 +0200 |
| 3 |
+++ rt73-k2wrlz-3.0.1_rawtx/Module/rtmp_info.c 2008-08-12 22:30:20.000000000 +0200 |
| 4 |
@@ -682,7 +682,11 @@ |
| 5 |
memcpy(iwe.u.ap_addr.sa_data, &pAdapter->ScanTab.BssEntry[i].Bssid, ETH_ALEN); |
| 6 |
|
| 7 |
previous_ev = current_ev; |
| 8 |
+#if WIRELESS_EXT >= 22 |
| 9 |
+ current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_ADDR_LEN); |
| 10 |
+#else |
| 11 |
current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_ADDR_LEN); |
| 12 |
+#endif |
| 13 |
if (current_ev == previous_ev) |
| 14 |
break; |
| 15 |
|
| 16 |
@@ -694,7 +698,11 @@ |
| 17 |
iwe.u.data.flags = 1; |
| 18 |
|
| 19 |
previous_ev = current_ev; |
| 20 |
+#if WIRELESS_EXT >= 22 |
| 21 |
+ current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid); |
| 22 |
+#else |
| 23 |
current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid); |
| 24 |
+#endif |
| 25 |
if (current_ev == previous_ev) |
| 26 |
break; |
| 27 |
|
| 28 |
@@ -717,7 +725,11 @@ |
| 29 |
iwe.len = IW_EV_UINT_LEN; |
| 30 |
|
| 31 |
previous_ev = current_ev; |
| 32 |
+#if WIRELESS_EXT >= 22 |
| 33 |
+ current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_UINT_LEN); |
| 34 |
+#else |
| 35 |
current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_UINT_LEN); |
| 36 |
+#endif |
| 37 |
if (current_ev == previous_ev) |
| 38 |
break; |
| 39 |
|
| 40 |
@@ -733,7 +745,11 @@ |
| 41 |
iwe.u.freq.i = 0; |
| 42 |
|
| 43 |
previous_ev = current_ev; |
| 44 |
+#if WIRELESS_EXT >= 22 |
| 45 |
+ current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_FREQ_LEN); |
| 46 |
+#else |
| 47 |
current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_FREQ_LEN); |
| 48 |
+#endif |
| 49 |
if (current_ev == previous_ev) |
| 50 |
break; |
| 51 |
|
| 52 |
@@ -747,7 +763,11 @@ |
| 53 |
iwe.u.data.flags = IW_ENCODE_DISABLED; |
| 54 |
|
| 55 |
previous_ev = current_ev; |
| 56 |
+#if WIRELESS_EXT >= 22 |
| 57 |
+ current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe, (char *)pAdapter->SharedKey[(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key); |
| 58 |
+#else |
| 59 |
current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe, (char *)pAdapter->SharedKey[(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key); |
| 60 |
+#endif |
| 61 |
if (current_ev == previous_ev) |
| 62 |
break; |
| 63 |
|
| 64 |
@@ -762,9 +782,15 @@ |
| 65 |
{ |
| 66 |
iwe.u.bitrate.value = RateIdToMbps[pAdapter->ScanTab.BssEntry[i].SupRate[i]/2] * 1000000; |
| 67 |
iwe.u.bitrate.disabled = 0; |
| 68 |
+#if WIRELESS_EXT >= 22 |
| 69 |
+ current_val = iwe_stream_add_value(info, current_ev, |
| 70 |
+ current_val, end_buf, &iwe, |
| 71 |
+ IW_EV_PARAM_LEN); |
| 72 |
+#else |
| 73 |
current_val = iwe_stream_add_value(current_ev, |
| 74 |
current_val, end_buf, &iwe, |
| 75 |
IW_EV_PARAM_LEN); |
| 76 |
+#endif |
| 77 |
} |
| 78 |
|
| 79 |
|
| 80 |
@@ -817,9 +843,15 @@ |
| 81 |
} |
| 82 |
iwe.u.bitrate.value = max_rate * 500000; |
| 83 |
iwe.u.bitrate.disabled = 0; |
| 84 |
+#if WIRELESS_EXT >= 22 |
| 85 |
+ current_val = iwe_stream_add_value(info, current_ev, |
| 86 |
+ current_val, end_buf, &iwe, |
| 87 |
+ IW_EV_PARAM_LEN); |
| 88 |
+#else |
| 89 |
current_val = iwe_stream_add_value(current_ev, |
| 90 |
current_val, end_buf, &iwe, |
| 91 |
IW_EV_PARAM_LEN); |
| 92 |
+#endif |
| 93 |
if((current_val-current_ev)>IW_EV_LCP_LEN) |
| 94 |
current_ev = current_val; |
| 95 |
else |
| 96 |
@@ -833,7 +865,11 @@ |
| 97 |
if (iwe.u.data.length) |
| 98 |
{ |
| 99 |
previous_ev = current_ev; |
| 100 |
+#if WIRELESS_EXT >= 22 |
| 101 |
+ current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom); |
| 102 |
+#else |
| 103 |
current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom); |
| 104 |
+#endif |
| 105 |
if (current_ev == previous_ev) |
| 106 |
break; |
| 107 |
} |
| 108 |
@@ -844,7 +880,11 @@ |
| 109 |
set_quality(pAdapter, &iwe.u.qual, pAdapter->ScanTab.BssEntry[i].Rssi); |
| 110 |
|
| 111 |
previous_ev = current_ev; |
| 112 |
+#if WIRELESS_EXT >= 22 |
| 113 |
+ current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); |
| 114 |
+#else |
| 115 |
current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); |
| 116 |
+#endif |
| 117 |
if (current_ev == previous_ev) |
| 118 |
break; |
| 119 |
|
| 120 |
@@ -859,7 +899,11 @@ |
| 121 |
if (iwe.u.data.length) |
| 122 |
{ |
| 123 |
previous_ev = current_ev; |
| 124 |
+#if WIRELESS_EXT >= 22 |
| 125 |
+ current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom); |
| 126 |
+#else |
| 127 |
current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom); |
| 128 |
+#endif |
| 129 |
if (current_ev == previous_ev) |
| 130 |
break; |
| 131 |
} |
| 132 |
@@ -5703,7 +5747,7 @@ |
| 133 |
//UCHAR TmpPhy = pAd->PortCfg.PhyMode; |
| 134 |
//pAd->PortCfg.PhyMode = 0xff; |
| 135 |
//RTMPSetPhyMode(pAd, TmpPhy); |
| 136 |
- |
| 137 |
+ |
| 138 |
} |
| 139 |
|
| 140 |
sprintf(msg+strlen(msg), "\n\nChannel | Tx Power\n-------------------\n"); |