From 44630dee03d6c7f143668e7629d073198091b63c Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 14 Feb 2014 16:54:05 -0600 Subject: [PATCH] staging: r8188eu: Remove unnecessary list_head entry from recv_frame union Struct recv_frame_hdr already contains a list head. This one is pointless. Suggested-by: Jes Sorensen Signed-off-by: Larry Finger Cc: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8188eu/core/rtw_recv.c | 7 ++++--- drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c index 794785eb54e..2291b10bf1d 100644 --- a/drivers/staging/rtl8188eu/core/rtw_recv.c +++ b/drivers/staging/rtl8188eu/core/rtw_recv.c @@ -87,9 +87,10 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) precvframe = (union recv_frame *)precvpriv->precv_frame_buf; for (i = 0; i < NR_RECVFRAME; i++) { - _rtw_init_listhead(&(precvframe->u.list)); + _rtw_init_listhead(&(precvframe->u.hdr.list)); - rtw_list_insert_tail(&(precvframe->u.list), &(precvpriv->free_recv_queue.queue)); + rtw_list_insert_tail(&(precvframe->u.hdr.list), + &(precvpriv->free_recv_queue.queue)); res = rtw_os_recv_resource_alloc(padapter, precvframe); @@ -1485,7 +1486,7 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter, struct __queu plist = phead->next; pfhdr = container_of(plist, struct recv_frame_hdr, list); prframe = (union recv_frame *)pfhdr; - rtw_list_delete(&(prframe->u.list)); + rtw_list_delete(&(prframe->u.hdr.list)); if (curfragnum != pfhdr->attrib.frag_num) { /* the first fragment number must be 0 */ diff --git a/drivers/staging/rtl8188eu/include/rtw_recv.h b/drivers/staging/rtl8188eu/include/rtw_recv.h index be9c30c5741..866c9e47011 100644 --- a/drivers/staging/rtl8188eu/include/rtw_recv.h +++ b/drivers/staging/rtl8188eu/include/rtw_recv.h @@ -291,7 +291,6 @@ struct recv_frame_hdr { union recv_frame { union { - struct list_head list; struct recv_frame_hdr hdr; uint mem[RECVFRAME_HDR_ALIGN>>2]; } u; -- 2.46.0