Commit 56724b74 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove struct rtllib_hdr_4addrqos 



Replace struct rtllib_hdr_4addrqos with struct ieee80211_qos_hdr_4addr to
avoid proprietary code.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/e146191ec1781a3989b318316fe9d8cdb330a52a.1694792595.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cefacff1

drivers/staging/rtl8192e/rtllib.h

+0 −12
Original line number Diff line number Diff line
@@ -679,18 +679,6 @@ struct rtllib_pspoll_hdr { 
	u8 ta[ETH_ALEN];

} __packed;



struct rtllib_hdr_4addrqos {

	__le16 frame_ctl;

	__le16 duration_id;

	u8 addr1[ETH_ALEN];

	u8 addr2[ETH_ALEN];

	u8 addr3[ETH_ALEN];

	__le16 seq_ctl;

	u8 addr4[ETH_ALEN];

	__le16 qos_ctl;

	u8 payload[];

} __packed;



struct rtllib_info_element {

	u8 id;

	u8 len;

drivers/staging/rtl8192e/rtllib_rx.c

+9 −9
Original line number Diff line number Diff line
@@ -94,13 +94,13 @@ rtllib_frag_cache_get(struct rtllib_device *ieee, 
	unsigned int seq = WLAN_GET_SEQ_SEQ(sc);

	struct rtllib_frag_entry *entry;

	struct ieee80211_qos_hdr *hdr_3addrqos;

	struct rtllib_hdr_4addrqos *hdr_4addrqos;

	struct ieee80211_qos_hdr_4addr *hdr_4addrqos;

	u8 tid;



	if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS) &&

	    RTLLIB_QOS_HAS_SEQ(fc)) {

		hdr_4addrqos = (struct rtllib_hdr_4addrqos *)hdr;

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

		hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)hdr;

		tid = le16_to_cpu(hdr_4addrqos->qos_ctrl) & RTLLIB_QCTL_TID;

		tid = UP2AC(tid);

		tid++;

	} else if (RTLLIB_QOS_HAS_SEQ(fc)) {
@@ -163,13 +163,13 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee, 
	unsigned int seq = WLAN_GET_SEQ_SEQ(sc);

	struct rtllib_frag_entry *entry;

	struct ieee80211_qos_hdr *hdr_3addrqos;

	struct rtllib_hdr_4addrqos *hdr_4addrqos;

	struct ieee80211_qos_hdr_4addr *hdr_4addrqos;

	u8 tid;



	if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS) &&

	    RTLLIB_QOS_HAS_SEQ(fc)) {

		hdr_4addrqos = (struct rtllib_hdr_4addrqos *)hdr;

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

		hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)hdr;

		tid = le16_to_cpu(hdr_4addrqos->qos_ctrl) & RTLLIB_QCTL_TID;

		tid = UP2AC(tid);

		tid++;

	} else if (RTLLIB_QOS_HAS_SEQ(fc)) {
@@ -356,13 +356,13 @@ static int is_duplicate_packet(struct rtllib_device *ieee, 
	u16 *last_seq, *last_frag;

	unsigned long *last_time;

	struct ieee80211_qos_hdr *hdr_3addrqos;

	struct rtllib_hdr_4addrqos *hdr_4addrqos;

	struct ieee80211_qos_hdr_4addr *hdr_4addrqos;

	u8 tid;



	if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS) &&

	    RTLLIB_QOS_HAS_SEQ(fc)) {

		hdr_4addrqos = (struct rtllib_hdr_4addrqos *)header;

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

		hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)header;

		tid = le16_to_cpu(hdr_4addrqos->qos_ctrl) & RTLLIB_QCTL_TID;

		tid = UP2AC(tid);

		tid++;

	} else if (RTLLIB_QOS_HAS_SEQ(fc)) {