Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: r8188eu: replace rtw_ieee80211_hdr_3addr_qos with ieee80211_qos_hdr

rtw_ieee80211_hdr_3addr_qos is duplicate of ieee80211_qos_hdr.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ivan Safonov and committed by
Greg Kroah-Hartman
5cd83965 bbfe286b

+7 -17
+2 -2
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
··· 1388 1388 pmlmeext->mgnt_seq++; 1389 1389 SetFrameSubType(pframe, WIFI_QOS_DATA_NULL); 1390 1390 1391 - pframe += sizeof(struct rtw_ieee80211_hdr_3addr_qos); 1392 - pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr_qos); 1391 + pframe += sizeof(struct ieee80211_qos_hdr); 1392 + pattrib->pktlen = sizeof(struct ieee80211_qos_hdr); 1393 1393 1394 1394 pattrib->last_txcmdsz = pattrib->pktlen; 1395 1395
+5 -5
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
··· 378 378 SetSeqNum(pwlanhdr, 0); 379 379 380 380 if (bQoS) { 381 - struct rtw_ieee80211_hdr_3addr_qos *pwlanqoshdr; 381 + struct ieee80211_qos_hdr *pwlanqoshdr; 382 382 383 383 SetFrameSubType(pframe, WIFI_QOS_DATA_NULL); 384 384 385 - pwlanqoshdr = (struct rtw_ieee80211_hdr_3addr_qos *)pframe; 386 - SetPriority(&pwlanqoshdr->qc, AC); 387 - SetEOSP(&pwlanqoshdr->qc, bEosp); 385 + pwlanqoshdr = (struct ieee80211_qos_hdr *)pframe; 386 + SetPriority(&pwlanqoshdr->qos_ctrl, AC); 387 + SetEOSP(&pwlanqoshdr->qos_ctrl, bEosp); 388 388 389 - pktlen = sizeof(struct rtw_ieee80211_hdr_3addr_qos); 389 + pktlen = sizeof(struct ieee80211_qos_hdr); 390 390 } else { 391 391 SetFrameSubType(pframe, WIFI_DATA_NULL); 392 392
-10
drivers/staging/rtl8188eu/include/ieee80211.h
··· 291 291 /* this is stolen from ipw2200 driver */ 292 292 #define IEEE_IBSS_MAC_HASH_SIZE 31 293 293 294 - struct rtw_ieee80211_hdr_3addr_qos { 295 - __le16 frame_ctl; 296 - __le16 duration_id; 297 - u8 addr1[ETH_ALEN]; 298 - u8 addr2[ETH_ALEN]; 299 - u8 addr3[ETH_ALEN]; 300 - u16 seq_ctl; 301 - u16 qc; 302 - } __packed; 303 - 304 294 enum eap_type { 305 295 EAP_PACKET = 0, 306 296 EAPOL_START,