redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: brcm80211: replaced typedef wl_rateset_t by struct brcm_rateset

Browse source 
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>
This commit is contained in:
Roland Vossen 2011-08-08 15:58:00 +02:00 committed by Greg Kroah-Hartman
parent fa67ebba7e
commit 786d00f7a0
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
View file

@ -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;

7
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
View file

@ -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;

6
drivers/staging/brcm80211/brcmsmac/main.c
View file

@ -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;

4
drivers/staging/brcm80211/include/defs.h
View file

@ -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 */