Staging: brcm80211: s/int8/s8/

This changes the usage everywhere in the driver, and removes
the definition as it should no longer be used anywhere.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

10 files changed, 77 insertions, 77 deletions

diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c
index 725b3a9..1d68400 100644
--- a/drivers/staging/brcm80211/sys/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c
@@ -112,7 +112,7 @@ struct ampdu_info {
 	/* per-tid mpdu transmit retry limit at regular rate */
 	u8 rr_retry_limit_tid[AMPDU_MAX_SCB_TID];
 	u8 mpdu_density;	/* min mpdu spacing (0-7) ==> 2^(x-1)/8 usec */
-	int8 max_pdu;		/* max pdus allowed in ampdu */
+	s8 max_pdu;		/* max pdus allowed in ampdu */
 	u8 dur;		/* max duration of an ampdu (in msec) */
 	u8 txpkt_weight;	/* weight of ampdu in txfifo; reduces rate lag */
 	u8 rx_factor;	/* maximum rx ampdu factor (0-3) ==> 2^(13+x) bytes */
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.h b/drivers/staging/brcm80211/sys/wlc_bmac.h
index db6ab2a..05fc15a 100644
--- a/drivers/staging/brcm80211/sys/wlc_bmac.h
+++ b/drivers/staging/brcm80211/sys/wlc_bmac.h
@@ -200,7 +200,7 @@ extern void wlc_bmac_copyfrom_vars(wlc_hw_info_t *wlc_hw, char **buf,
 				   uint *len);
 
 extern void wlc_bmac_process_ps_switch(wlc_hw_info_t *wlc,
-				       struct ether_addr *ea, int8 ps_on);
+				       struct ether_addr *ea, s8 ps_on);
 extern void wlc_bmac_hw_etheraddr(wlc_hw_info_t *wlc_hw,
 				  struct ether_addr *ea);
 extern void wlc_bmac_set_hw_etheraddr(wlc_hw_info_t *wlc_hw,
diff --git a/drivers/staging/brcm80211/sys/wlc_bsscfg.h b/drivers/staging/brcm80211/sys/wlc_bsscfg.h
index 917a659..9fd6788 100644
--- a/drivers/staging/brcm80211/sys/wlc_bsscfg.h
+++ b/drivers/staging/brcm80211/sys/wlc_bsscfg.h
@@ -56,7 +56,7 @@ struct wlc_bsscfg {
 	bool _ap;		/* is this configuration an AP */
 	struct wlc_if *wlcif;	/* virtual interface, NULL for primary bsscfg */
 	void *sup;		/* pointer to supplicant state */
-	int8 sup_type;		/* type of supplicant */
+	s8 sup_type;		/* type of supplicant */
 	bool sup_enable_wpa;	/* supplicant WPA on/off */
 	void *authenticator;	/* pointer to authenticator state */
 	bool sup_auth_pending;	/* flag for auth timeout */
@@ -64,7 +64,7 @@ struct wlc_bsscfg {
 	u8 SSID_len;		/* the length of SSID */
 	u8 SSID[DOT11_MAX_SSID_LEN];	/* SSID string */
 	struct scb *bcmc_scb[MAXBANDS];	/* one bcmc_scb per band */
-	int8 _idx;		/* the index of this bsscfg,
+	s8 _idx;		/* the index of this bsscfg,
 				 * assigned at wlc_bsscfg_alloc()
 				 */
 	/* MAC filter */
diff --git a/drivers/staging/brcm80211/sys/wlc_channel.h b/drivers/staging/brcm80211/sys/wlc_channel.h
index e5333bb..e4fc1b8 100644
--- a/drivers/staging/brcm80211/sys/wlc_channel.h
+++ b/drivers/staging/brcm80211/sys/wlc_channel.h
@@ -57,8 +57,8 @@ typedef struct {
 	uint32 valid_channels;
 	u8 radar_channels;	/* List of radar sensitive channels */
 	u8 restricted_channels;	/* List of channels used only if APs are detected */
-	int8 maxpwr[WLC_MAXPWR_TBL_SIZE];	/* Max tx pwr in qdBm for each sub-band */
-	int8 pub_maxpwr[BAND_5G_PWR_LVLS];	/* Country IE advertised max tx pwr in dBm
+	s8 maxpwr[WLC_MAXPWR_TBL_SIZE];	/* Max tx pwr in qdBm for each sub-band */
+	s8 pub_maxpwr[BAND_5G_PWR_LVLS];	/* Country IE advertised max tx pwr in dBm
 						 * per sub-band
 						 */
 	u8 flags;
@@ -82,8 +82,8 @@ typedef struct {
  * by sub-band for 5 GHz limits using CHANNEL_POWER_IDX_5G(channel)
  */
 typedef struct {
-	int8 maxpwr20[WLC_MAXPWR_MIMO_TBL_SIZE];	/* tx 20 MHz power limits, qdBm units */
-	int8 maxpwr40[WLC_MAXPWR_MIMO_TBL_SIZE];	/* tx 40 MHz power limits, qdBm units */
+	s8 maxpwr20[WLC_MAXPWR_MIMO_TBL_SIZE];	/* tx 20 MHz power limits, qdBm units */
+	s8 maxpwr40[WLC_MAXPWR_MIMO_TBL_SIZE];	/* tx 40 MHz power limits, qdBm units */
 	u8 flags;
 } locale_mimo_info_t;
 
diff --git a/drivers/staging/brcm80211/sys/wlc_key.h b/drivers/staging/brcm80211/sys/wlc_key.h
index ae98d7c..3a9624a 100644
--- a/drivers/staging/brcm80211/sys/wlc_key.h
+++ b/drivers/staging/brcm80211/sys/wlc_key.h
@@ -95,8 +95,8 @@ typedef struct wsec_key {
 	uint16 flags;		/* misc flags */
 	u8 algo_hw;		/* cache for hw register */
 	u8 aes_mode;		/* cache for hw register */
-	int8 iv_len;		/* IV length */
-	int8 icv_len;		/* ICV length */
+	s8 iv_len;		/* IV length */
+	s8 icv_len;		/* ICV length */
 	uint32 len;		/* key length..don't move this var */
 	/* data is 4byte aligned */
 	u8 data[DOT11_MAX_KEY_SIZE];	/* key data */
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 3b9b8e6..9b713d3 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -311,7 +311,7 @@ static uint wlc_calc_ba_time(wlc_info_t *wlc, ratespec_t rate,
 static void wlc_update_mimo_band_bwcap(wlc_info_t *wlc, u8 bwcap);
 static void wlc_ht_update_sgi_rx(wlc_info_t *wlc, int val);
 void wlc_ht_mimops_cap_update(wlc_info_t *wlc, u8 mimops_mode);
-static void wlc_ht_update_ldpc(wlc_info_t *wlc, int8 val);
+static void wlc_ht_update_ldpc(wlc_info_t *wlc, s8 val);
 static void wlc_war16165(wlc_info_t *wlc, bool tx);
 
 static void wlc_process_eventq(void *arg);
@@ -1179,31 +1179,31 @@ void wlc_protection_upd(wlc_info_t *wlc, uint idx, int val)
 		wlc->protection->_g = (bool) val;
 		break;
 	case WLC_PROT_G_OVR:
-		wlc->protection->g_override = (int8) val;
+		wlc->protection->g_override = (s8) val;
 		break;
 	case WLC_PROT_G_USER:
 		wlc->protection->gmode_user = (u8) val;
 		break;
 	case WLC_PROT_OVERLAP:
-		wlc->protection->overlap = (int8) val;
+		wlc->protection->overlap = (s8) val;
 		break;
 	case WLC_PROT_N_USER:
-		wlc->protection->nmode_user = (int8) val;
+		wlc->protection->nmode_user = (s8) val;
 		break;
 	case WLC_PROT_N_CFG:
-		wlc->protection->n_cfg = (int8) val;
+		wlc->protection->n_cfg = (s8) val;
 		break;
 	case WLC_PROT_N_CFG_OVR:
-		wlc->protection->n_cfg_override = (int8) val;
+		wlc->protection->n_cfg_override = (s8) val;
 		break;
 	case WLC_PROT_N_NONGF:
 		wlc->protection->nongf = (bool) val;
 		break;
 	case WLC_PROT_N_NONGF_OVR:
-		wlc->protection->nongf_override = (int8) val;
+		wlc->protection->nongf_override = (s8) val;
 		break;
 	case WLC_PROT_N_PAM_OVR:
-		wlc->protection->n_pam_override = (int8) val;
+		wlc->protection->n_pam_override = (s8) val;
 		break;
 	case WLC_PROT_N_OBSS:
 		wlc->protection->n_obss = (bool) val;
@@ -1228,7 +1228,7 @@ static void wlc_ht_update_sgi_rx(wlc_info_t *wlc, int val)
 	}
 }
 
-static void wlc_ht_update_ldpc(wlc_info_t *wlc, int8 val)
+static void wlc_ht_update_ldpc(wlc_info_t *wlc, s8 val)
 {
 	wlc->stf->ldpc = val;
 
@@ -1706,7 +1706,7 @@ static bool wlc_state_bmac_sync(wlc_info_t *wlc)
 
 	wlc->machwcap = state_bmac.machwcap;
 	wlc_protection_upd(wlc, WLC_PROT_N_PAM_OVR,
-			   (int8) state_bmac.preamble_ovr);
+			   (s8) state_bmac.preamble_ovr);
 
 	return TRUE;
 }
@@ -2085,7 +2085,7 @@ static void BCMNMIATTACHFN(wlc_attach_antgain_init) (wlc_info_t *wlc)
 		WL_ERROR(("wl%d: %s: Invalid antennas available in srom, using 2dB\n", unit, __func__));
 		wlc->band->antgain = 8;
 	} else {
-		int8 gain, fract;
+		s8 gain, fract;
 		/* Older sroms specified gain in whole dbm only.  In order
 		 * be able to specify qdbm granularity and remain backward compatible
 		 * the whole dbms are now encoded in only low 6 bits and remaining qdbms
@@ -2116,9 +2116,9 @@ static bool BCMATTACHFN(wlc_attach_stf_ant_init) (wlc_info_t *wlc)
 	bandtype = wlc->band->bandtype;
 
 	/* get antennas available */
-	aa = (int8) getintvar(vars, (BAND_5G(bandtype) ? "aa5g" : "aa2g"));
+	aa = (s8) getintvar(vars, (BAND_5G(bandtype) ? "aa5g" : "aa2g"));
 	if (aa == 0)
-		aa = (int8) getintvar(vars,
+		aa = (s8) getintvar(vars,
 				      (BAND_5G(bandtype) ? "aa1" : "aa0"));
 	if ((aa < 1) || (aa > 15)) {
 		WL_ERROR(("wl%d: %s: Invalid antennas available in srom (0x%x), using 3.\n", unit, __func__, aa));
@@ -2137,7 +2137,7 @@ static bool BCMATTACHFN(wlc_attach_stf_ant_init) (wlc_info_t *wlc)
 
 	/* Compute Antenna Gain */
 	wlc->band->antgain =
-	    (int8) getintvar(vars, (BAND_5G(bandtype) ? "ag1" : "ag0"));
+	    (s8) getintvar(vars, (BAND_5G(bandtype) ? "ag1" : "ag0"));
 	wlc_attach_antgain_init(wlc);
 
 	return TRUE;
@@ -2962,7 +2962,7 @@ int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config)
 	uint i;
 	wlc_rateset_t rs;
 	/* Default to 54g Auto */
-	int8 shortslot = WLC_SHORTSLOT_AUTO;	/* Advertise and use shortslot (-1/0/1 Auto/Off/On) */
+	s8 shortslot = WLC_SHORTSLOT_AUTO;	/* Advertise and use shortslot (-1/0/1 Auto/Off/On) */
 	bool shortslot_restrict = FALSE;	/* Restrict association to stations that support shortslot
 						 */
 	bool ignore_bcns = TRUE;	/* Ignore legacy beacons on the same channel */
@@ -3578,11 +3578,11 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 		break;
 
 	case WLC_SET_TXANT:
-		bcmerror = wlc_stf_ant_txant_validate(wlc, (int8) val);
+		bcmerror = wlc_stf_ant_txant_validate(wlc, (s8) val);
 		if (bcmerror < 0)
 			break;
 
-		wlc->stf->txant = (int8) val;
+		wlc->stf->txant = (s8) val;
 
 		/* if down, we are done */
 		if (!wlc->pub->up)
@@ -4137,7 +4137,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 			break;
 		}
 
-		wlc->shortslot_override = (int8) val;
+		wlc->shortslot_override = (s8) val;
 
 		/* shortslot is an 11g feature, so no more work if we are
 		 * currently on the 5G band
@@ -4211,7 +4211,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 			break;
 		}
 
-		wlc_protection_upd(wlc, WLC_PROT_OVERLAP, (int8) val);
+		wlc_protection_upd(wlc, WLC_PROT_OVERLAP, (s8) val);
 
 		/* Current g_protection will sync up to the specified control alg in watchdog
 		 * if the driver is up and associated.
@@ -4230,7 +4230,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 			break;
 		}
 
-		wlc_protection_upd(wlc, WLC_PROT_G_OVR, (int8) val);
+		wlc_protection_upd(wlc, WLC_PROT_G_OVR, (s8) val);
 
 		break;
 
@@ -4381,13 +4381,13 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 			if (cmd == WLC_GET_VAR) {
 				bcmerror =
 				    wlc_iovar_op(wlc, arg,
-						 (void *)((int8 *) arg + i),
+						 (void *)((s8 *) arg + i),
 						 len - i, arg, len, IOV_GET,
 						 wlcif);
 			} else
 				bcmerror =
 				    wlc_iovar_op(wlc, arg, NULL, 0,
-						 (void *)((int8 *) arg + i),
+						 (void *)((s8 *) arg + i),
 						 len - i, IOV_SET, wlcif);
 
 			break;
@@ -4500,8 +4500,8 @@ int wlc_iovar_setint(wlc_info_t *wlc, const char *name, int arg)
 			    IOV_SET, NULL);
 }
 
-/* simplified int8 get interface for common WLC_GET_VAR ioctl handler */
-int wlc_iovar_getint8(wlc_info_t *wlc, const char *name, int8 *arg)
+/* simplified s8 get interface for common WLC_GET_VAR ioctl handler */
+int wlc_iovar_gets8(wlc_info_t *wlc, const char *name, s8 *arg)
 {
 	int iovar_int;
 	int err;
@@ -4510,7 +4510,7 @@ int wlc_iovar_getint8(wlc_info_t *wlc, const char *name, int8 *arg)
 	    wlc_iovar_op(wlc, name, NULL, 0, &iovar_int, sizeof(iovar_int),
 			 IOV_GET, NULL);
 	if (!err)
-		*arg = (int8) iovar_int;
+		*arg = (s8) iovar_int;
 
 	return err;
 }
@@ -5456,7 +5456,7 @@ bcmc_fid_generate(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg, d11txh_t *txh)
 }
 
 void BCMFASTPATH
-wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit, int8 txpktpend)
+wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit, s8 txpktpend)
 {
 	uint16 frameid = INVALIDFID;
 	d11txh_t *txh;
@@ -6925,7 +6925,7 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, uint32 frm_tx2)
 }
 
 void BCMFASTPATH
