staging: brcm80211: remove typedefs that were flagged by checkpatch
authorArend van Spriel <arend@broadcom.com>
Fri, 25 Feb 2011 15:39:15 +0000 (16:39 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 1 Mar 2011 02:17:39 +0000 (18:17 -0800)
The previous patch resulted in checkpatch to complain about 'new'
typedefs that were relocated to another include file. This commits
removes those typedef structures.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h

index 20a0f86a2cd7adfaffd470ba72496de5dde1601d..8e4908b3ecf36f4674bb791252667176a15138e8 100644 (file)
@@ -204,8 +204,8 @@ struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit, uint *err,
        }
        wlc->hw->wlc = wlc;
 
-       wlc->hw->bandstate[0] = (wlc_hwband_t *)wlc_calloc(osh, unit,
-               (sizeof(wlc_hwband_t) * MAXBANDS));
+       wlc->hw->bandstate[0] = wlc_calloc(osh, unit,
+               (sizeof(struct wlc_hwband) * MAXBANDS));
        if (wlc->hw->bandstate[0] == NULL) {
                *err = 1006;
                goto fail;
@@ -213,14 +213,14 @@ struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit, uint *err,
                int i;
 
                for (i = 1; i < MAXBANDS; i++) {
-                       wlc->hw->bandstate[i] = (wlc_hwband_t *)
+                       wlc->hw->bandstate[i] = (struct wlc_hwband *)
                            ((unsigned long)wlc->hw->bandstate[0] +
-                            (sizeof(wlc_hwband_t) * i));
+                            (sizeof(struct wlc_hwband) * i));
                }
        }
 
-       wlc->modulecb = (modulecb_t *)wlc_calloc(osh, unit,
-               sizeof(modulecb_t) * WLC_MAXMODULES);
+       wlc->modulecb = wlc_calloc(osh, unit,
+               sizeof(struct modulecb) * WLC_MAXMODULES);
        if (wlc->modulecb == NULL) {
                *err = 1009;
                goto fail;
@@ -240,8 +240,8 @@ struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit, uint *err,
        }
        wlc_bsscfg_ID_assign(wlc, wlc->cfg);
 
-       wlc->pkt_callback = (pkt_cb_t *)wlc_calloc(osh, unit,
-               (sizeof(pkt_cb_t) * (wlc->pub->tunables->maxpktcb + 1)));
+       wlc->pkt_callback = wlc_calloc(osh, unit,
+               (sizeof(struct pkt_cb) * (wlc->pub->tunables->maxpktcb + 1)));
        if (wlc->pkt_callback == NULL) {
                *err = 1013;
                goto fail;
@@ -261,14 +261,14 @@ struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit, uint *err,
                }
        }
 
-       wlc->protection = (wlc_protection_t *)wlc_calloc(osh, unit,
-               sizeof(wlc_protection_t));
+       wlc->protection = wlc_calloc(osh, unit,
+               sizeof(struct wlc_protection));
        if (wlc->protection == NULL) {
                *err = 1016;
                goto fail;
        }
 
