staging:r8188eu: replace rx_end member of recv_frame with pkt->end
PATCH 1/4 staging:r8188eu: replace rx_end member of recv_frame with pkt->end
rx_end is duplication of pkt->end pointer. pkt->end is preferred, because it is native skb field supported by skb_*() functions.
--- drivers/staging/rtl8188eu/include/rtw_recv.h | 3 +-- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/staging/rtl8188eu/include/rtw_recv.h +1 -2
@@ -231,7 +231,6 @@ struct recv_frame {uint len;u8 *rx_data;u8 *rx_tail; -u8 *rx_end;struct sta_info *psta;/* for A-MPDU Rx reordering buffer control */ struct recv_reorder_ctrl *preorder_ctrl;
@@ -282,7 +281,7 @@ static inline u8 *recvframe_put(struct recv_frame *precvframe, int sz) precvframe->rx_tail += sz; -if (precvframe->rx_tail > precvframe->rx_end) { +if (precvframe->rx_tail > precvframe->pkt->end) { precvframe->rx_tail -= sz;return NULL ; }
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +0 -1
@@ -125,7 +125,6 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)if (pkt_copy) { pkt_copy->dev = adapt->pnetdev; precvframe->pkt = pkt_copy; - precvframe->rx_end = pkt_copy->data + alloc_sz;skb_reserve (pkt_copy,8 - ((size_t )(pkt_copy->data) &7 ));/* force pkt_copy->data at 8-byte alignment address */ skb_reserve (pkt_copy, shift_sz);/* force ip_hdr at 8-byte alignment address according to shift_sz. */ memcpy (pkt_copy->data, (pbuf + pattrib->drvinfo_sz +RXDESC_SIZE ), skb_len);
Signature · 1 line
2.10.2
PATCH 2/4 staging:r8188eu: remove unused rtw_ieee80211_bar structure definition
rtw_ieee80211_bar structure definition does not used. Remove it.
--- drivers/staging/rtl8188eu/include/wifi.h | 15 --------------- 1 file changed, 15 deletions(-)
drivers/staging/rtl8188eu/include/wifi.h +0 -15
@@ -479,21 +479,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)Below is the definition for 802.11n ------------------------------------------------------------------------------*/ -/** -* struct rtw_ieee80211_bar - HT Block Ack Request -* -* This structure refers to "HT BlockAckReq" as -* described in 802.11n draft section 7.2.1.7.1 -*/ -struct rtw_ieee80211_bar { -unsigned short frame_control; -unsigned short duration; -unsigned char ra[6 ]; -unsigned char ta[6 ]; -unsigned short control; -unsigned short start_seq_num; -} __packed; -/* 802.11 BAR control masks */ #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL 0x0000#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004
Signature · 1 line
2.10.2
PATCH 3/4 staging:r8188eu: update pkt->(data|tail|len) synchronously with rx_(data|tail|len) in recv_frame structure
In reply to Ivan SafonovOriginal driver code uses rx_* members to store skb (pkt) fields (instead of pkt->* members), pkt->* updated only after data completely formed, not in process.
Update pkt->* after data buffer changed (with rx_*).
--- drivers/staging/rtl8188eu/include/rtw_recv.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/rtl8188eu/include/rtw_recv.h +4 -1
@@ -261,6 +261,8 @@ static inline u8 *recvframe_pull(struct recv_frame *precvframe, int sz)if (precvframe ==NULL )return NULL ; + +skb_pull (precvframe->pkt, sz); precvframe->rx_data += sz;if (precvframe->rx_data > precvframe->rx_tail) { precvframe->rx_data -= sz;
@@ -278,7 +280,7 @@ static inline u8 *recvframe_put(struct recv_frame *precvframe, int sz)if (precvframe ==NULL )return NULL ; - +skb_put (precvframe->pkt, sz); precvframe->rx_tail += sz;if (precvframe->rx_tail > precvframe->pkt->end) {
@@ -299,6 +301,7 @@ static inline u8 *recvframe_pull_tail(struct recv_frame *precvframe, int sz)if (precvframe ==NULL )return NULL ; +skb_trim (precvframe->pkt, precvframe->pkt->len - sz); precvframe->rx_tail -= sz;if (precvframe->rx_tail < precvframe->rx_data) { precvframe->rx_tail += sz;
Signature · 1 line
2.10.2
PATCH 4/4 staging:r8188eu: replace recv_frame->rx_(data|len|tail) with pkt->(data|len|tail) and remove unused recvframe_(put|pull|pull_tail)()
In reply to Ivan Safonovrecv_frame->rx_(data|len|tail) duplicate pkt (skb) data|len|tail members and require special functions recvframe_(put|pull|pull_tail)() instead of skb_(put|pull|trim).
Replace rx_(data|len|tail) with pkt->(data|len|tail),
remove rx_(data|len|tail) and remove recvframe_(put|pull|pull_tail)().
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 52 +++++++------- drivers/staging/rtl8188eu/core/rtw_recv.c | 92 ++++++++++++------------ drivers/staging/rtl8188eu/core/rtw_security.c | 12 ++-- drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +- drivers/staging/rtl8188eu/include/rtw_recv.h | 62 ---------------- drivers/staging/rtl8188eu/os_dep/mon.c | 4 +- drivers/staging/rtl8188eu/os_dep/recv_linux.c | 6 -- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 12 ++-- 8 files changed, 83 insertions(+), 159 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +26 -26
@@ -2053,8 +2053,8 @@ static u8 collect_bss_info(struct adapter *padapter,u32 len;u8 *p;u16 val16, subtype; -u8 *pframe = precv_frame->rx_data; -u32 packet_len = precv_frame->len; +u8 *pframe = precv_frame->pkt->data; +u32 packet_len = precv_frame->pkt->len;u8 ie_offset;struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -2563,8 +2563,8 @@ static unsigned int OnProbeReq(struct adapter *padapter,struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *cur = &(pmlmeinfo->network); -u8 *pframe = precv_frame->rx_data; -uint len = precv_frame->len; +u8 *pframe = precv_frame->pkt->data; +uint len = precv_frame->pkt->len;if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ))return _SUCCESS;
@@ -2611,8 +2611,8 @@ static unsigned int OnBeacon(struct adapter *padapter,struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv; -u8 *pframe = precv_frame->rx_data; -uint len = precv_frame->len; +u8 *pframe = precv_frame->pkt->data; +uint len = precv_frame->pkt->len;struct wlan_bssid_ex *pbss;int ret = _SUCCESS;struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
@@ -2708,8 +2708,8 @@ static unsigned int OnAuth(struct adapter *padapter,struct security_priv *psecuritypriv = &padapter->securitypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -u8 *pframe = precv_frame->rx_data; -uint len = precv_frame->len; +u8 *pframe = precv_frame->pkt->data; +uint len = precv_frame->pkt->len;if ((pmlmeinfo->state&0x03 ) !=WIFI_FW_AP_STATE )return _FAIL;
@@ -2871,8 +2871,8 @@ static unsigned int OnAuthClient(struct adapter *padapter,unsigned int go2asoc =0 ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -u8 *pframe = precv_frame->rx_data; -uint pkt_len = precv_frame->len; +u8 *pframe = precv_frame->pkt->data; +uint pkt_len = precv_frame->pkt->len;DBG_88E ("%s\n" , __func__);
@@ -2959,8 +2959,8 @@ static unsigned int OnAssocReq(struct adapter *padapter,struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *cur = &(pmlmeinfo->network);struct sta_priv *pstapriv = &padapter->stapriv; -u8 *pframe = precv_frame->rx_data; -uint pkt_len = precv_frame->len; +u8 *pframe = precv_frame->pkt->data; +uint pkt_len = precv_frame->pkt->len;if ((pmlmeinfo->state&0x03 ) !=WIFI_FW_AP_STATE )return _FAIL;
@@ -3391,8 +3391,8 @@ static unsigned int OnAssocRsp(struct adapter *padapter,struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);/* struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); */ -u8 *pframe = precv_frame->rx_data; -uint pkt_len = precv_frame->len; +u8 *pframe = precv_frame->pkt->data; +uint pkt_len = precv_frame->pkt->len;DBG_88E ("%s\n" , __func__);
@@ -3476,7 +3476,7 @@ static unsigned int OnDeAuth(struct adapter *padapter,struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data;struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);/* check A3 */
@@ -3531,7 +3531,7 @@ static unsigned int OnDisassoc(struct adapter *padapter,struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data;struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);/* check A3 */
@@ -3590,7 +3590,7 @@ static unsigned int on_action_spct(struct adapter *padapter, {struct sta_info *psta =NULL ;struct sta_priv *pstapriv = &padapter->stapriv; -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data;u8 *frame_body = pframe +sizeof (struct ieee80211_hdr_3addr );u8 category;u8 action;
@@ -3646,7 +3646,7 @@ static unsigned int OnAction_back(struct adapter *padapter,unsigned short tid, status, reason_code =0 ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data;struct sta_priv *pstapriv = &padapter->stapriv;/* check RA matches or not */ if (memcmp(myid(&(padapter->eeprompriv)), GetAddr1Ptr(pframe),
@@ -3719,7 +3719,7 @@ static s32 rtw_action_public_decache(struct recv_frame *recv_frame, s32 token) {struct adapter *adapter = recv_frame->adapter;struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv); -u8 *frame = recv_frame->rx_data; +u8 *frame = recv_frame->pkt->data;u16 seq_ctrl = ((recv_frame->attrib.seq_num&0xffff ) <<4 ) | (recv_frame->attrib.frag_num &0xf );
@@ -3749,7 +3749,7 @@ static s32 rtw_action_public_decache(struct recv_frame *recv_frame, s32 token)static unsigned int on_action_public_p2p (struct recv_frame *precv_frame) { -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data;u8 *frame_body;u8 dialogToken =0 ;
@@ -3765,7 +3765,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)static unsigned int on_action_public_vendor (struct recv_frame *precv_frame) {unsigned int ret = _FAIL; -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data;u8 *frame_body = pframe +sizeof (struct ieee80211_hdr_3addr );if (!memcmp (frame_body +2 ,P2P_OUI ,4 ))
@@ -3777,7 +3777,7 @@ static unsigned int on_action_public_vendor(struct recv_frame *precv_frame)static unsigned int on_action_public_default (struct recv_frame *precv_frame,u8 action) {unsigned int ret = _FAIL; -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data;u8 *frame_body = pframe +sizeof (struct ieee80211_hdr_3addr );u8 token;
@@ -3796,7 +3796,7 @@ static unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precv_frame) {unsigned int ret = _FAIL; -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data;u8 *frame_body = pframe +sizeof (struct ieee80211_hdr_3addr );u8 category, action;
@@ -3867,7 +3867,7 @@ static unsigned int OnAction(struct adapter *padapter,unsigned char category;struct action_handler *ptable;unsigned char *frame_body; -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data; frame_body = (unsigned char *)(pframe +sizeof (struct ieee80211_hdr_3addr ));
@@ -4123,7 +4123,7 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)static void _mgt_dispatcher (struct adapter *padapter,struct mlme_handler *ptable,struct recv_frame *precv_frame) {u8 bc_addr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data;if (ptable->func) {/* receive the frames that ra(a1) is my address or ra(a1) is bc address. */
@@ -4142,7 +4142,7 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame)struct mlme_priv *pmlmepriv = &padapter->mlmepriv;#endif /* CONFIG_88EU_AP_MODE */ u8 bc_addr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; -u8 *pframe = precv_frame->rx_data; +u8 *pframe = precv_frame->pkt->data;struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (pframe)); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
drivers/staging/rtl8188eu/core/rtw_recv.c +44 -48
250 lines not on this page · raw message
drivers/staging/rtl8188eu/core/rtw_security.c +6 -6
@@ -208,7 +208,7 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)struct security_priv *psecuritypriv = &padapter->securitypriv; - pframe = (unsigned char *)((struct recv_frame *)precvframe)->rx_data; + pframe = (unsigned char *)((struct recv_frame *)precvframe)->pkt->data;/* start to decrypt recvframe */ if ((prxattrib->encrypt == _WEP40_) || (prxattrib->encrypt == _WEP104_)) {
@@ -217,7 +217,7 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe) keylength = psecuritypriv->dot11DefKeylen[keyindex];memcpy (&wepkey[0 ], iv,3 );memcpy (&wepkey[3 ], &psecuritypriv->dot11DefKey[keyindex].skey[0 ], keylength); - length = ((struct recv_frame *)precvframe)->len-prxattrib->hdrlen-prxattrib->iv_len; + length = ((struct recv_frame *)precvframe)->pkt->len-prxattrib->hdrlen-prxattrib->iv_len; payload = pframe+prxattrib->iv_len+prxattrib->hdrlen;
@@ -659,7 +659,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)u32 res = _SUCCESS; - pframe = (unsigned char *)((struct recv_frame *)precvframe)->rx_data; + pframe = (unsigned char *)((struct recv_frame *)precvframe)->pkt->data;/* 4 start to decrypt recvframe */ if (prxattrib->encrypt == _TKIP_) {
@@ -679,7 +679,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) iv = pframe+prxattrib->hdrlen; payload = pframe+prxattrib->iv_len+prxattrib->hdrlen; - length = ((struct recv_frame *)precvframe)->len-prxattrib->hdrlen-prxattrib->iv_len; + length = ((struct recv_frame *)precvframe)->pkt->len-prxattrib->hdrlen-prxattrib->iv_len;GET_TKIP_PN (iv, dot11txpn);
@@ -1470,7 +1470,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)struct security_priv *psecuritypriv = &padapter->securitypriv;u32 res = _SUCCESS; - pframe = (unsigned char *)((struct recv_frame *)precvframe)->rx_data; + pframe = (unsigned char *)((struct recv_frame *)precvframe)->pkt->data;/* 4 start to encrypt each fragment */ if (prxattrib->encrypt == _AES_) { stainfo =rtw_get_stainfo (&padapter->stapriv, &prxattrib->ta[0 ]);
@@ -1494,7 +1494,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) }else { prwskey = &stainfo->dot118021x_UncstKey.skey[0 ]; } - length = ((struct recv_frame *)precvframe)->len-prxattrib->hdrlen-prxattrib->iv_len; + length = ((struct recv_frame *)precvframe)->pkt->len-prxattrib->hdrlen-prxattrib->iv_len; res =aes_decipher (prwskey, prxattrib->hdrlen, pframe, length); }else {RT_TRACE (_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_encrypt: stainfo==NULL!!!\n" ));
drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c +1 -1
@@ -150,7 +150,7 @@ void update_recvframe_phyinfo_88e(struct recv_frame *precvframe, pkt_info.bPacketToSelf = false; pkt_info.bPacketBeacon = false; - wlanhdr = precvframe->rx_data; + wlanhdr = precvframe->pkt->data; pkt_info.bPacketMatchBSSID = ((!IsFrameTypeCtrl(wlanhdr)) && !pattrib->icv_err && !pattrib->crc_err &&
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -62
74 lines not on this page · raw message
drivers/staging/rtl8188eu/os_dep/mon.c +2 -2
@@ -92,8 +92,8 @@ void rtl88eu_mon_recv_hook(struct net_device *dev, struct recv_frame *frame)return ; attr = &frame->attrib; - data = frame->rx_data; - data_len = frame->len; + data = frame->pkt->data; + data_len = frame->pkt->len;/* Broadcast and multicast frames don't have attr->{iv,icv}_len set */ SET_ICE_IV_LEN (iv_len, icv_len, attr->encrypt);
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -6
@@ -88,12 +88,6 @@ int rtw_recv_indicatepkt(struct adapter *padapter, goto _recv_indicatepkt_drop; } - skb->data = precv_frame->rx_data; - -skb_set_tail_pointer (skb, precv_frame->len); - - skb->len = precv_frame->len; -if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {struct sk_buff *pskb2 =NULL ;struct sta_info *psta =NULL ;
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +4 -8
@@ -73,7 +73,6 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb) }INIT_LIST_HEAD (&precvframe->list); - precvframe->len =0 ;update_recvframe_attrib_88e (precvframe, prxstat);
@@ -128,16 +127,13 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)skb_reserve (pkt_copy,8 - ((size_t )(pkt_copy->data) &7 ));/* force pkt_copy->data at 8-byte alignment address */ skb_reserve (pkt_copy, shift_sz);/* force ip_hdr at 8-byte alignment address according to shift_sz. */ memcpy (pkt_copy->data, (pbuf + pattrib->drvinfo_sz +RXDESC_SIZE ), skb_len); - precvframe->rx_tail = pkt_copy->data; - precvframe->rx_data = pkt_copy->data; +skb_put (precvframe->pkt, skb_len); }else {DBG_88E ("recvbuf2recvframe: alloc_skb fail , drop frag frame\n" );rtw_free_recvframe (precvframe, pfree_recv_queue); goto _exit_recvbuf2recvframe; } -recvframe_put (precvframe, skb_len); -switch (haldata->UsbRxAggMode) {case USB_RX_AGG_DMA :case USB_RX_AGG_MIX :
@@ -159,19 +155,19 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb) } }else if (pattrib->pkt_rpt_type ==TX_REPORT1 ) {/* CCX-TXRPT ack for xmit mgmt frames. */ -handle_txrpt_ccx_88e (adapt, precvframe->rx_data); +handle_txrpt_ccx_88e (adapt, precvframe->pkt->data);rtw_free_recvframe (precvframe, pfree_recv_queue); }else if (pattrib->pkt_rpt_type ==TX_REPORT2 ) {ODM_RA_TxRPT2Handle_8188E ( &haldata->odmpriv, - precvframe->rx_data, + precvframe->pkt->data, pattrib->pkt_len, pattrib->MacIDValidEntry[0 ], pattrib->MacIDValidEntry[1 ] );rtw_free_recvframe (precvframe, pfree_recv_queue); }else if (pattrib->pkt_rpt_type ==HIS_REPORT ) { -interrupt_handler_8188eu (adapt, pattrib->pkt_len, precvframe->rx_data); +interrupt_handler_8188eu (adapt, pattrib->pkt_len, precvframe->pkt->data);rtw_free_recvframe (precvframe, pfree_recv_queue); } pkt_cnt--;
Signature · 1 line
2.10.2