[PATCH] libertas: push mesh beacon bit to userspace in scan results

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 5c730b9d956c..8d4e1ee27395 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -1334,6 +1334,8 @@ out:
         return ret;
 }
 
+#define MAX_CUSTOM_LEN 64
+
 static inline char *libertas_translate_scan(wlan_private *priv,
                                         char *start, char *stop,
                                         struct bss_descriptor *bss)
@@ -1467,6 +1469,18 @@ static inline char *libertas_translate_scan(wlan_private *priv,
                 start = iwe_stream_add_point(start, stop, &iwe, buf);
         }
 
+        if (bss->mesh) {
+                char custom[MAX_CUSTOM_LEN];
+                char *p = custom;
+
+                iwe.cmd = IWEVCUSTOM;
+                p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
+                              "mesh-type: olpc");
+                iwe.u.data.length = p - custom;
+                if (iwe.u.data.length)
+                        start = iwe_stream_add_point(start, stop, &iwe, custom);
+        }
+
         return start;
 }