staging: brcm80211: replaced typedef wl_rateset_t by struct brcm_rateset

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index a9494e78193eb191eca9b44ffe825b073a1d5cdc..e9ccf06db8dbfd3058c13f7a9d6ba2270e4d1292 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
index d6de44e430d32d5f86539692225856252b4691b3..d2d2d1b042df08e6ebf84a33275c81d28deac06f 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index 038115b8ae6adcfee6b86b753a57f1e8cc83ce14..c96f43a54a422b05a88992d997fdd6bb56ad59b5 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/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/drivers/staging/brcm80211/include/defs.h b/drivers/staging/brcm80211/include/defs.h
index 8b3e17dec150ff4155038898b2e1d11ef91869af..838424c05e5a0744ef7302ef4f4f2b7777ae4ab0 100644 (file)
--- a/drivers/staging/brcm80211/include/defs.h
+++ b/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 */