diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-07 17:08:21 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-07 17:08:21 -0700 |
commit | e59fe083f683ca2ca56abefad290d110808a6fb5 (patch) | |
tree | a03c7654100804b579495eaf96f6b945cce8b2ee /drivers/staging/brcm80211/sys | |
parent | 7d4df48eba4cea654ee6fe6e1a51a0600807ed7b (diff) | |
download | op-kernel-dev-e59fe083f683ca2ca56abefad290d110808a6fb5.zip op-kernel-dev-e59fe083f683ca2ca56abefad290d110808a6fb5.tar.gz |
Staging: brcm80211: s/int16/s16/
Use the kernel types, don't invent your own.
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>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_bsscfg.h | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_pub.h | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_rate.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_rate.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_bsscfg.h b/drivers/staging/brcm80211/sys/wlc_bsscfg.h index b498bb7..54e3543 100644 --- a/drivers/staging/brcm80211/sys/wlc_bsscfg.h +++ b/drivers/staging/brcm80211/sys/wlc_bsscfg.h @@ -74,8 +74,8 @@ struct wlc_bsscfg { /* security */ uint32 wsec; /* wireless security bitvec */ - int16 auth; /* 802.11 authentication: Open, Shared Key, WPA */ - int16 openshared; /* try Open auth first, then Shared Key */ + s16 auth; /* 802.11 authentication: Open, Shared Key, WPA */ + s16 openshared; /* try Open auth first, then Shared Key */ bool wsec_restrict; /* drop unencrypted packets if wsec is enabled */ bool eap_restrict; /* restrict data until 802.1X auth succeeds */ u16 WPA_auth; /* WPA: authenticated key management */ diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index 46362d1..15d84cb 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -790,7 +790,7 @@ void wlc_switch_shortslot(wlc_info_t *wlc, bool shortslot) static u8 wlc_local_constraint_qdbm(wlc_info_t *wlc) { u8 local; - int16 local_max; + s16 local_max; local = WLC_TXPWR_MAX; if (wlc->pub->associated && @@ -5795,7 +5795,7 @@ u16 BCMFASTPATH wlc_phytxctl1_calc(wlc_info_t *wlc, ratespec_t rspec) /* 0 = 1Mbps; 1 = 2Mbps; 2 = 5.5Mbps; 3 = 11Mbps */ phyctl1 = (bw | (RSPEC_STF(rspec) << PHY_TXC1_MODE_SHIFT)); } else { /* legacy OFDM/CCK */ - int16 phycfg; + s16 phycfg; /* get the phyctl byte from rate phycfg table */ phycfg = wlc_rate_legacy_phyctl(RSPEC2RATE(rspec)); if (phycfg == -1) { diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h index b936ca3..d06546c 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.h +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.h @@ -317,7 +317,7 @@ typedef struct wlccore { /* fifo */ uint *txavail[NFIFO]; /* # tx descriptors available */ - int16 txpktpend[NFIFO]; /* tx admission control */ + s16 txpktpend[NFIFO]; /* tx admission control */ #endif /* WLC_LOW */ macstat_t *macstat_snapshot; /* mac hw prev read values */ diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h index 6c7f1d4..94338c4 100644 --- a/drivers/staging/brcm80211/sys/wlc_pub.h +++ b/drivers/staging/brcm80211/sys/wlc_pub.h @@ -169,8 +169,8 @@ typedef struct wlc_bss_info { u16 flags; /* flags for internal attributes */ u8 SSID_len; /* the length of SSID */ u8 SSID[32]; /* SSID string */ - int16 RSSI; /* receive signal strength (in dBm) */ - int16 SNR; /* receive signal SNR in dB */ + s16 RSSI; /* receive signal strength (in dBm) */ + s16 SNR; /* receive signal SNR in dB */ u16 beacon_period; /* units are Kusec */ u16 atim_window; /* units are Kusec */ chanspec_t chanspec; /* Channel num, bw, ctrl_sb and band */ diff --git a/drivers/staging/brcm80211/sys/wlc_rate.c b/drivers/staging/brcm80211/sys/wlc_rate.c index 36e67f2..346f650 100644 --- a/drivers/staging/brcm80211/sys/wlc_rate.c +++ b/drivers/staging/brcm80211/sys/wlc_rate.c @@ -467,7 +467,7 @@ wlc_rateset_default(wlc_rateset_t *rs_tgt, const wlc_rateset_t *rs_hw, mcsallow ? txstreams : 1); } -int16 BCMFASTPATH wlc_rate_legacy_phyctl(uint rate) +s16 BCMFASTPATH wlc_rate_legacy_phyctl(uint rate) { uint i; for (i = 0; i < LEGACY_PHYCFG_TABLE_SIZE; i++) diff --git a/drivers/staging/brcm80211/sys/wlc_rate.h b/drivers/staging/brcm80211/sys/wlc_rate.h index e24fa73..4135953 100644 --- a/drivers/staging/brcm80211/sys/wlc_rate.h +++ b/drivers/staging/brcm80211/sys/wlc_rate.h @@ -160,7 +160,7 @@ extern void wlc_rateset_default(struct wlc_rateset *rs_tgt, const struct wlc_rateset *rs_hw, uint phy_type, int bandtype, bool cck_only, uint rate_mask, bool mcsallow, u8 bw, u8 txstreams); -extern int16 wlc_rate_legacy_phyctl(uint rate); +extern s16 wlc_rate_legacy_phyctl(uint rate); extern void wlc_rateset_mcs_upd(struct wlc_rateset *rs, u8 txstreams); extern void wlc_rateset_mcs_clear(struct wlc_rateset *rateset); |