---

yaml
---
r: 228309
b: refs/heads/master
c: 4dc79de
h: refs/heads/master
i:
  228307: e2ee398
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41224eb2dfe76fffc95cf9613c5bb2f4a518ddbf
+refs/heads/master: 4dc79de1e39957575a784cf79bb214e54a42d44e

trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c

@@ -8384,7 +8384,7 @@ static void
 wlc_txflowcontrol_signal(struct wlc_info *wlc, wlc_txq_info_t *qi, bool on,
 			 int prio)
 {
-	wlc_if_t *wlcif;
+	struct wlc_if *wlcif;
 
 	for (wlcif = wlc->wlcif_list; wlcif != NULL; wlcif = wlcif->next) {
 		if (wlcif->qi == qi && wlcif->flags & WLC_IF_LINKED)

trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h

@@ -383,7 +383,7 @@ typedef struct dumpcb_s {
 
 /* virtual interface */
 struct wlc_if {
-	wlc_if_t *next;
+	struct wlc_if *next;
 	u8 type;		/* WLC_IFTYPE_BSS or WLC_IFTYPE_WDS */
 	u8 index;		/* assigned in wl_add_if(), index of the wlif if any,
 				 * not necessarily corresponding to bsscfg._idx or
@@ -768,7 +768,7 @@ struct wlc_info {
 
 	u16 next_bsscfg_ID;
 
-	wlc_if_t *wlcif_list;	/* linked list of wlc_if structs */
+	struct wlc_if *wlcif_list;	/* linked list of wlc_if structs */
 	wlc_txq_info_t *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
@@ -946,7 +946,7 @@ extern const bcm_iovar_t wlc_iovars[];
 
 extern int wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid,
 		       const char *name, void *params, uint p_len, void *arg,
-		       int len, int val_size, wlc_if_t *wlcif);
+		       int len, int val_size, struct wlc_if *wlcif);
 
 #if defined(BCMDBG)
 extern void wlc_print_ies(struct wlc_info *wlc, u8 *ies, uint ies_len);

trunk/drivers/staging/brcm80211/sys/wlc_pub.h

@@ -510,8 +510,8 @@ extern void wlc_intrsrestore(struct wlc_info *wlc, u32 macintmask);
 extern bool wlc_intrsupd(struct wlc_info *wlc);
 extern bool wlc_isr(struct wlc_info *wlc, bool *wantdpc);
 extern bool wlc_dpc(struct wlc_info *wlc, bool bounded);
-extern bool wlc_send80211_raw(struct wlc_info *wlc, wlc_if_t *wlcif, void *p,
-			      uint ac);
+extern bool wlc_send80211_raw(struct wlc_info *wlc, struct wlc_if *wlcif,
+			      void *p, uint ac);
 extern bool wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu,
 				 struct ieee80211_hw *hw);
 extern int wlc_iovar_op(struct wlc_info *wlc, const char *name, void *params,

trunk/drivers/staging/brcm80211/sys/wlc_types.h

@@ -21,7 +21,7 @@
 
 struct wlc_info;
 struct wlc_hw_info;
-typedef struct wlc_if wlc_if_t;
+struct wlc_if;
 typedef struct wl_if wl_if_t;
 typedef struct ampdu_info ampdu_info_t;
 typedef struct wlc_ap_info wlc_ap_info_t;