---

yaml --- r: 219834 b: refs/heads/master c: 2ae3b7e h: refs/heads/master v: v3
git-mirror · Sep 14, 2010 · ac9b2a8 · ac9b2a8
1 parent 8f1126d
commit ac9b2a8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0e5ccd340ccb2cc9c87771609bafa1e2491770b
+refs/heads/master: 2ae3b7ea9f8e7472d26ec317ce498466b0864871
diff --git a/trunk/drivers/staging/brcm80211/phy/wlc_phy_n.c b/trunk/drivers/staging/brcm80211/phy/wlc_phy_n.c
@@ -23487,7 +23487,7 @@ wlc_phy_est_tonepwr_nphy(phy_info_t *pi, int32 *qdBm_pwrbuf, uint8 num_samps)
 
 	tssi_type =
 	    CHSPEC_IS5G(pi->radio_chanspec) ?
-	    (uint8) NPHY_RSSI_SEL_TSSI_5G : (uint8) NPHY_RSSI_SEL_TSSI_2G;
+	    (uint8)NPHY_RSSI_SEL_TSSI_5G:(uint8)NPHY_RSSI_SEL_TSSI_2G;
 
 	wlc_phy_poll_rssi_nphy(pi, tssi_type, rssi_buf, num_samps);
 

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_key.h b/trunk/drivers/staging/brcm80211/sys/wlc_key.h
@@ -69,7 +69,7 @@ struct wlc_bsscfg;
 
 /* default key */
 #define WSEC_BSS_DEFAULT_KEY(bsscfg) (((bsscfg)->wsec_index == -1) ? \
-	(struct wsec_key *)NULL : (bsscfg)->bss_def_keys[(bsscfg)->wsec_index])
+	(struct wsec_key *)NULL:(bsscfg)->bss_def_keys[(bsscfg)->wsec_index])
 
 /* Macros for key management in IBSS mode */
 #define WSEC_IBSS_MAX_PEERS	16	/* Max # of IBSS Peers */

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -3317,7 +3317,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 	ASSERT(!(wlc->pub->hw_off && wlc->pub->up));
 
 	/* default argument is generic integer */
-	pval = arg ? (int *)arg : NULL;
+	pval = arg ? (int *)arg:NULL;
 
 	/* This will prevent the misaligned access */
 	if (pval && (uint32) len >= sizeof(val))