---

yaml
---
r: 66439
b: refs/heads/master
c: 1e838bf
h: refs/heads/master
i:
  66437: 536de4e
  66435: 33f7da5
  66431: 855b9e1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab6179711a5e46ed1db739bef7752d65ce836dce
+refs/heads/master: 1e838bf31c3a24596621026c7d1ca69da068af83

trunk/drivers/net/wireless/libertas/defs.h

@@ -156,6 +156,8 @@ static inline void lbs_dbg_hex(char *prompt, u8 * buf, int len)
 #define MRVDRV_MAX_BEACON_INTERVAL		1000
 #define MRVDRV_BEACON_INTERVAL			100
 
+#define MARVELL_MESH_IE_LENGTH		9
+
 /** INT status Bit Definition*/
 #define his_cmddnldrdy			0x01
 #define his_cardevent			0x02

trunk/drivers/net/wireless/libertas/scan.c

@@ -1099,6 +1099,12 @@ static int libertas_process_bss(struct bss_descriptor * bss,
 				memcpy(bss->wpa_ie, elem, bss->wpa_ie_len);
 				lbs_dbg_hex("process_bss: WPA IE", bss->wpa_ie,
 				            elem->len);
+			} else if (elem->len >= MARVELL_MESH_IE_LENGTH &&
+			    elem->data[0] == 0x00 &&
+			    elem->data[1] == 0x50 &&
+			    elem->data[2] == 0x43 &&
+			    elem->data[3] == 0x04) {
+				bss->mesh = 1;
 			}
 			break;
 
@@ -1611,6 +1617,10 @@ int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
 			break;
 		}
 
+		/* For mesh device, list only mesh networks */
+		if (dev == priv->mesh_dev && !iter_bss->mesh)
+			continue;
+
 		/* Prune old an old scan result */
 		stale_time = iter_bss->last_scanned + DEFAULT_MAX_SCAN_AGE;
 		if (time_after(jiffies, stale_time)) {

trunk/drivers/net/wireless/libertas/scan.h

@@ -170,6 +170,8 @@ struct bss_descriptor {
 	u8 rsn_ie[MAX_WPA_IE_LEN];
 	size_t rsn_ie_len;
 
+	u8 mesh;
+
 	struct list_head list;
 };