From: James A Shackleford Date: Mon, 23 Jun 2014 00:27:56 +0000 (-0400) Subject: staging: rtl8712: remove inline _RND128() and use round_up() X-Git-Tag: v5.15~17495^2~1390 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa867453320bdc703d2e724d6d95fd9d666874ea;p=platform%2Fkernel%2Flinux-starfive.git staging: rtl8712: remove inline _RND128() and use round_up() Signed-off-by: James A Shackleford Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index 6af0df9..37ec56b 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 1f70017..fb947c1 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))