-wlc_txfifo_complete(wlc_info_t *wlc, uint fifo, int8 txpktpend)
+wlc_txfifo_complete(wlc_info_t *wlc, uint fifo, s8 txpktpend)
 {
 	TXPKTPENDDEC(wlc, fifo, txpktpend);
 	WL_TRACE(("wlc_txfifo_complete, pktpend dec %d to %d\n", txpktpend,
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h
index effdb26..0b5c41f 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.h
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.h
@@ -230,15 +230,15 @@ extern const u8 prio2fifo[];
 
 typedef struct wlc_protection {
 	bool _g;		/* use g spec protection, driver internal */
-	int8 g_override;	/* override for use of g spec protection */
+	s8 g_override;	/* override for use of g spec protection */
 	u8 gmode_user;	/* user config gmode, operating band->gmode is different */
-	int8 overlap;		/* Overlap BSS/IBSS protection for both 11g and 11n */
-	int8 nmode_user;	/* user config nmode, operating pub->nmode is different */
-	int8 n_cfg;		/* use OFDM protection on MIMO frames */
-	int8 n_cfg_override;	/* override for use of N protection */
+	s8 overlap;		/* Overlap BSS/IBSS protection for both 11g and 11n */
+	s8 nmode_user;	/* user config nmode, operating pub->nmode is different */
+	s8 n_cfg;		/* use OFDM protection on MIMO frames */
+	s8 n_cfg_override;	/* override for use of N protection */
 	bool nongf;		/* non-GF present protection */
-	int8 nongf_override;	/* override for use of GF protection */
-	int8 n_pam_override;	/* override for preamble: MM or GF */
+	s8 nongf_override;	/* override for use of GF protection */
+	s8 n_pam_override;	/* override for preamble: MM or GF */
 	bool n_obss;		/* indicated OBSS Non-HT STA present */
 
 	uint longpre_detect_timeout;	/* #sec until long preamble bcns gone */
@@ -266,7 +266,7 @@ typedef struct wlc_stf {
 	u8 rxstreams;	/* number of rxchains being used */
 
 	u8 ant_rx_ovr;	/* rx antenna override */
-	int8 txant;		/* userTx antenna setting */
+	s8 txant;		/* userTx antenna setting */
 	uint16 phytxant;	/* phyTx antenna setting in txheader */
 
 	u8 ss_opmode;	/* singlestream Operational mode, 0:siso; 1:cdd */
@@ -277,9 +277,9 @@ typedef struct wlc_stf {
 
 	u8 rxchain_restore_delay;	/* delay time to restore default rxchain */
 
-	int8 ldpc;		/* AUTO/ON/OFF ldpc cap supported */
+	s8 ldpc;		/* AUTO/ON/OFF ldpc cap supported */
 	u8 txcore[MAX_STREAMS_SUPPORTED + 1];	/* bitmap of selected core for each Nsts */
-	int8 spatial_policy;
+	s8 spatial_policy;
 } wlc_stf_t;
 
 #define WLC_STF_SS_STBC_TX(wlc, scb) \
@@ -346,11 +346,11 @@ typedef struct wlcband {
 	ratespec_t rspec_override;	/* 802.11 rate override */
 	ratespec_t mrspec_override;	/* multicast rate override */
 	u8 band_stf_ss_mode;	/* Configured STF type, 0:siso; 1:cdd */
-	int8 band_stf_stbc_tx;	/* STBC TX 0:off; 1:force on; -1:auto */
+	s8 band_stf_stbc_tx;	/* STBC TX 0:off; 1:force on; -1:auto */
 	wlc_rateset_t hw_rateset;	/* rates supported by chip (phy-specific) */
 	u8 basic_rate[WLC_MAXRATE + 1];	/* basic rates indexed by rate */
 	bool mimo_cap_40;	/* 40 MHz cap enabled on this band */
-	int8 antgain;		/* antenna gain from srom */
+	s8 antgain;		/* antenna gain from srom */
 
 	uint16 CWmin;		/* The minimum size of contention window, in unit of aSlotTime */
 	uint16 CWmax;		/* The maximum size of contention window, in unit of aSlotTime */
@@ -577,7 +577,7 @@ struct wlc_info {
 	uint qvalid;		/* DirFrmQValid and BcMcFrmQValid */
 
 	/* Regulatory power limits */
-	int8 txpwr_local_max;	/* regulatory local txpwr max */
+	s8 txpwr_local_max;	/* regulatory local txpwr max */
 	u8 txpwr_local_constraint;	/* local power contraint in dB */
 
 #ifdef WLC_HIGH_ONLY
@@ -638,7 +638,7 @@ struct wlc_info {
 	/* driver feature */
 	bool _rifs;		/* enable per-packet rifs */
 	int32 rifs_advert;	/* RIFS mode advertisement */
-	int8 sgi_tx;		/* sgi tx */
+	s8 sgi_tx;		/* sgi tx */
 	bool wet;		/* true if wireless ethernet bridging mode */
 
 	/* AP-STA synchronization, power save */
@@ -707,11 +707,11 @@ struct wlc_info {
 
 	u8 mimoft;		/* SIGN or 11N */
 	u8 mimo_band_bwcap;	/* bw cap per band type */
-	int8 txburst_limit_override;	/* tx burst limit override */
+	s8 txburst_limit_override;	/* tx burst limit override */
 	uint16 txburst_limit;	/* tx burst limit value */
-	int8 cck_40txbw;	/* 11N, cck tx b/w override when in 40MHZ mode */
-	int8 ofdm_40txbw;	/* 11N, ofdm tx b/w override when in 40MHZ mode */
-	int8 mimo_40txbw;	/* 11N, mimo tx b/w override when in 40MHZ mode */
+	s8 cck_40txbw;	/* 11N, cck tx b/w override when in 40MHZ mode */
+	s8 ofdm_40txbw;	/* 11N, ofdm tx b/w override when in 40MHZ mode */
+	s8 mimo_40txbw;	/* 11N, mimo tx b/w override when in 40MHZ mode */
 	ht_cap_ie_t ht_cap;	/* HT CAP IE being advertised by this node */
 
 	uint seckeys;		/* 54 key table shm address */
@@ -762,15 +762,15 @@ struct wlc_info {
 	/* network config */
 	bool shortpreamble;	/* currently operating with CCK ShortPreambles */
 	bool shortslot;		/* currently using 11g ShortSlot timing */
-	int8 barker_preamble;	/* current Barker Preamble Mode */
-	int8 shortslot_override;	/* 11g ShortSlot override */
+	s8 barker_preamble;	/* current Barker Preamble Mode */
+	s8 shortslot_override;	/* 11g ShortSlot override */
 	bool include_legacy_erp;	/* include Legacy ERP info elt ID 47 as well as g ID 42 */
 	bool barker_overlap_control;	/* TRUE: be aware of overlapping BSSs for barker */
 	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;
-	int8 PLCPHdr_override;	/* 802.11b Preamble Type override */
+	s8 PLCPHdr_override;	/* 802.11b Preamble Type override */
 
 	wlc_stf_t *stf;
 
@@ -876,8 +876,8 @@ extern void wlc_bmac_rpc_watchdog(wlc_info_t *wlc);
 extern void wlc_recv(wlc_info_t *wlc, void *p);
 extern bool wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, uint32 frm_tx2);
 extern void wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit,
-		       int8 txpktpend);
-extern void wlc_txfifo_complete(wlc_info_t *wlc, uint fifo, int8 txpktpend);
+		       s8 txpktpend);
+extern void wlc_txfifo_complete(wlc_info_t *wlc, uint fifo, s8 txpktpend);
 extern void wlc_info_init(wlc_info_t *wlc, int unit);
 extern void wlc_print_txstatus(tx_status_t *txs);
 extern int wlc_xmtfifo_sz_get(wlc_info_t *wlc, uint fifo, uint *blocks);
diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index bc8d875..6964660 100644
--- a/drivers/staging/brcm80211/sys/wlc_pub.h
+++ b/drivers/staging/brcm80211/sys/wlc_pub.h
@@ -58,7 +58,7 @@
 #define WLC_SNR_INVALID		0	/* invalid SNR value */
 
 /* a large TX Power as an init value to factor out of MIN() calculations,
- * keep low enough to fit in an int8, units are .25 dBm
+ * keep low enough to fit in an s8, units are .25 dBm
  */
 #define WLC_TXPWR_MAX		(127)	/* ~32 dBm = 1,500 mW */
 
@@ -174,10 +174,10 @@ typedef struct wlc_bss_info {
 	uint16 beacon_period;	/* units are Kusec */
 	uint16 atim_window;	/* units are Kusec */
 	chanspec_t chanspec;	/* Channel num, bw, ctrl_sb and band */
-	int8 infra;		/* 0=IBSS, 1=infrastructure, 2=unknown */
+	s8 infra;		/* 0=IBSS, 1=infrastructure, 2=unknown */
 	wlc_rateset_t rateset;	/* supported rates */
 	u8 dtim_period;	/* DTIM period */
-	int8 phy_noise;		/* noise right after tx (in dBm) */
+	s8 phy_noise;		/* noise right after tx (in dBm) */
 	uint16 capability;	/* Capability information */
 	struct dot11_bcn_prb *bcn_prb;	/* beacon/probe response frame (ioctl na) */
 	uint16 bcn_prb_len;	/* beacon/probe response frame length (ioctl na) */
@@ -288,7 +288,7 @@ typedef struct wlc_pub {
 	u8 _n_enab;		/* bitmap of 11N + HT support */
 	bool _n_reqd;		/* N support required for clients */
 
-	int8 _coex;		/* 20/40 MHz BSS Management AUTO, ENAB, DISABLE */
+	s8 _coex;		/* 20/40 MHz BSS Management AUTO, ENAB, DISABLE */
 	bool _priofc;		/* Priority-based flowcontrol */
 
 	struct ether_addr cur_etheraddr;	/* our local ethernet address */
@@ -552,8 +552,8 @@ extern void wlc_mctrl(struct wlc_info *wlc, uint32 mask, uint32 val);
 extern void wlc_scb_ratesel_init_all(struct wlc_info *wlc);
 
 /* ioctl */
-extern int wlc_iovar_getint8(struct wlc_info *wlc, const char *name,
-			     int8 *arg);
+extern int wlc_iovar_gets8(struct wlc_info *wlc, const char *name,
+			     s8 *arg);
 extern int wlc_iovar_check(wlc_pub_t *pub, const bcm_iovar_t *vi, void *arg,
 			   int len, bool set);
 
@@ -578,7 +578,7 @@ static inline int wlc_iovar_getuint(struct wlc_info *wlc, const char *name,
 static inline int wlc_iovar_getu8(struct wlc_info *wlc, const char *name,
 				     u8 *arg)
 {
-	return wlc_iovar_getint8(wlc, name, (int8 *) arg);
+	return wlc_iovar_gets8(wlc, name, (s8 *) arg);
 }
 
 static inline int wlc_iovar_setuint(struct wlc_info *wlc, const char *name,
diff --git a/drivers/staging/brcm80211/sys/wlc_stf.c b/drivers/staging/brcm80211/sys/wlc_stf.c
index eae1086..3bb5037 100644
--- a/drivers/staging/brcm80211/sys/wlc_stf.c
+++ b/drivers/staging/brcm80211/sys/wlc_stf.c
@@ -42,7 +42,7 @@
 #define WLC_STF_SS_STBC_RX(wlc) (WLCISNPHY(wlc->band) && \
 	NREV_GT(wlc->band->phyrev, 3) && NREV_LE(wlc->band->phyrev, 6))
 
-static int8 wlc_stf_stbc_rx_get(wlc_info_t *wlc);
+static s8 wlc_stf_stbc_rx_get(wlc_info_t *wlc);
 static bool wlc_stf_stbc_tx_set(wlc_info_t *wlc, int32 int_val);
 static int wlc_stf_txcore_set(wlc_info_t *wlc, u8 Nsts, u8 val);
 static int wlc_stf_spatial_policy_set(wlc_info_t *wlc, int val);
@@ -149,7 +149,7 @@ wlc_stf_ss_algo_channel_get(wlc_info_t *wlc, uint16 *ss_algo_channel,
 		setbit(ss_algo_channel, PHY_TXC1_MODE_STBC);
 }
 
-static int8 wlc_stf_stbc_rx_get(wlc_info_t *wlc)
+static s8 wlc_stf_stbc_rx_get(wlc_info_t *wlc)
 {
 	return (wlc->ht_cap.cap & HT_CAP_RX_STBC_MASK) >> HT_CAP_RX_STBC_SHIFT;
 }
@@ -169,8 +169,8 @@ static bool wlc_stf_stbc_tx_set(wlc_info_t *wlc, int32 int_val)
 	else
 		wlc->ht_cap.cap |= HT_CAP_TX_STBC;
 
-	wlc->bandstate[BAND_2G_INDEX]->band_stf_stbc_tx = (int8) int_val;
-	wlc->bandstate[BAND_5G_INDEX]->band_stf_stbc_tx = (int8) int_val;
+	wlc->bandstate[BAND_2G_INDEX]->band_stf_stbc_tx = (s8) int_val;
+	wlc->bandstate[BAND_5G_INDEX]->band_stf_stbc_tx = (s8) int_val;
 
 	return TRUE;
 }
@@ -236,7 +236,7 @@ static int wlc_stf_spatial_policy_set(wlc_info_t *wlc, int val)
 
 	WL_TRACE(("wl%d: %s: val %x\n", wlc->pub->unit, __func__, val));
 
-	wlc->stf->spatial_policy = (int8) val;
+	wlc->stf->spatial_policy = (s8) val;
 	for (i = 1; i <= MAX_STREAMS_SUPPORTED; i++) {
 		core_mask = (val == MAX_SPATIAL_EXPANSION) ?
 		    wlc->stf->txchain : txcore_default[i];
@@ -431,7 +431,7 @@ void BCMATTACHFN(wlc_stf_detach) (wlc_info_t *wlc)
 {
 }
 
-int wlc_stf_ant_txant_validate(wlc_info_t *wlc, int8 val)
+int wlc_stf_ant_txant_validate(wlc_info_t *wlc, s8 val)
 {
 	int bcmerror = BCME_OK;
 
@@ -458,7 +458,7 @@ int wlc_stf_ant_txant_validate(wlc_info_t *wlc, int8 val)
 	}
 
 	if (bcmerror == BCME_OK)
-		wlc->stf->txant = (int8) val;
+		wlc->stf->txant = (s8) val;
 
 	return bcmerror;
 
@@ -480,9 +480,9 @@ int wlc_stf_ant_txant_validate(wlc_info_t *wlc, int8 val)
 */
 static void _wlc_stf_phy_txant_upd(wlc_info_t *wlc)
 {
-	int8 txant;
+	s8 txant;
 
-	txant = (int8) wlc->stf->txant;
+	txant = (s8) wlc->stf->txant;
 	ASSERT(txant == ANT_TX_FORCE_0 || txant == ANT_TX_FORCE_1
 	       || txant == ANT_TX_LAST_RX);
 
diff --git a/drivers/staging/brcm80211/sys/wlc_stf.h b/drivers/staging/brcm80211/sys/wlc_stf.h
index 81568a9..8cb34a0 100644
--- a/drivers/staging/brcm80211/sys/wlc_stf.h
+++ b/drivers/staging/brcm80211/sys/wlc_stf.h
@@ -33,7 +33,7 @@ extern int wlc_stf_txchain_set(wlc_info_t *wlc, int32 int_val, bool force);
 extern int wlc_stf_rxchain_set(wlc_info_t *wlc, int32 int_val);
 extern bool wlc_stf_stbc_rx_set(wlc_info_t *wlc, int32 int_val);
 
-extern int wlc_stf_ant_txant_validate(wlc_info_t *wlc, int8 val);
+extern int wlc_stf_ant_txant_validate(wlc_info_t *wlc, s8 val);
 extern void wlc_stf_phy_txant_upd(wlc_info_t *wlc);
 extern void wlc_stf_phy_chain_calc(wlc_info_t *wlc);
 extern uint16 wlc_stf_phytxchain_sel(wlc_info_t *wlc, ratespec_t rspec);