evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8188eu: Use round_up() instead of _RND4()

Browse source 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
navin patidar 2014-06-22 14:21:41 +05:30 • committed by Greg Kroah-Hartman
parent 248df424eb
commit eab5d5438a
4 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/rtl8188eu/core/rtw_cmd.c
View file

@ -324,7 +324,7 @@ _next:
pcmdpriv->cmd_issued_cnt++;
pcmd->cmdsz = _RND4((pcmd->cmdsz));/* _RND4 */
pcmd->cmdsz = round_up(pcmd->cmdsz, 4);
memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);

4
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
View file

@ -544,7 +544,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp
len = xmitframe_need_length(pxmitframe) + TXDESC_SIZE + (pxmitframe->pkt_offset*PACKET_OFFSET_SZ);
if (_RND8(pbuf + len) > MAX_XMITBUF_SZ) {
if (round_up(pbuf + len, 8) > MAX_XMITBUF_SZ) {
pxmitframe->agg_num = 1;
pxmitframe->pkt_offset = 1;
break;
@ -567,7 +567,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp
/* handle pointer and stop condition */
pbuf_tail = pbuf + len;
pbuf = _RND8(pbuf_tail);
pbuf = round_up(pbuf_tail, 8);
pfirstframe->agg_num++;
if (MAX_TX_AGG_PACKET_NUMBER == pfirstframe->agg_num)

8
drivers/staging/rtl8188eu/include/osdep_service.h
View file

@ -181,14 +181,6 @@ static inline void flush_signals_thread(void)
#define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r))
#define RND4(x) (((x >> 2) + (((x & 3) == 0) ? 0 : 1)) << 2)
static inline u32 _RND4(u32 sz)
{
u32 val;
val = ((sz >> 2) + ((sz & 3) ? 1 : 0)) << 2;
return val;
}
struct rtw_netdev_priv_indicator {
void *priv;
u32 sizeof_priv;

2
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
View file

@ -163,7 +163,7 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)
pkt_offset = (u16) round_up(pkt_offset, 128);
break;
case USB_RX_AGG_USB:
pkt_offset = (u16)_RND4(pkt_offset);
pkt_offset = (u16) round_up(pkt_offset, 4);
break;
case USB_RX_AGG_DISABLE:
default: