Commit 0b8b430d authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman

staging: brcm80211: deleted struct dot11_bcn_prb

Code cleanup. This struct did nothing useful in the code. Instances of this
struct and the code that read them were removed as well.
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d83b2a8a
...@@ -48,14 +48,7 @@ ...@@ -48,14 +48,7 @@
#define DOT11_BA_BITMAP_LEN 128 #define DOT11_BA_BITMAP_LEN 128
#define DOT11_BA_LEN 4 #define DOT11_BA_LEN 4
#define DOT11_MGMT_HDR_LEN 24 #define DOT11_MGMT_HDR_LEN 24
struct dot11_bcn_prb {
u32 timestamp[2];
u16 beacon_interval;
u16 capability;
} __attribute__((packed));
#define DOT11_BCN_PRB_LEN 12
#define WME_OUI "\x00\x50\xf2" #define WME_OUI "\x00\x50\xf2"
#define WME_VER 1 #define WME_VER 1
......
...@@ -147,8 +147,6 @@ void wlc_bsscfg_mfree(struct osl_info *osh, wlc_bsscfg_t *cfg) ...@@ -147,8 +147,6 @@ void wlc_bsscfg_mfree(struct osl_info *osh, wlc_bsscfg_t *cfg)
if (cfg->current_bss != NULL) { if (cfg->current_bss != NULL) {
wlc_bss_info_t *current_bss = cfg->current_bss; wlc_bss_info_t *current_bss = cfg->current_bss;
if (current_bss->bcn_prb != NULL)
kfree(current_bss->bcn_prb);
kfree(current_bss); kfree(current_bss);
cfg->current_bss = NULL; cfg->current_bss = NULL;
} }
......
...@@ -1746,7 +1746,6 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode, ...@@ -1746,7 +1746,6 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
ASSERT(sizeof(d11rxhdr_t) == RXHDR_LEN); ASSERT(sizeof(d11rxhdr_t) == RXHDR_LEN);
ASSERT(sizeof(struct ieee80211_hdr) == DOT11_A4_HDR_LEN); ASSERT(sizeof(struct ieee80211_hdr) == DOT11_A4_HDR_LEN);
ASSERT(sizeof(struct ieee80211_rts) == DOT11_RTS_LEN); ASSERT(sizeof(struct ieee80211_rts) == DOT11_RTS_LEN);
ASSERT(sizeof(struct dot11_bcn_prb) == DOT11_BCN_PRB_LEN);
ASSERT(sizeof(tx_status_t) == TXSTATUS_LEN); ASSERT(sizeof(tx_status_t) == TXSTATUS_LEN);
ASSERT(sizeof(ht_cap_ie_t) == HT_CAP_IE_LEN); ASSERT(sizeof(ht_cap_ie_t) == HT_CAP_IE_LEN);
#ifdef BRCM_FULLMAC #ifdef BRCM_FULLMAC
...@@ -6979,9 +6978,6 @@ void wlc_bss_list_free(struct wlc_info *wlc, wlc_bss_list_t *bss_list) ...@@ -6979,9 +6978,6 @@ void wlc_bss_list_free(struct wlc_info *wlc, wlc_bss_list_t *bss_list)
for (index = 0; index < bss_list->count; index++) { for (index = 0; index < bss_list->count; index++) {
bi = bss_list->ptrs[index]; bi = bss_list->ptrs[index];
if (bi) { if (bi) {
if (bi->bcn_prb) {
kfree(bi->bcn_prb);
}
kfree(bi); kfree(bi);
bss_list->ptrs[index] = NULL; bss_list->ptrs[index] = NULL;
} }
......
...@@ -180,8 +180,6 @@ typedef struct wlc_bss_info { ...@@ -180,8 +180,6 @@ typedef struct wlc_bss_info {
u8 dtim_period; /* DTIM period */ u8 dtim_period; /* DTIM period */
s8 phy_noise; /* noise right after tx (in dBm) */ s8 phy_noise; /* noise right after tx (in dBm) */
u16 capability; /* Capability information */ u16 capability; /* Capability information */
struct dot11_bcn_prb *bcn_prb; /* beacon/probe response frame (ioctl na) */
u16 bcn_prb_len; /* beacon/probe response frame length (ioctl na) */
u8 wme_qosinfo; /* QoS Info from WME IE; valid if WLC_BSS_WME flag set */ u8 wme_qosinfo; /* QoS Info from WME IE; valid if WLC_BSS_WME flag set */
struct rsn_parms wpa; struct rsn_parms wpa;
struct rsn_parms wpa2; struct rsn_parms wpa2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment