Commit 0ddd6f6f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8187se: rename struct ieee80211_hdr_QOS to struct ieee80211_hdr_4addrqos 



Rename struct ieee80211_hdr_QOS to struct ieee80211_hdr_4addrqos
and QOS_ctl field to qos_ctl (to match the naming used by rtl8192su).

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 726f11e8

drivers/staging/rtl8187se/TODO

+0 −1
Original line number Diff line number Diff line 
TODO:

- prepare private ieee80211 stack for merge with rtl8192su's version:

  - rename struct ieee80211_hdr_QOS to struct ieee80211_hdr_4addrqos

  - add hwsec_active flag to struct ieee80211_device

  - add bHwSec flag to cb_desc structure

  - switch ieee80211.h to use <linux/ieee80211.h>

drivers/staging/rtl8187se/ieee80211/ieee80211.h

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ struct ieee80211_hdr_4addr { 
	u8 addr4[ETH_ALEN];

} __attribute__ ((packed));



struct ieee80211_hdr_QOS {

struct ieee80211_hdr_4addrqos {

	u16 frame_ctl;

	u16 duration_id;

	u8 addr1[ETH_ALEN];
@@ -188,7 +188,7 @@ struct ieee80211_hdr_QOS { 
	u8 addr3[ETH_ALEN];

	u16 seq_ctl;

	u8 addr4[ETH_ALEN];

	u16 QOS_ctl;

	u16 qos_ctl;

} __attribute__ ((packed));



struct ieee80211_hdr_3addr {

drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c

+9 −9
Original line number Diff line number Diff line
@@ -105,12 +105,12 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee, 
	unsigned int seq = WLAN_GET_SEQ_SEQ(sc);

	struct ieee80211_frag_entry *entry;

	struct ieee80211_hdr_3addrqos *hdr_3addrqos;

	struct ieee80211_hdr_QOS *hdr_4addr_QoS;

	struct ieee80211_hdr_4addrqos *hdr_4addrqos;

	u8 tid;



	if (((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) {

	  hdr_4addr_QoS = (struct ieee80211_hdr_QOS *)hdr;

	  tid = le16_to_cpu(hdr_4addr_QoS->QOS_ctl) & IEEE80211_QOS_TID;

	  hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr;

	  tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;

	  tid = UP2AC(tid);

	  tid ++;

	} else if (IEEE80211_QOS_HAS_SEQ(fc)) {
@@ -172,12 +172,12 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee, 
	unsigned int seq = WLAN_GET_SEQ_SEQ(sc);

	struct ieee80211_frag_entry *entry;

	struct ieee80211_hdr_3addrqos *hdr_3addrqos;

	struct ieee80211_hdr_QOS *hdr_4addr_QoS;

	struct ieee80211_hdr_4addrqos *hdr_4addrqos;

	u8 tid;



	if(((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) {

	  hdr_4addr_QoS = (struct ieee80211_hdr_QOS *)hdr;

	  tid = le16_to_cpu(hdr_4addr_QoS->QOS_ctl) & IEEE80211_QOS_TID;

	  hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr;

	  tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;

	  tid = UP2AC(tid);

	  tid ++;

	} else if (IEEE80211_QOS_HAS_SEQ(fc)) {
@@ -378,13 +378,13 @@ static int is_duplicate_packet(struct ieee80211_device *ieee, 
	u16 *last_seq, *last_frag;

	unsigned long *last_time;

	struct ieee80211_hdr_3addrqos *hdr_3addrqos;

	struct ieee80211_hdr_QOS *hdr_4addr_QoS;

	struct ieee80211_hdr_4addrqos *hdr_4addrqos;

	u8 tid;



	//TO2DS and QoS

	if(((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) {

	  hdr_4addr_QoS = (struct ieee80211_hdr_QOS *)header;

	  tid = le16_to_cpu(hdr_4addr_QoS->QOS_ctl) & IEEE80211_QOS_TID;

	  hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)header;

	  tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;

	  tid = UP2AC(tid);

	  tid ++;

	} else if(IEEE80211_QOS_HAS_SEQ(fc)) { //QoS

CRA Git | Maintained and supported by SUSTech CRA and CCSE