staging: rtl8192e: Add cfg80211.h and remove defined variables

PATCH New Philipp Hortmann 1 participant 1 message Jun 3, 2023 Staging

Share & tools

Philipp Hortmann

author

2023-06-03 08:52 UTC #0 lore raw

PATCH 1/1 staging: rtl8192e: Add cfg80211.h and remove defined variables

Add cfg80211 and remove defined variables rfc1042_header and bridge_tunnel_header as they are then already defined. Usage of cfg80211 is required to merge driver into wireless subsystem.

Signed-off-by Philipp Hortmann <[email protected]>

---
Tested with rtl8192e (WLL6130-D99)
Transferred this patch over wlan connection of rtl8192e

---
 drivers/staging/rtl8192e/rtllib.h    |  1 +
 drivers/staging/rtl8192e/rtllib_rx.c | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)

drivers/staging/rtl8192e/rtllib.h +1 -0

index f2903b14b793..cdd7fdc5befe 100644
@@ -38,6 +38,7 @@
 
 #include <linux/netdevice.h>
 #include <linux/if_arp.h> /* ARPHRD_ETHER */
+#include <net/cfg80211.h>
 #include <net/lib80211.h>
 
 #define MAX_PRECMD_CNT 16

drivers/staging/rtl8192e/rtllib_rx.c +0 ~~-12~~

index d44bf261de54..46c77ed335ab 100644
@@ -225,18 +225,6 @@ rtllib_rx_frame_mgmt(struct rtllib_device *ieee, struct sk_buff *skb,
 	return 0;
 }
 
-/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation
- * Ethernet-II snap header (RFC1042 for most EtherTypes)
- */
-static unsigned char rfc1042_header[] = {
-	0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00
-};
-
-/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
-static unsigned char bridge_tunnel_header[] = {
-	0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8
-};
-
 /* No encapsulation header if EtherType < 0x600 (=length) */
 
 /* Called by rtllib_rx_frame_decrypt */

Signature · 1 line

2.40.1