004-add_request_info.patch 2.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182
  1. --- acx-20080210/ioctl.c 2008-02-10 14:06:42.000000000 -0600
  2. +++ ioctl.c 2008-11-16 02:08:58.000000000 -0600
  3. @@ -488,6 +488,7 @@
  4. /* helper. not sure whether it's really a _s_leeping fn */
  5. static char*
  6. acx_s_scan_add_station(
  7. + struct iw_request_info *info,
  8. acx_device_t *adev,
  9. char *ptr,
  10. char *end_buf,
  11. @@ -503,14 +504,14 @@
  12. iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
  13. MAC_COPY(iwe.u.ap_addr.sa_data, bss->bssid);
  14. acxlog_mac(L_IOCTL, "scan, station address: ", bss->bssid, "\n");
  15. - ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_ADDR_LEN);
  16. + ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_ADDR_LEN);
  17. /* Add ESSID */
  18. iwe.cmd = SIOCGIWESSID;
  19. iwe.u.data.length = bss->essid_len;
  20. iwe.u.data.flags = 1;
  21. log(L_IOCTL, "scan, essid: %s\n", bss->essid);
  22. - ptr = iwe_stream_add_point(ptr, end_buf, &iwe, bss->essid);
  23. + ptr = iwe_stream_add_point(info, ptr, end_buf, &iwe, bss->essid);
  24. /* Add mode */
  25. iwe.cmd = SIOCGIWMODE;
  26. @@ -520,7 +521,7 @@
  27. else
  28. iwe.u.mode = IW_MODE_ADHOC;
  29. log(L_IOCTL, "scan, mode: %d\n", iwe.u.mode);
  30. - ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_UINT_LEN);
  31. + ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_UINT_LEN);
  32. }
  33. /* Add frequency */
  34. @@ -528,7 +529,7 @@
  35. iwe.u.freq.m = acx_channel_freq[bss->channel - 1] * 100000;
  36. iwe.u.freq.e = 1;
  37. log(L_IOCTL, "scan, frequency: %d\n", iwe.u.freq.m);
  38. - ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_FREQ_LEN);
  39. + ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_FREQ_LEN);
  40. /* Add link quality */
  41. iwe.cmd = IWEVQUAL;
  42. @@ -546,7 +547,7 @@
  43. iwe.u.qual.updated = 7;
  44. log(L_IOCTL, "scan, link quality: %d/%d/%d\n",
  45. iwe.u.qual.level, iwe.u.qual.noise, iwe.u.qual.qual);
  46. - ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_QUAL_LEN);
  47. + ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_QUAL_LEN);
  48. /* Add encryption */
  49. iwe.cmd = SIOCGIWENCODE;
  50. @@ -556,7 +557,7 @@
  51. iwe.u.data.flags = IW_ENCODE_DISABLED;
  52. iwe.u.data.length = 0;
  53. log(L_IOCTL, "scan, encryption flags: %X\n", iwe.u.data.flags);
  54. - ptr = iwe_stream_add_point(ptr, end_buf, &iwe, bss->essid);
  55. + ptr = iwe_stream_add_point(info, ptr, end_buf, &iwe, bss->essid);
  56. /* add rates */
  57. iwe.cmd = SIOCGIWRATE;
  58. @@ -570,7 +571,7 @@
  59. if (rate & 1) {
  60. iwe.u.bitrate.value = *p * 500000; /* units of 500kb/s */
  61. log(L_IOCTL, "scan, rate: %d\n", iwe.u.bitrate.value);
  62. - ptr_rate = iwe_stream_add_value(ptr, ptr_rate, end_buf,
  63. + ptr_rate = iwe_stream_add_value(info, ptr, ptr_rate, end_buf,
  64. &iwe, IW_EV_PARAM_LEN);
  65. }
  66. rate >>= 1;
  67. @@ -625,7 +626,7 @@
  68. for (i = 0; i < ARRAY_SIZE(adev->sta_list); i++) {
  69. struct client *bss = &adev->sta_list[i];
  70. if (!bss->used) continue;
  71. - ptr = acx_s_scan_add_station(adev, ptr,
  72. + ptr = acx_s_scan_add_station(info, adev, ptr,
  73. extra + IW_SCAN_MAX_DATA, bss);
  74. }
  75. dwrq->length = ptr - extra;