From d88b46ce5ab8160a3c5d4efde27197d7545ec19a Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sat, 3 Jun 2023 10:52:51 +0200 Subject: [PATCH] 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 Message-ID: <20230603085251.GA20230@matrix-ESPRIMO-P710> Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtllib.h | 1 + drivers/staging/rtl8192e/rtllib_rx.c | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index f2903b14b793..cdd7fdc5befe 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -38,6 +38,7 @@ #include #include /* ARPHRD_ETHER */ +#include #include #define MAX_PRECMD_CNT 16 diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index d44bf261de54..46c77ed335ab 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -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 */