From 0949fda64982d3ea82a6dc582ba5eecfde87c802 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Fri, 16 Sep 2011 12:28:05 -0700
Subject: [PATCH] --- yaml --- r: 268485 b: refs/heads/master c:
 0569c8e2d6f545b05cbb7a6193ab977a6f9bbc19 h: refs/heads/master i:   268483:
 c4fbf9c24430531e6413d20a61bccdb38f16f0c0 v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4 ++--
 trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3c822ce381f1..a3fd1239bcc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66b9aa024583d31684f184d804d6d55b00392f31
+refs/heads/master: 0569c8e2d6f545b05cbb7a6193ab977a6f9bbc19
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 6ac4cc718286..4f3e8b8d5893 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -1993,8 +1993,8 @@ static s32 brcmf_inform_bss(struct brcmf_cfg80211_priv *cfg_priv)
 		return -EOPNOTSUPP;
 	}
 	WL_SCAN("scanned AP count (%d)\n", bss_list->count);
-	bi = next_bss(bss_list, bi);
-	for_each_bss(bss_list, bi, i) {
+	for (i = 0; i < bss_list->count && i < WL_AP_MAX; i++) {
+		bi = next_bss(bss_list, bi);
 		err = brcmf_inform_single_bss(cfg_priv, bi);
 		if (unlikely(err))
 			break;
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
index 7a8c671cb9be..d27d4e6f9431 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
@@ -362,10 +362,6 @@ static inline struct brcmf_bss_info *next_bss(struct brcmf_scan_results *list,
 		list->bss_info;
 }
 
-#define for_each_bss(list, bss, __i)	\
-	for (__i = 0; __i < list->count && __i < WL_AP_MAX; __i++, \
-		bss = next_bss(list, bss))
-
 extern struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,
 							struct device *busdev,
 							void *data);