diff options
| author |   Ivan Safonov <insafonov@gmail.com> | 2018-02-04 22:27:37 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-16 17:25:20 +0100 |
| commit | ebb2a79d26113e7c103aa96b25df2d0545099171 (patch) | |
| tree | bdd9839f36161a21835898f0f99be27087b2cfb2 /drivers/staging/rtl8188eu | |
| parent | staging:r8188eu: Remove struct pkt_file from set_qos() (diff) | |
| download | linux-dev-ebb2a79d26113e7c103aa96b25df2d0545099171.tar.xz linux-dev-ebb2a79d26113e7c103aa96b25df2d0545099171.zip | |
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 <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu')
| -rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_xmit.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c index 76b652648d3d..eb46e34ba562 100644 --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c @@ -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 p struct 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 p memcpy(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 p if (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); |