aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorLuis Carlos Cobo <luisca@cozybit.com>2008-02-29 15:32:46 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-03-06 16:40:50 -0500
commit4f5d4c4da89c7aa0fa194a7fd3e52233067932ea (patch)
treeb13b5e44fe12211c6cf54270666f3eb00ecd4319 /net/mac80211
parent3b091cd4941912081730ffa17948da6d148c822d (diff)
mac80211: breakdown mesh network attributes in different extra fields for wext
Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ieee80211_sta.c35
1 files changed, 26 insertions, 9 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index c9d00187e790..75ced9a5476c 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -3976,18 +3976,35 @@ ieee80211_sta_scan_result(struct net_device *dev,
3976 if (bss_mesh_cfg(bss)) { 3976 if (bss_mesh_cfg(bss)) {
3977 char *buf; 3977 char *buf;
3978 u8 *cfg = bss_mesh_cfg(bss); 3978 u8 *cfg = bss_mesh_cfg(bss);
3979 buf = kmalloc(200, GFP_ATOMIC); 3979 buf = kmalloc(50, GFP_ATOMIC);
3980 if (buf) { 3980 if (buf) {
3981 memset(&iwe, 0, sizeof(iwe)); 3981 memset(&iwe, 0, sizeof(iwe));
3982 iwe.cmd = IWEVCUSTOM; 3982 iwe.cmd = IWEVCUSTOM;
3983 sprintf(buf, "Mesh network (version %d)\n" 3983 sprintf(buf, "Mesh network (version %d)", cfg[0]);
3984 "\t\t\tPath Selection Protocol ID: 0x%02X%02X%02X%02X\n" 3984 iwe.u.data.length = strlen(buf);
3985 "\t\t\tPath Selection Metric ID: 0x%02X%02X%02X%02X\n" 3985 current_ev = iwe_stream_add_point(current_ev, end_buf,
3986 "\t\t\tCongestion Control Mode ID: 0x%02X%02X%02X%02X\n" 3986 &iwe, buf);
3987 "\t\t\tChannel Precedence: 0x%02X%02X%02X%02X", 3987 sprintf(buf, "Path Selection Protocol ID: "
3988 cfg[0], cfg[1], cfg[2], cfg[3], cfg[4], cfg[5], cfg[6], 3988 "0x%02X%02X%02X%02X", cfg[1], cfg[2], cfg[3],
3989 cfg[7], cfg[8], cfg[9], cfg[10], cfg[11], cfg[12], 3989 cfg[4]);
3990 cfg[13], cfg[14], cfg[15], cfg[16]); 3990 iwe.u.data.length = strlen(buf);
3991 current_ev = iwe_stream_add_point(current_ev, end_buf,
3992 &iwe, buf);
3993 sprintf(buf, "Path Selection Metric ID: "
3994 "0x%02X%02X%02X%02X", cfg[5], cfg[6], cfg[7],
3995 cfg[8]);
3996 iwe.u.data.length = strlen(buf);
3997 current_ev = iwe_stream_add_point(current_ev, end_buf,
3998 &iwe, buf);
3999 sprintf(buf, "Congestion Control Mode ID: "
4000 "0x%02X%02X%02X%02X", cfg[9], cfg[10],
4001 cfg[11], cfg[12]);
4002 iwe.u.data.length = strlen(buf);
4003 current_ev = iwe_stream_add_point(current_ev, end_buf,
4004 &iwe, buf);
4005 sprintf(buf, "Channel Precedence: "
4006 "0x%02X%02X%02X%02X", cfg[13], cfg[14],
4007 cfg[15], cfg[16]);
3991 iwe.u.data.length = strlen(buf); 4008 iwe.u.data.length = strlen(buf);
3992 current_ev = iwe_stream_add_point(current_ev, end_buf, 4009 current_ev = iwe_stream_add_point(current_ev, end_buf,
3993 &iwe, buf); 4010 &iwe, buf);