diff options
| author | James A Shackleford <shack@linux.com> | 2014-06-22 20:27:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-26 20:31:02 -0400 |
| commit | fa867453320bdc703d2e724d6d95fd9d666874ea (patch) | |
| tree | 5983e691c8c553e519a90827f76a530b8011f39c | |
| parent | d913e54ef08da6f831df47a45f2ca1b11579eba4 (diff) | |
staging: rtl8712: remove inline _RND128() and use round_up()
Signed-off-by: James A Shackleford <shack@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8712/osdep_service.h | 5 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl8712_recv.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index 6af0df9c04e7..37ec56b08577 100644 --- a/drivers/staging/rtl8712/osdep_service.h +++ b/drivers/staging/rtl8712/osdep_service.h @@ -184,11 +184,6 @@ static inline void flush_signals_thread(void) flush_signals(current); } -static inline u32 _RND128(u32 sz) -{ - return ((sz >> 7) + ((sz & 127) ? 1 : 0)) << 7; -} - static inline u32 _RND256(u32 sz) { return ((sz >> 8) + ((sz & 255) ? 1 : 0)) << 8; diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c index 1f700171af13..fb947c1e076f 100644 --- a/drivers/staging/rtl8712/rtl8712_recv.c +++ b/drivers/staging/rtl8712/rtl8712_recv.c @@ -1065,7 +1065,7 @@ static int recvbuf2recvframe(struct _adapter *padapter, struct sk_buff *pskb) precvframe->u.hdr.precvbuf = NULL; /*can't access the precvbuf*/ precvframe->u.hdr.len = 0; tmp_len = pkt_len + drvinfo_sz + RXDESC_SIZE; - pkt_offset = (u16)_RND128(tmp_len); + pkt_offset = (u16)round_up(tmp_len, 128); /* for first fragment packet, driver need allocate 1536 + * drvinfo_sz + RXDESC_SIZE to defrag packet. */ if ((mf == 1) && (frag == 0)) |