diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:59:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:59:06 -0700 |
| commit | e18d5313c680e5bb8cbdc0dce8f8698c2ab20663 (patch) | |
| tree | ff9de96217ddaed10e7c98a13d8d3a70dc05adab /drivers/staging/brcm80211/sys | |
| parent | 36c63ff6afb1bdc2d93aac6d207d6529177d47f8 (diff) | |
| download | op-kernel-dev-e18d5313c680e5bb8cbdc0dce8f8698c2ab20663.zip op-kernel-dev-e18d5313c680e5bb8cbdc0dce8f8698c2ab20663.tar.gz | |
Staging: brcm80211: remove ROUNDUP macro
And use the kernel provided 'roundup' instead.
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_ampdu.c | 4 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_event.c | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_key.h | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_pub.h | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_rpc.h | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c index 8a22536..ccf7780 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c @@ -662,7 +662,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) mcl &= ~(TXC_STARTMSDU | TXC_SENDRTS | TXC_SENDCTS); } - len = ROUNDUP(len, 4); + len = roundup(len, 4); ampdu_len += (len + (ndelim + 1) * AMPDU_DELIMITER_LEN); dma_len += (u16) pkttotlen(osh, p); @@ -806,7 +806,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) fbr_iscck = ((ltoh16(txh->XtraFrameTypes) & 0x3) == 0); len = fbr_iscck ? WLC_GET_CCK_PLCP_LEN(txh->FragPLCPFallback) : WLC_GET_MIMO_PLCP_LEN(txh->FragPLCPFallback); - ampdu_len -= ROUNDUP(len, 4) - len; + ampdu_len -= roundup(len, 4) - len; /* patch up the first txh & plcp */ txh = (d11txh_t *) PKTDATA(pkt[0]); diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/sys/wlc_event.c index dc5f5aa..8bc2d04 100644 --- a/drivers/staging/brcm80211/sys/wlc_event.c +++ b/drivers/staging/brcm80211/sys/wlc_event.c @@ -47,7 +47,7 @@ struct wlc_eventq { bool workpending; struct wl_timer *timer; wlc_eventq_cb_t cb; - u8 event_inds_mask[ROUNDUP(WLC_E_LAST, NBBY) / NBBY]; + u8 event_inds_mask[roundup(WLC_E_LAST, NBBY) / NBBY]; }; /* diff --git a/drivers/staging/brcm80211/sys/wlc_key.h b/drivers/staging/brcm80211/sys/wlc_key.h index 61dd5e4..98c537c 100644 --- a/drivers/staging/brcm80211/sys/wlc_key.h +++ b/drivers/staging/brcm80211/sys/wlc_key.h @@ -106,7 +106,7 @@ typedef struct wsec_key { } wsec_key_t; typedef struct { - u8 vec[ROUNDUP(WSEC_MAX_KEYS, NBBY) / NBBY]; /* bitvec of wsec_key indexes */ + u8 vec[roundup(WSEC_MAX_KEYS, NBBY) / NBBY]; /* bitvec of wsec_key indexes */ } wsec_key_vec_t; /* For use with wsec_key_t.flags */ diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h index d5f1bad..a6a8c33 100644 --- a/drivers/staging/brcm80211/sys/wlc_pub.h +++ b/drivers/staging/brcm80211/sys/wlc_pub.h @@ -92,7 +92,7 @@ #define RXBUFSZ PKTBUFSZ #ifndef AIDMAPSZ -#define AIDMAPSZ (ROUNDUP(MAXSCB, NBBY)/NBBY) /* aid bitmap size in bytes */ +#define AIDMAPSZ (roundup(MAXSCB, NBBY)/NBBY) /* aid bitmap size in bytes */ #endif /* AIDMAPSZ */ typedef struct wlc_tunables { diff --git a/drivers/staging/brcm80211/sys/wlc_rpc.h b/drivers/staging/brcm80211/sys/wlc_rpc.h index 5c09b38..c98605c 100644 --- a/drivers/staging/brcm80211/sys/wlc_rpc.h +++ b/drivers/staging/brcm80211/sys/wlc_rpc.h @@ -362,9 +362,9 @@ static __inline char *_wlc_rpc_id_lookup(const struct name_entry *tbl, int _id) #endif /* BCMDBG */ /* refer to txpwr_limits_t for each elements, mcs32 is the at the end for 1 byte */ -#define TXPOWER_XDR_SZ (ROUNDUP(WLC_NUM_RATES_CCK, 4) + ROUNDUP(WLC_NUM_RATES_OFDM, 4) * 4 + \ - ROUNDUP(WLC_NUM_RATES_MCS_1_STREAM, 4) * 6 + ROUNDUP(WLC_NUM_RATES_MCS_2_STREAM, 4) * 2 + \ - ROUNDUP(1, 4)) +#define TXPOWER_XDR_SZ (roundup(WLC_NUM_RATES_CCK, 4) + roundup(WLC_NUM_RATES_OFDM, 4) * 4 + \ + roundup(WLC_NUM_RATES_MCS_1_STREAM, 4) * 6 + roundup(WLC_NUM_RATES_MCS_2_STREAM, 4) * 2 + \ + roundup(1, 4)) #define wlc_rpc_txpwr_limits(b, txpwr, op, err) \ do { \ |
