Commit 97212e2b authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman

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: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43a1b9b2
...@@ -387,27 +387,21 @@ u8 qos_acm(u8 acm_mask, u8 priority) ...@@ -387,27 +387,21 @@ u8 qos_acm(u8 acm_mask, u8 priority)
return change_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; if (pattrib->ether_type == 0x0800) {
struct iphdr ip_hdr; struct iphdr ip_hdr;
s32 user_prio = 0;
_rtw_open_pktfile(ppktfile->pkt, ppktfile);
_rtw_pktfile_read(ppktfile, (unsigned char *)&etherhdr, ETH_HLEN);
/* get user_prio from IP hdr */ skb_copy_bits(skb, ETH_HLEN, &ip_hdr, sizeof(ip_hdr));
if (pattrib->ether_type == 0x0800) { pattrib->priority = ip_hdr.tos >> 5;
_rtw_pktfile_read(ppktfile, (u8 *)&ip_hdr, sizeof(ip_hdr));
/* user_prio = (ntohs(ip_hdr.tos) >> 5) & 0x3; */
user_prio = ip_hdr.tos >> 5;
} else if (pattrib->ether_type == ETH_P_PAE) { } else if (pattrib->ether_type == ETH_P_PAE) {
/* "When priority processing of data frames is supported, */ /* "When priority processing of data frames is supported, */
/* a STA's SME should send EAPOL-Key frames at the highest priority." */ /* 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->hdrlen = WLAN_HDR_A3_QOS_LEN;
pattrib->subtype = WIFI_QOS_DATA_TYPE; pattrib->subtype = WIFI_QOS_DATA_TYPE;
} }
...@@ -516,10 +510,10 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p ...@@ -516,10 +510,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 (check_fwstate(pmlmepriv, WIFI_AP_STATE|WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE)) {
if (psta->qos_option) if (psta->qos_option)
set_qos(&pktfile, pattrib); set_qos(pktfile.pkt, pattrib);
} else { } else {
if (pqospriv->qos_option) { if (pqospriv->qos_option) {
set_qos(&pktfile, pattrib); set_qos(pktfile.pkt, pattrib);
if (pmlmepriv->acm_mask != 0) if (pmlmepriv->acm_mask != 0)
pattrib->priority = qos_acm(pmlmepriv->acm_mask, pattrib->priority); pattrib->priority = qos_acm(pmlmepriv->acm_mask, pattrib->priority);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment