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: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/include/proto/802.11.h b/drivers/staging/brcm80211/include/proto/802.11.h
index 08aed61756c286d249264b556a71bb6e45e4ac5b..c5e044a82899148daa1da681827866cc7a565a70 100644 (file)
--- a/drivers/staging/brcm80211/include/proto/802.11.h
+++ b/drivers/staging/brcm80211/include/proto/802.11.h
@@ -48,14 +48,7 @@
 #define DOT11_BA_BITMAP_LEN            128
 #define DOT11_BA_LEN           4
 
-#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 DOT11_MGMT_HDR_LEN      24
 
 #define WME_OUI                        "\x00\x50\xf2"
 #define WME_VER                        1

diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.c b/drivers/staging/brcm80211/sys/wlc_alloc.c
index 02ae320d5f772af990a2797779ea4bc93dfc65d6..7a9fdbb5daee51f6da92b28f629a8968062a765d 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_alloc.c
+++ b/drivers/staging/brcm80211/sys/wlc_alloc.c
@@ -147,8 +147,6 @@ void wlc_bsscfg_mfree(struct osl_info *osh, wlc_bsscfg_t *cfg)
 
        if (cfg->current_bss != NULL) {
                wlc_bss_info_t *current_bss = cfg->current_bss;
-               if (current_bss->bcn_prb != NULL)
-                       kfree(current_bss->bcn_prb);
                kfree(current_bss);
                cfg->current_bss = NULL;
        }

diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index e454c2ecb9ec5916ae6536c6423e0a05c080a06b..a5fbfc0f3acad689415aaed9b690da967f5627ed 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -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(struct ieee80211_hdr) == DOT11_A4_HDR_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(ht_cap_ie_t) == HT_CAP_IE_LEN);
 #ifdef BRCM_FULLMAC
@@ -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++) {
                bi = bss_list->ptrs[index];
                if (bi) {
-                       if (bi->bcn_prb) {
-                               kfree(bi->bcn_prb);
-                       }
                        kfree(bi);
                        bss_list->ptrs[index] = NULL;
                }

diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index ce211b9e75634e0515ef03f47d83fea2f1dde25e..23e99685d548ba3bb1bd3c53dab2f50ce98ca574 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_pub.h
+++ b/drivers/staging/brcm80211/sys/wlc_pub.h
@@ -180,8 +180,6 @@ typedef struct wlc_bss_info {
        u8 dtim_period; /* DTIM period */
        s8 phy_noise;           /* noise right after tx (in dBm) */
        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 */
        struct rsn_parms wpa;
        struct rsn_parms wpa2;