-       wlc->stf = (wlc_stf_t *)wlc_calloc(osh, unit, sizeof(wlc_stf_t));
+       wlc->stf = wlc_calloc(osh, unit, sizeof(struct wlc_stf));
        if (wlc->stf == NULL) {
                *err = 1017;
                goto fail;
index 68b65a0c896b3406fcb9f23dc6e96f9c9537ce81..a6572db522b4adc18e195da275c1b9aebd3f4b5f 100644 (file)
@@ -494,7 +494,7 @@ wlc_ampdu_agg(struct ampdu_info *ampdu, struct scb *scb, struct sk_buff *p,
 }
 
 int BCMFASTPATH
-wlc_sendampdu(struct ampdu_info *ampdu, wlc_txq_info_t *qi,
+wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi,
              struct sk_buff **pdu, int prec)
 {
        struct wlc_info *wlc;
index 33f315c2eb3ae6d1c16f481cf399e478b8e96c87..17e9ebc0dfe2c447375b10a2d6683410c0107d9d 100644 (file)
@@ -19,7 +19,7 @@
 
 extern struct ampdu_info *wlc_ampdu_attach(struct wlc_info *wlc);
 extern void wlc_ampdu_detach(struct ampdu_info *ampdu);
-extern int wlc_sendampdu(struct ampdu_info *ampdu, wlc_txq_info_t *qi,
+extern int wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi,
                         struct sk_buff **aggp, int prec);
 extern void wlc_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,
                                 struct sk_buff *p, tx_status_t *txs);
index dc41593d956ea7702c03e9d0363d50232efc48a6..f450c55735a07c712948c8e2fc99b60dc8e94b08 100644 (file)
@@ -1012,7 +1012,7 @@ static void wlc_bmac_info_init(struct wlc_hw_info *wlc_hw)
 int wlc_bmac_detach(struct wlc_info *wlc)
 {
        uint i;
-       wlc_hwband_t *band;
+       struct wlc_hwband *band;
        struct wlc_hw_info *wlc_hw = wlc->hw;
        int callbacks;
 
@@ -1397,7 +1397,7 @@ wlc_bmac_mhf(struct wlc_hw_info *wlc_hw, u8 idx, u16 mask, u16 val,
                M_HOST_FLAGS1, M_HOST_FLAGS2, M_HOST_FLAGS3, M_HOST_FLAGS4,
                M_HOST_FLAGS5
        };
-       wlc_hwband_t *band;
+       struct wlc_hwband *band;
 
        ASSERT((val & ~mask) == 0);
        ASSERT(idx < MHFMAX);
@@ -1445,7 +1445,7 @@ wlc_bmac_mhf(struct wlc_hw_info *wlc_hw, u8 idx, u16 mask, u16 val,
 
 u16 wlc_bmac_mhf_get(struct wlc_hw_info *wlc_hw, u8 idx, int bands)
 {
-       wlc_hwband_t *band;
+       struct wlc_hwband *band;
        ASSERT(idx < MHFMAX);
 
        switch (bands) {
index 1d8434586d256cbf4d922138e5a5a8ca8dd7483b..4ae75a344592d56739f8357aa58c23e741ea9056 100644 (file)
@@ -264,11 +264,12 @@ static int wlc_iovar_rangecheck(struct wlc_info *wlc, u32 val,
 static u8 wlc_local_constraint_qdbm(struct wlc_info *wlc);
 
 /* send and receive */
-static wlc_txq_info_t *wlc_txq_alloc(struct wlc_info *wlc,
-                                    struct osl_info *osh);
+static struct wlc_txq_info *wlc_txq_alloc(struct wlc_info *wlc,
+                                         struct osl_info *osh);
 static void wlc_txq_free(struct wlc_info *wlc, struct osl_info *osh,
-                        wlc_txq_info_t *qi);
-static void wlc_txflowcontrol_signal(struct wlc_info *wlc, wlc_txq_info_t *qi,
+                        struct wlc_txq_info *qi);
+static void wlc_txflowcontrol_signal(struct wlc_info *wlc,
+                                    struct wlc_txq_info *qi,
                                     bool on, int prio);
 static void wlc_txflowcontrol_reset(struct wlc_info *wlc);
 static u16 wlc_compute_airtime(struct wlc_info *wlc, ratespec_t rspec,
@@ -1728,7 +1729,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
        uint err = 0;
        uint j;
        struct wlc_pub *pub;
-       wlc_txq_info_t *qi;
+       struct wlc_txq_info *qi;
        uint n_disabled;
 
        WL_NONE("wl%d: %s: vendor 0x%x device 0x%x\n",
@@ -2170,7 +2171,7 @@ uint wlc_detach(struct wlc_info *wlc)
 
        {
                /* free dumpcb list */
-               dumpcb_t *prev, *ptr;
+               struct dumpcb_s *prev, *ptr;
                prev = ptr = wlc->dumpcb_head;
                while (ptr) {
                        ptr = prev->next;
@@ -2676,7 +2677,7 @@ uint wlc_down(struct wlc_info *wlc)
        uint callbacks = 0;
        int i;
        bool dev_gone = false;
-       wlc_txq_info_t *qi;
+       struct wlc_txq_info *qi;
 
        WL_TRACE("wl%d: %s:\n", wlc->pub->unit, __func__);
 
@@ -4346,7 +4347,7 @@ int wlc_module_unregister(struct wlc_pub *pub, const char *name, void *hdl)
        for (i = 0; i < WLC_MAXMODULES; i++) {
                if (!strcmp(wlc->modulecb[i].name, name) &&
                    (wlc->modulecb[i].hdl == hdl)) {
-                       memset(&wlc->modulecb[i], 0, sizeof(modulecb_t));
+                       memset(&wlc->modulecb[i], 0, sizeof(struct modulecb));
                        return 0;
                }
        }
@@ -5145,7 +5146,7 @@ void BCMFASTPATH wlc_txq_enq(void *ctx, struct scb *scb, struct sk_buff *sdu,
                             uint prec)
 {
        struct wlc_info *wlc = (struct wlc_info *) ctx;
-       wlc_txq_info_t *qi = wlc->active_queue; /* Check me */
+       struct wlc_txq_info *qi = wlc->active_queue;    /* Check me */
        struct pktq *q = &qi->q;
        int prio;
 
@@ -5217,7 +5218,7 @@ wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu,
        return 0;
 }
 
-void BCMFASTPATH wlc_send_q(struct wlc_info *wlc, wlc_txq_info_t *qi)
+void BCMFASTPATH wlc_send_q(struct wlc_info *wlc, struct wlc_txq_info *qi)
 {
        struct sk_buff *pkt[DOT11_MAXNUMFRAGS];
        int prec;
@@ -7001,10 +7002,9 @@ wlc_recvctl(struct wlc_info *wlc, struct osl_info *osh, d11rxhdr_t *rxh,
        return;
 }
 
-void wlc_bss_list_free(struct wlc_info *wlc, wlc_bss_list_t *bss_list)
+void wlc_bss_list_free(struct wlc_info *wlc, struct wlc_bss_list *bss_list)
 {
        uint index;
-       wlc_bss_info_t *bi;
 
        if (!bss_list) {
                WL_ERROR("%s: Attempting to free NULL list\n", __func__);
@@ -7012,11 +7012,8 @@ void wlc_bss_list_free(struct wlc_info *wlc, wlc_bss_list_t *bss_list)
        }
        /* inspect all BSS descriptor */
        for (index = 0; index < bss_list->count; index++) {
-               bi = bss_list->ptrs[index];
-               if (bi) {
-                       kfree(bi);
-                       bss_list->ptrs[index] = NULL;
-               }
+               kfree(bss_list->ptrs[index]);
+               bss_list->ptrs[index] = NULL;
        }
        bss_list->count = 0;
 }
@@ -8322,7 +8319,8 @@ void wlc_ht_mimops_cap_update(struct wlc_info *wlc, u8 mimops_mode)
 
 /* check for the particular priority flow control bit being set */
 bool
-wlc_txflowcontrol_prio_isset(struct wlc_info *wlc, wlc_txq_info_t *q, int prio)
+wlc_txflowcontrol_prio_isset(struct wlc_info *wlc, struct wlc_txq_info *q,
+                            int prio)
 {
        uint prio_mask;
 
@@ -8337,7 +8335,7 @@ wlc_txflowcontrol_prio_isset(struct wlc_info *wlc, wlc_txq_info_t *q, int prio)
 }
 
 /* propogate the flow control to all interfaces using the given tx queue */
-void wlc_txflowcontrol(struct wlc_info *wlc, wlc_txq_info_t *qi,
+void wlc_txflowcontrol(struct wlc_info *wlc, struct wlc_txq_info *qi,
                       bool on, int prio)
 {
        uint prio_bits;
@@ -8380,8 +8378,8 @@ void wlc_txflowcontrol(struct wlc_info *wlc, wlc_txq_info_t *qi,
 }
 
 void
-wlc_txflowcontrol_override(struct wlc_info *wlc, wlc_txq_info_t *qi, bool on,
-                          uint override)
+wlc_txflowcontrol_override(struct wlc_info *wlc, struct wlc_txq_info *qi,
+                          bool on, uint override)
 {
        uint prev_override;
 
@@ -8429,7 +8427,7 @@ wlc_txflowcontrol_override(struct wlc_info *wlc, wlc_txq_info_t *qi, bool on,
 
 static void wlc_txflowcontrol_reset(struct wlc_info *wlc)
 {
-       wlc_txq_info_t *qi;
+       struct wlc_txq_info *qi;
 
        for (qi = wlc->tx_queues; qi != NULL; qi = qi->next) {
                if (qi->stopped) {
@@ -8440,7 +8438,7 @@ static void wlc_txflowcontrol_reset(struct wlc_info *wlc)
 }
 
 static void
-wlc_txflowcontrol_signal(struct wlc_info *wlc, wlc_txq_info_t *qi, bool on,
+wlc_txflowcontrol_signal(struct wlc_info *wlc, struct wlc_txq_info *qi, bool on,
                         int prio)
 {
        struct wlc_if *wlcif;
@@ -8451,40 +8449,40 @@ wlc_txflowcontrol_signal(struct wlc_info *wlc, wlc_txq_info_t *qi, bool on,
        }
 }
 
-static wlc_txq_info_t *wlc_txq_alloc(struct wlc_info *wlc, struct osl_info *osh)
+static struct wlc_txq_info *wlc_txq_alloc(struct wlc_info *wlc,
+                                         struct osl_info *osh)
 {
-       wlc_txq_info_t *qi, *p;
-
-       qi = (wlc_txq_info_t *) wlc_calloc(osh, wlc->pub->unit,
-                                          sizeof(wlc_txq_info_t));
-       if (qi == NULL) {
-               return NULL;
-       }
+       struct wlc_txq_info *qi, *p;
 
-       /* Have enough room for control packets along with HI watermark */
-       /* Also, add room to txq for total psq packets if all the SCBs leave PS mode */
-       /* The watermark for flowcontrol to OS packets will remain the same */
-       pktq_init(&qi->q, WLC_PREC_COUNT,
-                 (2 * wlc->pub->tunables->datahiwat) + PKTQ_LEN_DEFAULT +
-                 wlc->pub->psq_pkts_total);
-
-       /* add this queue to the the global list */
-       p = wlc->tx_queues;
-       if (p == NULL) {
-               wlc->tx_queues = qi;
-       } else {
-               while (p->next != NULL)
-                       p = p->next;
-               p->next = qi;
+       qi = wlc_calloc(osh, wlc->pub->unit, sizeof(struct wlc_txq_info));
+       if (qi != NULL) {
+               /*
+                * Have enough room for control packets along with HI watermark
+                * Also, add room to txq for total psq packets if all the SCBs
+                * leave PS mode. The watermark for flowcontrol to OS packets
+                * will remain the same
+                */
+               pktq_init(&qi->q, WLC_PREC_COUNT,
+                         (2 * wlc->pub->tunables->datahiwat) + PKTQ_LEN_DEFAULT
+                         + wlc->pub->psq_pkts_total);
+
+               /* add this queue to the the global list */
+               p = wlc->tx_queues;
+               if (p == NULL) {
+                       wlc->tx_queues = qi;
+               } else {
+                       while (p->next != NULL)
+                               p = p->next;
+                       p->next = qi;
+               }
        }
-
        return qi;
 }
 
 static void wlc_txq_free(struct wlc_info *wlc, struct osl_info *osh,
-                        wlc_txq_info_t *qi)
+                        struct wlc_txq_info *qi)
 {
-       wlc_txq_info_t *p;
+       struct wlc_txq_info *p;
 
        if (qi == NULL)
                return;
index 3914e2b18fa48a21e006395c3e12942d028f1535..6ddb2baf28576021e75aa1af803bef429dd3847a 100644 (file)
 #define TXOFF (D11_TXH_LEN + D11_PHY_HDR_LEN)
 
 /* For managing scan result lists */
-typedef struct wlc_bss_list {
+struct wlc_bss_list {
        uint count;
        bool beacon;            /* set for beacon, cleared for probe response */
        wlc_bss_info_t *ptrs[MAXBSS];
-} wlc_bss_list_t;
+};
 
 #define        SW_TIMER_MAC_STAT_UPD           30      /* periodic MAC stats update */
 
@@ -200,7 +200,7 @@ extern const u8 prio2fifo[];
 
 #define WLCWLUNIT(wlc)         ((wlc)->pub->unit)
 
-typedef struct wlc_protection {
+struct wlc_protection {
        bool _g;                /* use g spec protection, driver internal */
        s8 g_override;  /* override for use of g spec protection */
        u8 gmode_user;  /* user config gmode, operating band->gmode is different */
@@ -225,10 +225,10 @@ typedef struct wlc_protection {
        uint ht20in40_ovlp_timeout;     /* #sec until 20MHz overlapping OPMODE gone */
        uint ht20in40_ibss_timeout;     /* #sec until 20MHz-only HT station bcns gone */
        uint non_gf_ibss_timeout;       /* #sec until non-GF bcns gone */
-} wlc_protection_t;
+};
 
 /* anything affects the single/dual streams/antenna operation */
-typedef struct wlc_stf {
+struct wlc_stf {
        u8 hw_txchain;  /* HW txchain bitmap cfg */
        u8 txchain;             /* txchain bitmap being used */
        u8 txstreams;   /* number of txchains being used */
@@ -252,7 +252,7 @@ typedef struct wlc_stf {
        s8 ldpc;                /* AUTO/ON/OFF ldpc cap supported */
        u8 txcore[MAX_STREAMS_SUPPORTED + 1];   /* bitmap of selected core for each Nsts */
        s8 spatial_policy;
-} wlc_stf_t;
+};
 
 #define WLC_STF_SS_STBC_TX(wlc, scb) \
        (((wlc)->stf->txstreams > 1) && (((wlc)->band->band_stf_stbc_tx == ON) || \
@@ -330,15 +330,15 @@ struct wlcband {
 /* tx completion callback takes 3 args */
 typedef void (*pkcb_fn_t) (struct wlc_info *wlc, uint txstatus, void *arg);
 
-typedef struct pkt_cb {
+struct pkt_cb {
        pkcb_fn_t fn;           /* function to call when tx frame completes */
        void *arg;              /* void arg for fn */
        u8 nextidx;             /* index of next call back if threading */
        bool entered;           /* recursion check */
-} pkt_cb_t;
+};
 
-       /* module control blocks */
-typedef struct modulecb {
+/* module control blocks */
+struct modulecb {
        char name[32];          /* module name : NULL indicates empty array member */
        const bcm_iovar_t *iovars;      /* iovar table */
        void *hdl;              /* handle passed when handler 'doiovar' is called */
@@ -349,15 +349,15 @@ typedef struct modulecb {
                                 * number of timers that could not be
                                 * freed.
                                 */
-} modulecb_t;
+};
 
-       /* dump control blocks */
-typedef struct dumpcb_s {
+/* dump control blocks */
+struct dumpcb_s {
        const char *name;       /* dump name */
        dump_fn_t dump_fn;      /* 'wl dump' handler */
        void *dump_fn_arg;
        struct dumpcb_s *next;
-} dumpcb_t;
+};
 
 /* virtual interface */
 struct wlc_if {
@@ -379,7 +379,7 @@ struct wlc_if {
 /* flags for the interface */
 #define WLC_IF_LINKED          0x02    /* this interface is linked to a wl_if */
 
-typedef struct wlc_hwband {
+struct wlc_hwband {
        int bandtype;           /* WLC_BAND_2G, WLC_BAND_5G */
        uint bandunit;          /* bandstate[] index */
        u16 mhfs[MHFMAX];       /* MHF array shadow */
@@ -394,7 +394,7 @@ typedef struct wlc_hwband {
        u16 radiorev;
        wlc_phy_t *pi;          /* pointer to phy specific information */
        bool abgphy_encore;
-} wlc_hwband_t;
+};
 
 struct wlc_hw_info {
        struct osl_info *osh;           /* pointer to os handle */
@@ -424,8 +424,8 @@ struct wlc_hw_info {
        d11regs_t *regs;        /* pointer to device registers */
        void *physhim;          /* phy shim layer handler */
        void *phy_sh;           /* pointer to shared phy state */
-       wlc_hwband_t *band;     /* pointer to active per-band state */
-       wlc_hwband_t *bandstate[MAXBANDS];      /* per-band state (one per phy/radio) */
+       struct wlc_hwband *band;/* pointer to active per-band state */
+       struct wlc_hwband *bandstate[MAXBANDS];/* band state per phy/radio */
        u16 bmac_phytxant;      /* cache of high phytxant state */
        bool shortslot;         /* currently using 11g ShortSlot timing */
        u16 SRL;                /* 802.11 dot11ShortRetryLimit */
@@ -478,11 +478,11 @@ struct wlc_hw_info {
  * if they belong to the same flow of traffic from the device. For multi-channel
  * operation there are independent TX Queues for each channel.
  */
-typedef struct wlc_txq_info {
+struct wlc_txq_info {
        struct wlc_txq_info *next;
        struct pktq q;
        uint stopped;           /* tx flow control bits */
-} wlc_txq_info_t;
+};
 
 /*
  * Principal common (os-independent) software data structure.
@@ -634,7 +634,7 @@ struct wlc_info {
        bool bcmcfifo_drain;    /* TX_BCMC_FIFO is set to drain */
 
        /* tx queue */
-       wlc_txq_info_t *tx_queues;      /* common TX Queue list */
+       struct wlc_txq_info *tx_queues; /* common TX Queue list */
 
        /* security */
        wsec_key_t *wsec_keys[WSEC_MAX_KEYS];   /* dynamic key storage */
@@ -642,8 +642,8 @@ struct wlc_info {
        bool wsec_swkeys;       /* indicates that all keys should be
                                 * treated as sw keys (used for debugging)
                                 */
-       modulecb_t *modulecb;
-       dumpcb_t *dumpcb_head;
+       struct modulecb *modulecb;
+       struct dumpcb_s *dumpcb_head;
 
        u8 mimoft;              /* SIGN or 11N */
        u8 mimo_band_bwcap;     /* bw cap per band type */
@@ -710,12 +710,12 @@ struct wlc_info {
        bool ignore_bcns;       /* override: ignore non shortslot bcns in a 11g network */
        bool legacy_probe;      /* restricts probe requests to CCK rates */
 
-       wlc_protection_t *protection;
+       struct wlc_protection *protection;
        s8 PLCPHdr_override;    /* 802.11b Preamble Type override */
 
-       wlc_stf_t *stf;
+       struct wlc_stf *stf;
 
-       pkt_cb_t *pkt_callback; /* tx completion callback handlers */
+       struct pkt_cb *pkt_callback;    /* tx completion callback handlers */
 
        u32 txretried;  /* tx retried number in one msdu */
 
@@ -747,7 +747,9 @@ struct wlc_info {
        u16 next_bsscfg_ID;
 
        struct wlc_if *wlcif_list;      /* linked list of wlc_if structs */
-       wlc_txq_info_t *active_queue;   /* txq for the currently active transmit context */
+       struct wlc_txq_info *active_queue; /* txq for the currently active
+                                           * transmit context
+                                           */
        u32 mpc_dur;            /* total time (ms) in mpc mode except for the
                                 * portion since radio is turned off last time
                                 */
@@ -852,13 +854,14 @@ extern int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config);
 extern void wlc_mac_bcn_promisc_change(struct wlc_info *wlc, bool promisc);
 extern void wlc_mac_bcn_promisc(struct wlc_info *wlc);
 extern void wlc_mac_promisc(struct wlc_info *wlc);
-extern void wlc_txflowcontrol(struct wlc_info *wlc, wlc_txq_info_t *qi, bool on,
-                             int prio);
-extern void wlc_txflowcontrol_override(struct wlc_info *wlc, wlc_txq_info_t *qi,
+extern void wlc_txflowcontrol(struct wlc_info *wlc, struct wlc_txq_info *qi,
+                             bool on, int prio);
+extern void wlc_txflowcontrol_override(struct wlc_info *wlc,
+                                      struct wlc_txq_info *qi,
                                       bool on, uint override);
 extern bool wlc_txflowcontrol_prio_isset(struct wlc_info *wlc,
-                                        wlc_txq_info_t *qi, int prio);
-extern void wlc_send_q(struct wlc_info *wlc, wlc_txq_info_t *qi);
+                                        struct wlc_txq_info *qi, int prio);
+extern void wlc_send_q(struct wlc_info *wlc, struct wlc_txq_info *qi);
 extern int wlc_prep_pdu(struct wlc_info *wlc, struct sk_buff *pdu, uint *fifo);
 
 extern u16 wlc_calc_lsig_len(struct wlc_info *wlc, ratespec_t ratespec,
@@ -958,6 +961,7 @@ extern bool wlc_ps_allowed(struct wlc_info *wlc);
 extern bool wlc_stay_awake(struct wlc_info *wlc);
 extern void wlc_wme_initparams_sta(struct wlc_info *wlc, wme_param_ie_t *pe);
 
-extern void wlc_bss_list_free(struct wlc_info *wlc, wlc_bss_list_t *bss_list);
+extern void wlc_bss_list_free(struct wlc_info *wlc,
+                             struct wlc_bss_list *bss_list);
 extern void wlc_ht_mimops_cap_update(struct wlc_info *wlc, u8 mimops_mode);
 #endif                         /* _wlc_h_ */