From 371343a777ad814db2bc3ed113278c3c0f8bac75 Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Mon, 8 Aug 2011 15:58:00 +0200
Subject: [PATCH] --- yaml --- r: 267403 b: refs/heads/master c:
 786d00f7a0d744d55a211dc0c1f701c2c4e3d6bd h: refs/heads/master i:   267401:
 7307072e1047dd98505d676c9110a8695fdc833d   267399:
 335c882c74be939ce483dd1e815f1ab7e17043a8 v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 7 ++++---
 trunk/drivers/staging/brcm80211/brcmsmac/main.c        | 6 ++++--
 trunk/drivers/staging/brcm80211/include/defs.h         | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 8441fb7d1d60..5f22eedf7452 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa67ebba7ed550685b5ed12d6f22100081e54ca6
+refs/heads/master: 786d00f7a0d744d55a211dc0c1f701c2c4e3d6bd
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index a9494e78193e..e9ccf06db8db 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -2025,7 +2025,7 @@ brcmf_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev,
 			     const u8 *addr,
 			     const struct cfg80211_bitrate_mask *mask)
 {
-	struct wl_rateset rateset;
+	struct brcm_rateset rateset;
 	s32 rate;
 	s32 val;
 	s32 err_bg;
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
index d6de44e430d3..d2d2d1b042df 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
@@ -85,7 +85,8 @@ static int __devinit brcms_pci_probe(struct pci_dev *pdev,
 				  const struct pci_device_id *ent);
 static void brcms_remove(struct pci_dev *pdev);
 static void brcms_free(struct brcms_info *wl);
-static void brcms_set_basic_rate(struct wl_rateset *rs, u16 rate, bool is_br);
+static void brcms_set_basic_rate(struct brcm_rateset *rs, u16 rate,
+				 bool is_br);
 
 MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
@@ -377,7 +378,7 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
 		struct ieee80211_supported_band *bi;
 		u32 br_mask, i;
 		u16 rate;
-		struct wl_rateset rs;
+		struct brcm_rateset rs;
 		int error;
 
 		/* retrieve the current rates */
@@ -1374,7 +1375,7 @@ static void brcms_free(struct brcms_info *wl)
 }
 
 /* flags the given rate in rateset as requested */
-static void brcms_set_basic_rate(struct wl_rateset *rs, u16 rate, bool is_br)
+static void brcms_set_basic_rate(struct brcm_rateset *rs, u16 rate, bool is_br)
 {
 	u32 i;
 
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
index 038115b8ae6a..c96f43a54a42 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
@@ -6134,7 +6134,8 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
 		break;
 
 	case BRCM_GET_CURR_RATESET:{
-			wl_rateset_t *ret_rs = (wl_rateset_t *) arg;
+			struct brcm_rateset *ret_rs =
+						(struct brcm_rateset *) arg;
 			struct brcms_c_rateset *rs;
 
 			if (wlc->pub->associated)
@@ -6155,7 +6156,8 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
 
 	case BRCM_SET_RATESET:{
 			struct brcms_c_rateset rs;
-			wl_rateset_t *in_rs = (wl_rateset_t *) arg;
+			struct brcm_rateset *in_rs =
+						(struct brcm_rateset *) arg;
 
 			if (len < (int)(in_rs->count + sizeof(in_rs->count))) {
 				bcmerror = -EOVERFLOW;
diff --git a/trunk/drivers/staging/brcm80211/include/defs.h b/trunk/drivers/staging/brcm80211/include/defs.h
index 8b3e17dec150..838424c05e5a 100644
--- a/trunk/drivers/staging/brcm80211/include/defs.h
+++ b/trunk/drivers/staging/brcm80211/include/defs.h
@@ -54,10 +54,10 @@
 
 #define WL_NUMRATES		16	/* max # of rates in a rateset */
 
-typedef struct wl_rateset {
+struct brcm_rateset {
 	u32 count;		/* # rates in this set */
 	u8 rates[WL_NUMRATES];	/* rates in 500kbps units w/hi bit set if basic */
-} wl_rateset_t;
+};
 
 #define BRCM_CNTRY_BUF_SZ	4	/* Country string is 3 bytes + NUL */