staging:r8188eu: Remove struct pkt_file from set_qos()
PATCH 1/4 staging:r8188eu: Remove struct pkt_file from set_qos()
Struct pkt_file is a base to simple wrapper for skb_copy_bits(). Use skb_copy_bits() without wrappers.
Signed-off-by Ivan Safonov <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
drivers/staging/rtl8188eu/core/rtw_xmit.c +10 -16
@@ -387,27 +387,21 @@ u8 qos_acm(u8 acm_mask, u8 priority)return change_priority; } -static void set_qos (struct pkt_file *ppktfile,struct pkt_attrib *pattrib) +static void set_qos (struct sk_buff *skb,struct pkt_attrib *pattrib) { -struct ethhdr etherhdr; -struct iphdr ip_hdr; -s32 user_prio =0 ; - -_rtw_open_pktfile (ppktfile->pkt, ppktfile); -_rtw_pktfile_read (ppktfile, (unsigned char *)ðerhdr,ETH_HLEN ); - -/* get user_prio from IP hdr */ if (pattrib->ether_type ==0x0800 ) { -_rtw_pktfile_read (ppktfile, (u8 *)&ip_hdr,sizeof (ip_hdr)); -/* user_prio = (ntohs(ip_hdr.tos) >> 5) & 0x3; */ - user_prio = ip_hdr.tos >>5 ; +struct iphdr ip_hdr; + +skb_copy_bits (skb,ETH_HLEN , &ip_hdr,sizeof (ip_hdr)); + pattrib->priority = ip_hdr.tos >>5 ; }else if (pattrib->ether_type ==ETH_P_PAE ) {/* "When priority processing of data frames is supported, */ /* a STA's SME should send EAPOL-Key frames at the highest priority." */ - user_prio =7 ; + pattrib->priority =7 ; + }else { + pattrib->priority =0 ; } - pattrib->priority = user_prio; pattrib->hdrlen =WLAN_HDR_A3_QOS_LEN ; pattrib->subtype =WIFI_QOS_DATA_TYPE ; }
@@ -516,10 +510,10 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pif (check_fwstate (pmlmepriv,WIFI_AP_STATE |WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) {if (psta->qos_option) -set_qos (&pktfile, pattrib); +set_qos (pktfile.pkt, pattrib); }else {if (pqospriv->qos_option) { -set_qos (&pktfile, pattrib); +set_qos (pktfile.pkt, pattrib);if (pmlmepriv->acm_mask !=0 ) pattrib->priority =qos_acm (pmlmepriv->acm_mask, pattrib->priority);
Signature · 6 lines
2.13.6 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH 2/4 staging:r8188eu: Remove struct pkt_file from update_attrib()
Struct pkt_file is a base to simple wrapper for skb_copy_bits(). Do not use struct pkt_file in update_attrib().
Signed-off-by Ivan Safonov <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/staging/rtl8188eu/core/rtw_xmit.c +7 -9
@@ -408,7 +408,6 @@ static void set_qos(struct sk_buff *skb, struct pkt_attrib *pattrib)static s32 update_attrib (struct adapter *padapter,struct sk_buff *pkt,struct pkt_attrib *pattrib) { -struct pkt_file pktfile;struct sta_info *psta =NULL ;struct ethhdr etherhdr;
@@ -419,9 +418,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pstruct qos_priv *pqospriv = &pmlmepriv->qospriv;int res = _SUCCESS; - -_rtw_open_pktfile (pkt, &pktfile); -_rtw_pktfile_read (&pktfile, (u8 *)ðerhdr,ETH_HLEN ); +skb_copy_bits (pkt,0 , ðerhdr,ETH_HLEN ); pattrib->ether_type =ntohs (etherhdr.h_proto);
@@ -442,16 +439,17 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pmemcpy (pattrib->ta,get_bssid (pmlmepriv),ETH_ALEN ); } - pattrib->pktlen = pktfile.pkt_len; + pattrib->pktlen = pkt->len -ETH_HLEN ;if (pattrib->ether_type ==ETH_P_IP ) {/* The following is for DHCP and ARP packet, we use cck1M to tx these packets and let LPS awake some time */ /* to prevent DHCP protocol fail */ u8 tmp[24 ]; -_rtw_pktfile_read (&pktfile, &tmp[0 ],24 ); +skb_copy_bits (pkt,ETH_HLEN , tmp,24 ); + pattrib->dhcp_pkt =0 ; -if (pktfile.pkt_len >282 ) {/* MINIMUM_DHCP_PACKET_SIZE) { */ +if (pkt->len >ETH_HLEN +24 +282 ) {/* MINIMUM_DHCP_PACKET_SIZE) { */ if (pattrib->ether_type ==ETH_P_IP ) {/* IP header */ if (((tmp[21 ] ==68 ) && (tmp[23 ] ==67 )) || ((tmp[21 ] ==67 ) && (tmp[23 ] ==68 ))) {
@@ -510,10 +508,10 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pif (check_fwstate (pmlmepriv,WIFI_AP_STATE |WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) {if (psta->qos_option) -set_qos (pktfile.pkt, pattrib); +set_qos (pkt, pattrib); }else {if (pqospriv->qos_option) { -set_qos (pktfile.pkt, pattrib); +set_qos (pkt, pattrib);if (pmlmepriv->acm_mask !=0 ) pattrib->priority =qos_acm (pmlmepriv->acm_mask, pattrib->priority);
Signature · 6 lines
2.13.6 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH 3/4 staging:r8188eu: Remove struct pkt_file from rtw_xmitframe_coalesce()
In reply to Ivan SafonovStruct pkt_file is a base to simple wrapper for skb_copy_bits(). Eliminate struct pkt_file usage in rtw_xmitframe_coalesce().
Signed-off-by Ivan Safonov <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
drivers/staging/rtl8188eu/core/rtw_xmit.c +5 -12
@@ -943,7 +943,6 @@ This sub-routine will perform all the following:*/ s32 rtw_xmitframe_coalesce (struct adapter *padapter,struct sk_buff *pkt,struct xmit_frame *pxmitframe) { -struct pkt_file pktfile;s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;size_t addr;u8 *pframe, *mem_start;
@@ -954,7 +953,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, structu8 *pbuf_start;s32 bmcst =IS_MCAST (pattrib->ra);s32 res = _SUCCESS; - +size_t remainder = pkt->len -ETH_HLEN ; psta =rtw_get_stainfo (&padapter->stapriv, pattrib->ra);
@@ -979,9 +978,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct goto exit; } -_rtw_open_pktfile (pkt, &pktfile); -_rtw_pktfile_read (&pktfile,NULL ,ETH_HLEN ); - frg_inx =0 ; frg_len = pxmitpriv->frag_len -4 ;/* 2346-4 = 2342 */
@@ -1038,12 +1034,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, structif ((pattrib->icv_len >0 ) && (pattrib->bswenc)) mpdu_len -= pattrib->icv_len; -if (bmcst) { -/* don't do fragment to broadcat/multicast packets */ - mem_sz =_rtw_pktfile_read (&pktfile, pframe, pattrib->pktlen); - }else { - mem_sz =_rtw_pktfile_read (&pktfile, pframe, mpdu_len); - } + mem_sz =min_t (size_t, bmcst ? pattrib->pktlen : mpdu_len, remainder); +skb_copy_bits (pkt, pkt->len - remainder, pframe, mem_sz); + remainder -= mem_sz; pframe += mem_sz;
@@ -1054,7 +1047,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct frg_inx++; -if (bmcst || pktfile.pkt_len ==0 ) { +if (bmcst || remainder ==0 ) { pattrib->nr_frags = frg_inx; pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len + ((pattrib->nr_frags == 1) ? llc_sz : 0) +
Signature · 6 lines
2.13.6 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH 4/4 staging:r8188eu: Remove unused struct pkt_file
In reply to Ivan SafonovStruct pkt_file is unused now, so remove it and correponding functions.
Signed-off-by Ivan Safonov <[email protected]>
--- drivers/staging/rtl8188eu/include/xmit_osdep.h | 13 --------- drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 37 -------------------------- 2 files changed, 50 deletions(-)
drivers/staging/rtl8188eu/include/xmit_osdep.h +0 -13
@@ -18,15 +18,6 @@#include <osdep_service.h> #include <drv_types.h> -struct pkt_file { -struct sk_buff *pkt; -size_t pkt_len;/* the remainder length of the open_file */ -unsigned char *cur_buffer; -u8 *buf_start; -u8 *cur_addr; -size_t buf_len; -}; -#define NR_XMITFRAME 256struct xmit_priv ;
@@ -43,10 +34,6 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 alloc_sz);void rtw_os_xmit_resource_free (struct xmit_buf *pxmitbuf); -uint rtw_remainder_len (struct pkt_file *pfile); -void _rtw_open_pktfile (struct sk_buff *pkt,struct pkt_file *pfile); -uint _rtw_pktfile_read (struct pkt_file *pfile,u8 *rmem,uint rlen); -void rtw_os_pkt_complete (struct adapter *padapter,struct sk_buff *pkt);void rtw_os_xmit_complete (struct adapter *padapter,struct xmit_frame *pxframe);
drivers/staging/rtl8188eu/os_dep/xmit_linux.c +0 -37
@@ -22,43 +22,6 @@#include <xmit_osdep.h> #include <osdep_intf.h> -uint rtw_remainder_len (struct pkt_file *pfile) -{ -return pfile->buf_len - ((size_t )(pfile->cur_addr) - - (size_t )(pfile->buf_start)); -} - -void _rtw_open_pktfile (struct sk_buff *pktptr,struct pkt_file *pfile) -{ - - pfile->pkt = pktptr; - pfile->cur_addr = pktptr->data; - pfile->buf_start = pktptr->data; - pfile->pkt_len = pktptr->len; - pfile->buf_len = pktptr->len; - - pfile->cur_buffer = pfile->buf_start; - -} - -uint _rtw_pktfile_read (struct pkt_file *pfile,u8 *rmem,uint rlen) -{ -uint len =0 ; - - - len =rtw_remainder_len (pfile); - len =min (rlen, len); - -if (rmem) -skb_copy_bits (pfile->pkt, pfile->buf_len-pfile->pkt_len, rmem, len); - - pfile->cur_addr += len; - pfile->pkt_len -= len; - - -return len; -} -int rtw_os_xmit_resource_alloc (struct adapter *padapter,struct xmit_buf *pxmitbuf,u32 alloc_sz) {int i;
Signature · 6 lines
2.13.6 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel