diff options
Diffstat (limited to 'drivers/staging/rtl8712')
| -rw-r--r-- | drivers/staging/rtl8712/hal_init.c | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/os_intfs.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/osdep_service.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/wifi.h | 48 |
4 files changed, 2 insertions, 51 deletions
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c index 4eff3fdecdb8..1148075f0cd6 100644 --- a/drivers/staging/rtl8712/hal_init.c +++ b/drivers/staging/rtl8712/hal_init.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 /****************************************************************************** - * hal_init.c * * Copyright(c) 2007 - 2010 Realtek Corporation. All rights reserved. * Linux device driver for RTL8192SU diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c index 2214aca09730..9502f6aa5306 100644 --- a/drivers/staging/rtl8712/os_intfs.c +++ b/drivers/staging/rtl8712/os_intfs.c @@ -203,7 +203,7 @@ struct net_device *r8712_init_netdev(void) if (!pnetdev) return NULL; if (dev_alloc_name(pnetdev, ifname) < 0) { - strcpy(ifname, "wlan%d"); + strscpy(ifname, "wlan%d", sizeof(ifname)); dev_alloc_name(pnetdev, ifname); } padapter = netdev_priv(pnetdev); diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index e939c4a954b3..d33ddffb7ad9 100644 --- a/drivers/staging/rtl8712/osdep_service.h +++ b/drivers/staging/rtl8712/osdep_service.h @@ -46,7 +46,7 @@ struct __queue { } while (0) static inline u32 end_of_queue_search(struct list_head *head, - struct list_head *plist) + struct list_head *plist) { return (head == plist); } diff --git a/drivers/staging/rtl8712/wifi.h b/drivers/staging/rtl8712/wifi.h index 577a95c62d6c..b8acb9c7395d 100644 --- a/drivers/staging/rtl8712/wifi.h +++ b/drivers/staging/rtl8712/wifi.h @@ -20,26 +20,10 @@ #define WLAN_HDR_A3_LEN 24 #define WLAN_HDR_A3_QOS_LEN 26 -#define P80211CAPTURE_VERSION 0x80211001 - enum WIFI_FRAME_TYPE { WIFI_QOS_DATA_TYPE = (BIT(7) | BIT(3)), /*!< QoS Data */ }; -enum WIFI_REG_DOMAIN { - DOMAIN_FCC = 1, - DOMAIN_IC = 2, - DOMAIN_ETSI = 3, - DOMAIN_SPAIN = 4, - DOMAIN_FRANCE = 5, - DOMAIN_MKK = 6, - DOMAIN_ISRAEL = 7, - DOMAIN_MKK1 = 8, - DOMAIN_MKK2 = 9, - DOMAIN_MKK3 = 10, - DOMAIN_MAX -}; - #define SetToDs(pbuf) ({ \ *(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_TODS); \ }) @@ -194,46 +178,14 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe) return sa; } -/*----------------------------------------------------------------------------- - * Below is for the security related definition - *----------------------------------------------------------------------------- - */ -#define _ASOCREQ_IE_OFFSET_ 4 /* excluding wlan_hdr */ -#define _ASOCRSP_IE_OFFSET_ 6 -#define _REASOCREQ_IE_OFFSET_ 10 -#define _REASOCRSP_IE_OFFSET_ 6 -#define _PROBEREQ_IE_OFFSET_ 0 -#define _PROBERSP_IE_OFFSET_ 12 -#define _AUTH_IE_OFFSET_ 6 -#define _DEAUTH_IE_OFFSET_ 0 -#define _BEACON_IE_OFFSET_ 12 - -#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ - /* --------------------------------------------------------------------------- * Below is the fixed elements... * --------------------------------------------------------------------------- */ -#define _AUTH_ALGM_NUM_ 2 -#define _AUTH_SEQ_NUM_ 2 #define _BEACON_ITERVAL_ 2 #define _CAPABILITY_ 2 -#define _CURRENT_APADDR_ 6 -#define _LISTEN_INTERVAL_ 2 -#define _RSON_CODE_ 2 -#define _ASOC_ID_ 2 -#define _STATUS_CODE_ 2 #define _TIMESTAMP_ 8 -#define AUTH_ODD_TO 0 -#define AUTH_EVEN_TO 1 - -/*----------------------------------------------------------------------------- - * Below is the definition for 802.11i / 802.1x - *------------------------------------------------------------------------------ - */ -#define _IEEE8021X_MGT_ 1 /*WPA */ -#define _IEEE8021X_PSK_ 2 /* WPA with pre-shared key */ /*----------------------------------------------------------------------------- * Below is the definition for WMM |