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

staging: rtl8192e: Replace management subframe types with IEEE80211_STYPE_* 



Replace management subframe types RTLLIB_STYPE_* with IEEE80211_STYPE_*
to avoid proprietary constant names.

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


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

drivers/staging/rtl8192e/rtl819x_BAProc.c

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, 
	ether_addr_copy(BAReq->addr2, ieee->dev->dev_addr);



	ether_addr_copy(BAReq->addr3, ieee->current_network.bssid);

	BAReq->frame_control = cpu_to_le16(RTLLIB_STYPE_MANAGE_ACT);

	BAReq->frame_control = cpu_to_le16(IEEE80211_STYPE_ACTION);



	tag = skb_put(skb, 9);

	*tag++ = ACT_CAT_BA;
@@ -153,7 +153,7 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst, 
	ether_addr_copy(Delba->addr1, dst);

	ether_addr_copy(Delba->addr2, ieee->dev->dev_addr);

	ether_addr_copy(Delba->addr3, ieee->current_network.bssid);

	Delba->frame_control = cpu_to_le16(RTLLIB_STYPE_MANAGE_ACT);

	Delba->frame_control = cpu_to_le16(IEEE80211_STYPE_ACTION);



	tag = skb_put(skb, 6);

drivers/staging/rtl8192e/rtllib.h

+0 −14
Original line number Diff line number Diff line
@@ -350,20 +350,6 @@ enum rt_op_mode { 
#define RTLLIB_FTYPE_CTL		0x0004

#define RTLLIB_FTYPE_DATA		0x0008



/* management */

#define RTLLIB_STYPE_ASSOC_REQ	0x0000

#define RTLLIB_STYPE_ASSOC_RESP		0x0010

#define RTLLIB_STYPE_REASSOC_REQ	0x0020

#define RTLLIB_STYPE_REASSOC_RESP	0x0030

#define RTLLIB_STYPE_PROBE_REQ	0x0040

#define RTLLIB_STYPE_PROBE_RESP	0x0050

#define RTLLIB_STYPE_BEACON		0x0080

#define RTLLIB_STYPE_ATIM		0x0090

#define RTLLIB_STYPE_DISASSOC	0x00A0

#define RTLLIB_STYPE_AUTH		0x00B0

#define RTLLIB_STYPE_DEAUTH		0x00C0

#define RTLLIB_STYPE_MANAGE_ACT	0x00D0



/* control */

#define RTLLIB_STYPE_PSPOLL		0x00A0

#define RTLLIB_STYPE_RTS		0x00B0

drivers/staging/rtl8192e/rtllib_softmac.c

+15 −15
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static inline struct sk_buff *rtllib_probe_req(struct rtllib_device *ieee) 
	skb_reserve(skb, ieee->tx_headroom);



	req = skb_put(skb, sizeof(struct rtllib_probe_request));

	req->header.frame_control = cpu_to_le16(RTLLIB_STYPE_PROBE_REQ);

	req->header.frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);

	req->header.duration_id = 0;



	eth_broadcast_addr(req->header.addr1);
@@ -739,7 +739,7 @@ rtllib_authentication_req(struct rtllib_network *beacon, 


	auth = skb_put(skb, sizeof(struct rtllib_authentication));



	auth->header.frame_control = cpu_to_le16(RTLLIB_STYPE_AUTH);

	auth->header.frame_control = cpu_to_le16(IEEE80211_STYPE_AUTH);

	if (challengelen)

		auth->header.frame_control |= cpu_to_le16(RTLLIB_FCTL_WEP);
@@ -860,7 +860,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee, 
	if (encrypt)

		beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);



	beacon_buf->header.frame_control = cpu_to_le16(RTLLIB_STYPE_PROBE_RESP);

	beacon_buf->header.frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_RESP);

	beacon_buf->info_element[0].id = MFIE_TYPE_SSID;

	beacon_buf->info_element[0].len = ssid_len;
@@ -1076,7 +1076,7 @@ rtllib_association_req(struct rtllib_network *beacon, 


	hdr = skb_put(skb, sizeof(struct rtllib_assoc_request_frame) + 2);



	hdr->header.frame_control = cpu_to_le16(RTLLIB_STYPE_ASSOC_REQ);

	hdr->header.frame_control = cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ);

	hdr->header.duration_id = cpu_to_le16(37);

	ether_addr_copy(hdr->header.addr1, beacon->bssid);

	ether_addr_copy(hdr->header.addr2, ieee->dev->dev_addr);
@@ -2136,22 +2136,22 @@ inline int rtllib_rx_frame_softmac(struct rtllib_device *ieee, 


	frame_ctl = le16_to_cpu(header->frame_control);

	switch (WLAN_FC_GET_STYPE(frame_ctl)) {

	case RTLLIB_STYPE_ASSOC_RESP:

	case RTLLIB_STYPE_REASSOC_RESP:

	case IEEE80211_STYPE_ASSOC_RESP:

	case IEEE80211_STYPE_REASSOC_RESP:

		if (rtllib_rx_assoc_resp(ieee, skb, rx_stats) == 1)

			return 1;

		break;

	case RTLLIB_STYPE_ASSOC_REQ:

	case RTLLIB_STYPE_REASSOC_REQ:

	case IEEE80211_STYPE_ASSOC_REQ:

	case IEEE80211_STYPE_REASSOC_REQ:

		break;

	case RTLLIB_STYPE_AUTH:

	case IEEE80211_STYPE_AUTH:

		rtllib_rx_auth(ieee, skb, rx_stats);

		break;

	case RTLLIB_STYPE_DISASSOC:

	case RTLLIB_STYPE_DEAUTH:

	case IEEE80211_STYPE_DISASSOC:

	case IEEE80211_STYPE_DEAUTH:

		rtllib_rx_deauth(ieee, skb);

		break;

	case RTLLIB_STYPE_MANAGE_ACT:

	case IEEE80211_STYPE_ACTION:

		rtllib_process_action(ieee, skb);

		break;

	default:
@@ -2488,7 +2488,7 @@ static struct sk_buff *rtllib_get_beacon_(struct rtllib_device *ieee) 
		return NULL;



	b = (struct rtllib_probe_response *)skb->data;

	b->header.frame_control = cpu_to_le16(RTLLIB_STYPE_BEACON);

	b->header.frame_control = cpu_to_le16(IEEE80211_STYPE_BEACON);



	return skb;

}
@@ -2730,7 +2730,7 @@ rtllib_disauth_skb(struct rtllib_network *beacon, 
	skb_reserve(skb, ieee->tx_headroom);



	disauth = skb_put(skb, sizeof(struct rtllib_disauth));

	disauth->header.frame_control = cpu_to_le16(RTLLIB_STYPE_DEAUTH);

	disauth->header.frame_control = cpu_to_le16(IEEE80211_STYPE_DEAUTH);

	disauth->header.duration_id = 0;



	ether_addr_copy(disauth->header.addr1, beacon->bssid);
@@ -2757,7 +2757,7 @@ rtllib_disassociate_skb(struct rtllib_network *beacon, 
	skb_reserve(skb, ieee->tx_headroom);



	disass = skb_put(skb, sizeof(struct rtllib_disassoc));

	disass->header.frame_control = cpu_to_le16(RTLLIB_STYPE_DISASSOC);

	disass->header.frame_control = cpu_to_le16(IEEE80211_STYPE_DISASSOC);

	disass->header.duration_id = 0;



	ether_addr_copy(disass->header.addr1, beacon->bssid);