diff options
| author | Rui Paulo <rpaulo@gmail.com> | 2009-11-18 13:22:59 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-11-18 17:09:28 -0500 |
| commit | 76aa5e704c80fb7ca8bd3d05593d9a28298c92cd (patch) | |
| tree | 55f00554edb8511cdb9783cc061a142a4b4732c6 | |
| parent | 136cfa28615ccce0f9374811480e0b81c4191ea5 (diff) | |
mac80211: update cfg80211 scan result code for the updated mesh conf IE
Signed-off-by: Rui Paulo <rpaulo@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/wireless/scan.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index d03447d68cdd..227d57b8dc41 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
| @@ -874,35 +874,40 @@ ieee80211_bss(struct wiphy *wiphy, struct iw_request_info *info, | |||
| 874 | cfg = ie + 2; | 874 | cfg = ie + 2; |
| 875 | memset(&iwe, 0, sizeof(iwe)); | 875 | memset(&iwe, 0, sizeof(iwe)); |
| 876 | iwe.cmd = IWEVCUSTOM; | 876 | iwe.cmd = IWEVCUSTOM; |
| 877 | sprintf(buf, "Mesh network (version %d)", cfg[0]); | 877 | sprintf(buf, "Mesh Network Path Selection Protocol ID: " |
| 878 | "0x%02X", cfg[0]); | ||
| 878 | iwe.u.data.length = strlen(buf); | 879 | iwe.u.data.length = strlen(buf); |
| 879 | current_ev = iwe_stream_add_point(info, current_ev, | 880 | current_ev = iwe_stream_add_point(info, current_ev, |
| 880 | end_buf, | 881 | end_buf, |
| 881 | &iwe, buf); | 882 | &iwe, buf); |
| 882 | sprintf(buf, "Path Selection Protocol ID: " | 883 | sprintf(buf, "Path Selection Metric ID: 0x%02X", |
| 883 | "0x%02X%02X%02X%02X", cfg[1], cfg[2], cfg[3], | 884 | cfg[1]); |
| 884 | cfg[4]); | ||
| 885 | iwe.u.data.length = strlen(buf); | 885 | iwe.u.data.length = strlen(buf); |
| 886 | current_ev = iwe_stream_add_point(info, current_ev, | 886 | current_ev = iwe_stream_add_point(info, current_ev, |
| 887 | end_buf, | 887 | end_buf, |
| 888 | &iwe, buf); | 888 | &iwe, buf); |
| 889 | sprintf(buf, "Path Selection Metric ID: " | 889 | sprintf(buf, "Congestion Control Mode ID: 0x%02X", |
| 890 | "0x%02X%02X%02X%02X", cfg[5], cfg[6], cfg[7], | 890 | cfg[2]); |
| 891 | cfg[8]); | ||
| 892 | iwe.u.data.length = strlen(buf); | 891 | iwe.u.data.length = strlen(buf); |
| 893 | current_ev = iwe_stream_add_point(info, current_ev, | 892 | current_ev = iwe_stream_add_point(info, current_ev, |
| 894 | end_buf, | 893 | end_buf, |
| 895 | &iwe, buf); | 894 | &iwe, buf); |
| 896 | sprintf(buf, "Congestion Control Mode ID: " | 895 | sprintf(buf, "Synchronization ID: 0x%02X", cfg[3]); |
| 897 | "0x%02X%02X%02X%02X", cfg[9], cfg[10], | ||
| 898 | cfg[11], cfg[12]); | ||
| 899 | iwe.u.data.length = strlen(buf); | 896 | iwe.u.data.length = strlen(buf); |
| 900 | current_ev = iwe_stream_add_point(info, current_ev, | 897 | current_ev = iwe_stream_add_point(info, current_ev, |
| 901 | end_buf, | 898 | end_buf, |
| 902 | &iwe, buf); | 899 | &iwe, buf); |
| 903 | sprintf(buf, "Channel Precedence: " | 900 | sprintf(buf, "Authentication ID: 0x%02X", cfg[4]); |
| 904 | "0x%02X%02X%02X%02X", cfg[13], cfg[14], | 901 | iwe.u.data.length = strlen(buf); |
| 905 | cfg[15], cfg[16]); | 902 | current_ev = iwe_stream_add_point(info, current_ev, |
| 903 | end_buf, | ||
| 904 | &iwe, buf); | ||
| 905 | sprintf(buf, "Formation Info: 0x%02X", cfg[5]); | ||
| 906 | iwe.u.data.length = strlen(buf); | ||
| 907 | current_ev = iwe_stream_add_point(info, current_ev, | ||
| 908 | end_buf, | ||
| 909 | &iwe, buf); | ||
| 910 | sprintf(buf, "Capabilities: 0x%02X", cfg[6]); | ||
| 906 | iwe.u.data.length = strlen(buf); | 911 | iwe.u.data.length = strlen(buf); |
| 907 | current_ev = iwe_stream_add_point(info, current_ev, | 912 | current_ev = iwe_stream_add_point(info, current_ev, |
| 908 | end_buf, | 913 | end_buf, |