---

yaml
---
r: 268360
b: refs/heads/master
c: 7be8a00
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e046da4fd91f203899261dcf6bc7c2d997398dec
+refs/heads/master: 7be8a00e1c577f2be9376161d278a78425284225

trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c

@@ -510,7 +510,7 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
 		/* retrieve the current rates */
 		LOCK(wl);
 		error = brcms_c_ioctl(wl->wlc, BRCM_GET_CURR_RATESET,
-				  &rs, sizeof(rs), NULL);
+				  &rs, sizeof(rs));
 		UNLOCK(wl);
 		if (error) {
 			wiphy_err(wiphy, "%s: retrieve rateset failed: %d\n",
@@ -530,7 +530,7 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
 
 		/* update the rate set */
 		LOCK(wl);
-		brcms_c_ioctl(wl->wlc, BRCM_SET_RATESET, &rs, sizeof(rs), NULL);
+		brcms_c_ioctl(wl->wlc, BRCM_SET_RATESET, &rs, sizeof(rs));
 		UNLOCK(wl);
 	}
 	if (changed & BSS_CHANGED_BEACON_INT) {

trunk/drivers/staging/brcm80211/brcmsmac/main.c

@@ -6060,13 +6060,13 @@ brcms_c_set_rateset(struct brcms_c_info *wlc, struct brcms_c_rateset *rs_arg)
 /* simplified integer set interface for common ioctl handler */
 int brcms_c_set(struct brcms_c_info *wlc, int cmd, int arg)
 {
-	return brcms_c_ioctl(wlc, cmd, (void *)&arg, sizeof(arg), NULL);
+	return brcms_c_ioctl(wlc, cmd, (void *)&arg, sizeof(arg));
 }
 
 /* simplified integer get interface for common ioctl handler */
 int brcms_c_get(struct brcms_c_info *wlc, int cmd, int *arg)
 {
-	return brcms_c_ioctl(wlc, cmd, arg, sizeof(int), NULL);
+	return brcms_c_ioctl(wlc, cmd, arg, sizeof(int));
 }
 
 static void brcms_c_ofdm_rateset_war(struct brcms_c_info *wlc)
@@ -6086,8 +6086,7 @@ static void brcms_c_ofdm_rateset_war(struct brcms_c_info *wlc)
 
 /* common ioctl handler. return: 0=ok, -1=error, positive=particular error */
 static int
-_brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
-	       struct brcms_c_if *wlcif)
+_brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len)
 {
 	int val, *pval;
 	bool bool_val;
@@ -6335,10 +6334,9 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
 }
 
 int
-brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
-	      struct brcms_c_if *wlcif)
+brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len)
 {
-	return _brcms_c_ioctl(wlc, cmd, arg, len, wlcif);
+	return _brcms_c_ioctl(wlc, cmd, arg, len);
 }
 
 /*

trunk/drivers/staging/brcm80211/brcmsmac/main.h

@@ -320,8 +320,7 @@ struct modulecb {
 	 */
 	int (*iovar_fn)(void *handle, const struct brcmu_iovar *vi,
 			u32 actionid, const char *name, void *params,
-			uint plen, void *arg, int alen, int vsize,
-			struct brcms_c_if *wlcif);
+			uint plen, void *arg, int alen, int vsize);
 
 	int (*down_fn)(void *handle); /* down handler. Note: the int returned
 				       * by the down function is a count of the
@@ -347,25 +346,6 @@ struct wme_param_ie {
 	struct edcf_acparam acparam[AC_COUNT];
 } __packed;
 
-/* virtual interface */
-struct brcms_c_if {
-	struct brcms_c_if *next;
-	u8 type;	/* BSS or WDS */
-	u8 index;	/* assigned in wl_add_if(), index of the wlif if any,
-			 * not necessarily corresponding to bsscfg._idx or
-			 * AID2PVBMAP(scb).
-			 */
-	u8 flags;		/* flags for the interface */
-	struct brcms_if *wlif;		/* pointer to wlif */
-	struct brcms_txq_info *qi;	/* pointer to associated tx queue */
-	union {
-		/* pointer to scb if WDS */
-		struct scb *scb;
-		/* pointer to bsscfg if BSS */
-		struct brcms_bss_cfg *bsscfg;
-	} u;
-};
-
 struct brcms_hw_band {
 	int bandtype;		/* BRCM_BAND_2G, BRCM_BAND_5G */
 	uint bandunit;		/* bandstate[] index */

trunk/drivers/staging/brcm80211/brcmsmac/pub.h

@@ -327,8 +327,7 @@ extern bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded);
 extern void brcms_c_sendpkt_mac80211(struct brcms_c_info *wlc,
 				     struct sk_buff *sdu,
 				     struct ieee80211_hw *hw);
-extern int brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
-			 struct brcms_c_if *wlcif);
+extern int brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len);
 extern bool brcms_c_aggregatable(struct brcms_c_info *wlc, u8 tid);
 
 /* helper functions */

trunk/drivers/staging/brcm80211/brcmsmac/types.h

@@ -334,7 +334,6 @@ struct ieee80211_tx_queue_params;
 struct brcms_info;
 struct brcms_c_info;
 struct brcms_hardware;
-struct brcms_c_if;
 struct brcmu_strbuf;
 struct brcms_txq_info;
 struct brcms_band;