staging: brcm80211: remove unused module from softmac driver

[firefly-linux-kernel-4.4.55.git] / drivers / staging / brcm80211 / brcmsmac / wlc_mac80211.h

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h
index f56b58141c0983dddcbe8de9900b7f7d78f843f4..72bfb8fa4d0eb54a83fec451abd9bedb1585da05 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h
@@ -29,19 +29,6 @@
 #define        MAXCOREREV              28      /* max # supported core revisions (0 .. MAXCOREREV - 1) */
 #define WLC_MAXMODULES         22      /* max #  wlc_module_register() calls */
 
-/* network protection config */
-#define        WLC_PROT_G_SPEC         1       /* SPEC g protection */
-#define        WLC_PROT_G_OVR          2       /* SPEC g prot override */
-#define        WLC_PROT_G_USER         3       /* gmode specified by user */
-#define        WLC_PROT_OVERLAP        4       /* overlap */
-#define        WLC_PROT_N_USER         10      /* nmode specified by user */
-#define        WLC_PROT_N_CFG          11      /* n protection */
-#define        WLC_PROT_N_CFG_OVR      12      /* n protection override */
-#define        WLC_PROT_N_NONGF        13      /* non-GF protection */
-#define        WLC_PROT_N_NONGF_OVR    14      /* non-GF protection override */
-#define        WLC_PROT_N_PAM_OVR      15      /* n preamble override */
-#define        WLC_PROT_N_OBSS         16      /* non-HT OBSS present */
-
 #define WLC_BITSCNT(x) bcm_bitcount((u8 *)&(x), sizeof(u8))
 
 /* Maximum wait time for a MAC suspend */
@@ -346,9 +333,6 @@ struct wlcband {
        u16 bcntsfoff;  /* beacon tsf offset */
 };
 
-/* generic function callback takes just one arg */
-typedef void (*cb_fn_t) (void *);
-
 /* tx completion callback takes 3 args */
 typedef void (*pkcb_fn_t) (struct wlc_info *wlc, uint txstatus, void *arg);
 
@@ -436,8 +420,8 @@ struct wlc_hw_info {
        u16 boardrev;   /* version # of particular board */
        u32 boardflags; /* Board specific flags from srom */
        u32 boardflags2;        /* More board flags if sromrev >= 4 */
-       u32 machwcap;   /* MAC capabilities (corerev >= 13) */
-       u32 machwcap_backup;    /* backup of machwcap (corerev >= 13) */
+       u32 machwcap;   /* MAC capabilities */
+       u32 machwcap_backup;    /* backup of machwcap */
        u16 ucode_dbgsel;       /* dbgsel for ucode debug(config gpio) */
 
        si_t *sih;              /* SB handle (cookie for siutils calls) */
@@ -658,9 +642,6 @@ struct wlc_info {
        /* tx queue */
        wlc_txq_info_t *tx_queues;      /* common TX Queue list */
 
-       /* event */
-       wlc_eventq_t *eventq;   /* event queue for deferred processing */
-
        /* security */
        wsec_key_t *wsec_keys[WSEC_MAX_KEYS];   /* dynamic key storage */
        wsec_key_t *wsec_def_keys[WLC_DEFAULT_KEYS];    /* default key storage */
@@ -751,7 +732,7 @@ struct wlc_info {
        u32 apsd_trigger_timeout;       /* timeout value for apsd_trigger_timer (in ms)
                                         * 0 == disable
                                         */
-       ac_bitmap_t apsd_trigger_ac;    /* Permissible Acess Category in which APSD Null
+       ac_bitmap_t apsd_trigger_ac;    /* Permissible Access Category in which APSD Null
                                         * Trigger frames can be send
                                         */
        u8 htphy_membership;    /* HT PHY membership */
@@ -841,8 +822,6 @@ extern void wlc_get_rcmta(struct wlc_info *wlc, int idx,
 #endif
 extern void wlc_set_rcmta(struct wlc_info *wlc, int idx,
                          const u8 *addr);
-extern void wlc_set_addrmatch(struct wlc_info *wlc, int match_reg_offset,
-                             const u8 *addr);
 extern void wlc_read_tsf(struct wlc_info *wlc, u32 *tsf_l_ptr,
                         u32 *tsf_h_ptr);
 extern void wlc_set_cwmin(struct wlc_info *wlc, u16 newmin);
@@ -850,7 +829,6 @@ extern void wlc_set_cwmax(struct wlc_info *wlc, u16 newmax);
 extern void wlc_fifoerrors(struct wlc_info *wlc);
 extern void wlc_pllreq(struct wlc_info *wlc, bool set, mbool req_bit);
 extern void wlc_reset_bmac_done(struct wlc_info *wlc);
-extern void wlc_protection_upd(struct wlc_info *wlc, uint idx, int val);
 extern void wlc_hwtimer_gptimer_set(struct wlc_info *wlc, uint us);
 extern void wlc_hwtimer_gptimer_abort(struct wlc_info *wlc);
 
@@ -859,6 +837,8 @@ extern void wlc_print_rxh(d11rxhdr_t *rxh);
 extern void wlc_print_hdrs(struct wlc_info *wlc, const char *prefix, u8 *frame,
                           d11txh_t *txh, d11rxhdr_t *rxh, uint len);
 extern void wlc_print_txdesc(d11txh_t *txh);
+#else
+#define wlc_print_txdesc(a)
 #endif
 #if defined(BCMDBG)
 extern void wlc_print_dot11_mac_hdr(u8 *buf, int len);