staging:r8188eu: remove skb data alignment in r8188eu driver code

(__)netdev_alloc_skb align skb data.
Also this function set skb device.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
index 67a765ae5c2806b10bb8cbc11f73976036b5acb6..1c7a9a084b492e7026ca989d51cbbb9e67045886 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
@@ -61,23 +61,15 @@ int rtw_hal_init_recv_priv(struct adapter *padapter)
        skb_queue_head_init(&precvpriv->rx_skb_queue);
        {
                int i;
-               size_t tmpaddr = 0;
-               size_t alignm = 0;
                struct sk_buff *pskb = NULL;
 
                skb_queue_head_init(&precvpriv->free_recv_skb_queue);
 
                for (i = 0; i < NR_PREALLOC_RECV_SKB; i++) {
                        pskb = __netdev_alloc_skb(padapter->pnetdev,
-                                       MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ,
-                                       GFP_KERNEL);
+                                       MAX_RECVBUF_SZ, GFP_KERNEL);
                        if (pskb) {
                                kmemleak_not_leak(pskb);
-                               pskb->dev = padapter->pnetdev;
-                               tmpaddr = (size_t)pskb->data;
-                               alignm = tmpaddr & (RECVBUFF_ALIGN_SZ-1);
-                               skb_reserve(pskb, (RECVBUFF_ALIGN_SZ - alignm));
-
                                skb_queue_tail(&precvpriv->free_recv_skb_queue,
                                                pskb);
                        }

diff --git a/drivers/staging/rtl8188eu/include/rtw_recv.h b/drivers/staging/rtl8188eu/include/rtw_recv.h
index a8874a2768c2fefc7567030c86514fcb6974e116..c8688639860e9f32b23085eee45b313da98407c2 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_recv.h
+++ b/drivers/staging/rtl8188eu/include/rtw_recv.h
@@ -139,8 +139,6 @@ struct rx_pkt_attrib {
 #define SN_EQUAL(a, b) (a == b)
 #define REORDER_WAIT_TIME      (50) /*  (ms) */
 
-#define RECVBUFF_ALIGN_SZ 8
-
 #define RXDESC_SIZE    24
 #define RXDESC_OFFSET RXDESC_SIZE
 

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index d0d591501b739b0122d27cdc43a535e6888c5557..b82048229ce4821be3218d32ad3cd640756106aa 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -457,8 +457,6 @@ u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *rmem)
        struct usb_device       *pusbd = pdvobj->pusbdev;
        int err;
        unsigned int pipe;
-       size_t tmpaddr = 0;
-       size_t alignment = 0;
        u32 ret = _SUCCESS;
 
 
@@ -483,16 +481,12 @@ u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *rmem)
 
        /* re-assign for linux based on skb */
        if ((!precvbuf->reuse) || (precvbuf->pskb == NULL)) {
-               precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ);
+               precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, MAX_RECVBUF_SZ);
                if (precvbuf->pskb == NULL) {
                        RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("init_recvbuf(): alloc_skb fail!\n"));
                        DBG_88E("#### usb_read_port() alloc_skb fail!#####\n");
                        return _FAIL;
                }
-
-               tmpaddr = (size_t)precvbuf->pskb->data;
-               alignment = tmpaddr & (RECVBUFF_ALIGN_SZ-1);
-               skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
        } else { /* reuse skb */
                precvbuf->reuse = false;
        }