Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 786d00f7 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: replaced typedef wl_rateset_t by struct brcm_rateset 



Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fa67ebba

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/brcm80211/brcmsmac/mac80211_if.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/brcm80211/brcmsmac/main.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/brcm80211/include/defs.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */