]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
staging: brcm80211: fix "ERROR: spaces prohibited around that ':' ..."
authorJason Cooper <jason@lakedaemon.net>
Tue, 14 Sep 2010 13:45:48 +0000 (09:45 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 14 Sep 2010 23:24:18 +0000 (16:24 -0700)
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/phy/wlc_phy_n.c
drivers/staging/brcm80211/sys/wlc_key.h
drivers/staging/brcm80211/sys/wlc_mac80211.c

index 07efa67458c507e98ae53cba4d6cab12cb63bc5c..6a0c1cdcc371403eb25ef426d722c063fc9171d7 100644 (file)
@@ -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);
 
index a53a11fead2cd401c1652c50c45a396e3c298e7e..b2e8efdad9b0976391805f1a5c82859286e881d5 100644 (file)
@@ -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 */
index 1837cd5f3c138c276621c9a5c0e0d6e4356d8648..27ddc23ae9e58a1752eeef781021c1c3343d2003 100644 (file)
@@ -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))