diff options
-rw-r--r-- | drivers/net/wireless/hostap/hostap_ioctl.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index 1764563612a..53f5246c40a 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c | |||
@@ -1828,13 +1828,6 @@ static char * __prism2_translate_scan(local_info_t *local, | |||
1828 | iwe.cmd = SIOCGIWAP; | 1828 | iwe.cmd = SIOCGIWAP; |
1829 | iwe.u.ap_addr.sa_family = ARPHRD_ETHER; | 1829 | iwe.u.ap_addr.sa_family = ARPHRD_ETHER; |
1830 | memcpy(iwe.u.ap_addr.sa_data, bssid, ETH_ALEN); | 1830 | memcpy(iwe.u.ap_addr.sa_data, bssid, ETH_ALEN); |
1831 | /* FIX: | ||
1832 | * I do not know how this is possible, but iwe_stream_add_event | ||
1833 | * seems to re-order memcpy execution so that len is set only | ||
1834 | * after copying.. Pre-setting len here "fixes" this, but real | ||
1835 | * problems should be solved (after which these iwe.len | ||
1836 | * settings could be removed from this function). */ | ||
1837 | iwe.len = IW_EV_ADDR_LEN; | ||
1838 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, | 1831 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, |
1839 | IW_EV_ADDR_LEN); | 1832 | IW_EV_ADDR_LEN); |
1840 | 1833 | ||
@@ -1844,7 +1837,6 @@ static char * __prism2_translate_scan(local_info_t *local, | |||
1844 | iwe.cmd = SIOCGIWESSID; | 1837 | iwe.cmd = SIOCGIWESSID; |
1845 | iwe.u.data.length = ssid_len; | 1838 | iwe.u.data.length = ssid_len; |
1846 | iwe.u.data.flags = 1; | 1839 | iwe.u.data.flags = 1; |
1847 | iwe.len = IW_EV_POINT_LEN + iwe.u.data.length; | ||
1848 | current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, ssid); | 1840 | current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, ssid); |
1849 | 1841 | ||
1850 | memset(&iwe, 0, sizeof(iwe)); | 1842 | memset(&iwe, 0, sizeof(iwe)); |
@@ -1860,7 +1852,6 @@ static char * __prism2_translate_scan(local_info_t *local, | |||
1860 | iwe.u.mode = IW_MODE_MASTER; | 1852 | iwe.u.mode = IW_MODE_MASTER; |
1861 | else | 1853 | else |
1862 | iwe.u.mode = IW_MODE_ADHOC; | 1854 | iwe.u.mode = IW_MODE_ADHOC; |
1863 | iwe.len = IW_EV_UINT_LEN; | ||
1864 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, | 1855 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, |
1865 | IW_EV_UINT_LEN); | 1856 | IW_EV_UINT_LEN); |
1866 | } | 1857 | } |
@@ -1878,7 +1869,6 @@ static char * __prism2_translate_scan(local_info_t *local, | |||
1878 | if (chan > 0) { | 1869 | if (chan > 0) { |
1879 | iwe.u.freq.m = freq_list[le16_to_cpu(chan - 1)] * 100000; | 1870 | iwe.u.freq.m = freq_list[le16_to_cpu(chan - 1)] * 100000; |
1880 | iwe.u.freq.e = 1; | 1871 | iwe.u.freq.e = 1; |
1881 | iwe.len = IW_EV_FREQ_LEN; | ||
1882 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, | 1872 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, |
1883 | IW_EV_FREQ_LEN); | 1873 | IW_EV_FREQ_LEN); |
1884 | } | 1874 | } |
@@ -1899,7 +1889,6 @@ static char * __prism2_translate_scan(local_info_t *local, | |||
1899 | | IW_QUAL_NOISE_UPDATED | 1889 | | IW_QUAL_NOISE_UPDATED |
1900 | | IW_QUAL_QUAL_INVALID | 1890 | | IW_QUAL_QUAL_INVALID |
1901 | | IW_QUAL_DBM; | 1891 | | IW_QUAL_DBM; |
1902 | iwe.len = IW_EV_QUAL_LEN; | ||
1903 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, | 1892 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, |
1904 | IW_EV_QUAL_LEN); | 1893 | IW_EV_QUAL_LEN); |
1905 | } | 1894 | } |
@@ -1911,7 +1900,6 @@ static char * __prism2_translate_scan(local_info_t *local, | |||
1911 | else | 1900 | else |
1912 | iwe.u.data.flags = IW_ENCODE_DISABLED; | 1901 | iwe.u.data.flags = IW_ENCODE_DISABLED; |
1913 | iwe.u.data.length = 0; | 1902 | iwe.u.data.length = 0; |
1914 | iwe.len = IW_EV_POINT_LEN + iwe.u.data.length; | ||
1915 | current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, ""); | 1903 | current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, ""); |
1916 | 1904 | ||
1917 | /* TODO: add SuppRates into BSS table */ | 1905 | /* TODO: add SuppRates into BSS table */ |