Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1497478
| From | Ivan Safonov <insafonov@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 05/34] staging:r8188eu: remove skb data alignment in r8188eu driver code |
| Date | 2016-10-07 21:10 +0200 |
| Message-ID | <spIGS-4Oc-5@gated-at.bofh.it> (permalink) |
| References | <spHB7-3PS-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
(__)netdev_alloc_skb align skb data.
Also this function set skb device.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 10 +---------
drivers/staging/rtl8188eu/include/rtw_recv.h | 2 --
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 8 +-------
3 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
index 67a765a..1c7a9a0 100644
--- 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 a8874a2..c868863 100644
--- 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 d0d5915..b820482 100644
--- 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;
}
--
2.7.3
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH 01/34] staging:r8188eu: remove rtw_os_recv_resource_alloc function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:00 +0200 [PATCH 04/34] staging:r8188eu: remove free_recv_buf_queue_cnt member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:00 +0200 [PATCH 08/34] staging:r8188eu: remove ff_hwaddr member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:00 +0200 [PATCH 15/34] staging:r8188eu: remove Antenna_(Lfet|Right) enumeration items Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 29/34] staging:r8188eu: remove free_recvframe_cnt member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 33/34] staging:r8188eu: refactor recvbuf2recvframe function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 07/34] staging:r8188eu: remove (u32 cnt) argument of usb_read_port function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 19/34] staging:r8188eu: refactor rtl88eu_dm_txpower_tracking_callback_thermalmeter function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 03/34] staging:r8188eu: remove pm_netdev_open function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 34/34] staging:r8188eu: remove unnecessary type cast for update_recvframe_phyinfo_88e argument Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 11/34] staging:r8188eu: remove bLedStartToLinkBlinkInProgress and bSWLedCtrl members of LED_871x structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 25/34] staging:r8188eu: remove prhdr local variable from rtw_free_stainfo function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 23/34] staging:r8188eu: remove padapter and free_sz arguments of rtw_os_xmit_resource_free function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 24/34] staging:r8188eu: remove unused function declerations Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 18/34] staging:r8188eu: remove NumTotalRFPath member of hal_data_8188e structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 32/34] staging:r8188eu: change poiter type from u8 to void for pallocated_frame_buf member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 02/34] staging:r8188eu: remove wrappers for rtw_hal_inirp_init function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 14/34] staging:r8188eu: remove unused members of hal_data_8188e structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 20/34] staging:r8188eu: remove bTXPowerTrackingInit member of odm_rf_cal structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 22/34] staging:r8188eu: remove rtw_endofpktfile function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:10 +0200 [PATCH 16/34] staging:r8188eu: remove rf_chip member of hal_data_8188e structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200 [PATCH 17/34] staging:r8188eu: remove RF_TYPE_8190P enumeration Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200 [PATCH 12/34] staging:r8188eu: remove bLedOpenDrain member of hal_data_8188e structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200 [PATCH 28/34] staging:r8188eu: remove intf_stop member of adapter structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200 [PATCH 06/34] staging:r8188eu: change usb_read_port last argument type to (struct *recv_buf) Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200 [PATCH 21/34] staging:r8188eu: remove ANTTEST(ALL|A|B) definitions Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200 [PATCH 10/34] staging:r8188eu: remove bRegUseLed member of led_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200 [PATCH 26/34] staging:r8188eu: change type of the precv_buf member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200 [PATCH 30/34] staging:r8188eu: remove rx_pending_cnt member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200 [PATCH 09/34] staging:r8188eu: remove wrappers for LedControl8188eu function Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:20 +0200 [PATCH 31/34] staging:r8188eu: remove precv_frame_buf member of recv_priv structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:50 +0200 [PATCH 13/34] staging:r8188eu: remove ExternalPA member of hal_data_8188e structure Ivan Safonov <insafonov@gmail.com> - 2016-10-07 20:50 +0200 [PATCH 05/34] staging:r8188eu: remove skb data alignment in r8188eu driver code Ivan Safonov <insafonov@gmail.com> - 2016-10-07 21:10 +0200
csiph-web