From nobody Thu Feb 12 09:30:20 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61536EED617 for ; Fri, 15 Sep 2023 16:08:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236450AbjIOQHz (ORCPT ); Fri, 15 Sep 2023 12:07:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236490AbjIOQHj (ORCPT ); Fri, 15 Sep 2023 12:07:39 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C342EC1 for ; Fri, 15 Sep 2023 09:07:33 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4046f7d49a9so5748425e9.1 for ; Fri, 15 Sep 2023 09:07:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694794052; x=1695398852; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=8mEl920j4bMU1c1j+prGL8R31kmbWRsQYB45PK9cGhQ=; b=mUU03TXfHtoyJKck8C9DFE+9nRQLVwvu3/vszAy51/4Tt5o28Oq6gZ8WzPhwPiDL0P eNS+pClIa6tksOpYUNHBm8K0vmPZRK1ueAlGTGlheirE48U+Re1G6GgGbYatD1hDAECK RIJUg8rLaSbeeCMcNB9Tdl6ytrujqDnqSx32/o/VjXB32pfoIPwYRO5d2cwDoxkp2HXh a5iU+pxWODOmIil7EJD6KZxNAs7esKRVKyIycgi/1EnkCoc9/2IykjwUat8TeoXw8+9m tGTLZdsvJF237THExjxPRnqiNdnYKhD+GVwQiMQd6IDoCYXf+eG2mNYTGXWoNQUIRP+w jjHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694794052; x=1695398852; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=8mEl920j4bMU1c1j+prGL8R31kmbWRsQYB45PK9cGhQ=; b=qv7tchd4OArPzULTtAUuo3/HfqeIzsSj8aZYh/Fp3xqelJZdlWJ+3eN+gJMEWK6k92 X0lzOFk23vZy0bE+D8CEkBYeFszzNjDm/gbLaZler+xds9IR1yZV12UH/cR/xOzaBgRq trL68BjW6rkxtEYJ9EGr9URnyX1g265vSfcEdBmHDyFK+0CVUYyJC+tKw/Wl5arhSdWB vfLX/gzgp8wkZdI8Q0czrgiH8eA6HyINg6gxtC9ilS0Ppqc4xMe8+SBhpVq9C+XEjYKw LkAMJke+SB+myfJh7tXg+aPp1SXzAagkYAVT8rUrbiWit617FE5RVbXpz8RBc5eBkggy n0mQ== X-Gm-Message-State: AOJu0YwhxHksLF7zZhfe5g3K09XzBPV8PDIfmD3P9ryIg3np7FfO12pP taaI6hapDF/2qQtNlY38R5I= X-Google-Smtp-Source: AGHT+IFuO50yzHNl10RIZSyAAE218Gy11mrpopmrZ5Z+zuljjIKx6D52kWfYVUFCf51Y6tfzWv/s1A== X-Received: by 2002:a05:600c:3b03:b0:3ff:8617:672b with SMTP id m3-20020a05600c3b0300b003ff8617672bmr2058173wms.2.1694794052198; Fri, 15 Sep 2023 09:07:32 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id f10-20020adff8ca000000b0031ffa453affsm617386wrq.17.2023.09.15.09.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 09:07:31 -0700 (PDT) Date: Fri, 15 Sep 2023 18:07:30 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/16] staging: rtl8192e: Replace struct rtllib_hdr_3addr in structs of rtllib.h Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace struct rtllib_hdr_3addr with struct ieee80211_hdr_3addr to avoid proprietary struct in structs of rtllib.h. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 24 +++++++---------------- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 18 ++++++++--------- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index c13268ad6b56..55f96f446f9e 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -685,16 +685,6 @@ struct rtllib_hdr { u8 payload[]; } __packed; =20 -struct rtllib_hdr_3addr { - __le16 frame_ctl; - __le16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - __le16 seq_ctl; - u8 payload[]; -} __packed; - struct rtllib_hdr_4addr { __le16 frame_ctl; __le16 duration_id; @@ -736,7 +726,7 @@ struct rtllib_info_element { } __packed; =20 struct rtllib_authentication { - struct rtllib_hdr_3addr header; + struct ieee80211_hdr_3addr header; __le16 algorithm; __le16 transaction; __le16 status; @@ -745,23 +735,23 @@ struct rtllib_authentication { } __packed; =20 struct rtllib_disauth { - struct rtllib_hdr_3addr header; + struct ieee80211_hdr_3addr header; __le16 reason; } __packed; =20 struct rtllib_disassoc { - struct rtllib_hdr_3addr header; + struct ieee80211_hdr_3addr header; __le16 reason; } __packed; =20 struct rtllib_probe_request { - struct rtllib_hdr_3addr header; + struct ieee80211_hdr_3addr header; /* SSID, supported rates */ struct rtllib_info_element info_element[]; } __packed; =20 struct rtllib_probe_response { - struct rtllib_hdr_3addr header; + struct ieee80211_hdr_3addr header; u32 time_stamp[2]; __le16 beacon_interval; __le16 capability; @@ -775,7 +765,7 @@ struct rtllib_probe_response { #define rtllib_beacon rtllib_probe_response =20 struct rtllib_assoc_request_frame { - struct rtllib_hdr_3addr header; + struct ieee80211_hdr_3addr header; __le16 capability; __le16 listen_interval; /* SSID, supported rates, RSN */ @@ -783,7 +773,7 @@ struct rtllib_assoc_request_frame { } __packed; =20 struct rtllib_assoc_response_frame { - struct rtllib_hdr_3addr header; + struct ieee80211_hdr_3addr header; __le16 capability; __le16 status; __le16 aid; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index dddd38bbc648..0c2135431f5b 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -2483,7 +2483,7 @@ static inline void rtllib_process_probe_response( short renew; struct rtllib_network *network =3D kzalloc(sizeof(struct rtllib_network), GFP_ATOMIC); - __le16 frame_ctl =3D beacon->header.frame_ctl; + __le16 frame_ctl =3D beacon->header.frame_control; =20 if (!network) return; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index e3b15fa0edcb..3c61b6f4f69f 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -331,7 +331,7 @@ static inline struct sk_buff *rtllib_probe_req(struct r= tllib_device *ieee) skb_reserve(skb, ieee->tx_headroom); =20 req =3D skb_put(skb, sizeof(struct rtllib_probe_request)); - req->header.frame_ctl =3D cpu_to_le16(RTLLIB_STYPE_PROBE_REQ); + req->header.frame_control =3D cpu_to_le16(RTLLIB_STYPE_PROBE_REQ); req->header.duration_id =3D 0; =20 eth_broadcast_addr(req->header.addr1); @@ -739,9 +739,9 @@ rtllib_authentication_req(struct rtllib_network *beacon, =20 auth =3D skb_put(skb, sizeof(struct rtllib_authentication)); =20 - auth->header.frame_ctl =3D cpu_to_le16(RTLLIB_STYPE_AUTH); + auth->header.frame_control =3D cpu_to_le16(RTLLIB_STYPE_AUTH); if (challengelen) - auth->header.frame_ctl |=3D cpu_to_le16(RTLLIB_FCTL_WEP); + auth->header.frame_control |=3D cpu_to_le16(RTLLIB_FCTL_WEP); =20 auth->header.duration_id =3D cpu_to_le16(0x013a); ether_addr_copy(auth->header.addr1, beacon->bssid); @@ -860,7 +860,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_= device *ieee, if (encrypt) beacon_buf->capability |=3D cpu_to_le16(WLAN_CAPABILITY_PRIVACY); =20 - beacon_buf->header.frame_ctl =3D cpu_to_le16(RTLLIB_STYPE_PROBE_RESP); + beacon_buf->header.frame_control =3D cpu_to_le16(RTLLIB_STYPE_PROBE_RESP); beacon_buf->info_element[0].id =3D MFIE_TYPE_SSID; beacon_buf->info_element[0].len =3D ssid_len; =20 @@ -1076,7 +1076,7 @@ rtllib_association_req(struct rtllib_network *beacon, =20 hdr =3D skb_put(skb, sizeof(struct rtllib_assoc_request_frame) + 2); =20 - hdr->header.frame_ctl =3D cpu_to_le16(RTLLIB_STYPE_ASSOC_REQ); + hdr->header.frame_control =3D cpu_to_le16(RTLLIB_STYPE_ASSOC_REQ); hdr->header.duration_id =3D cpu_to_le16(37); ether_addr_copy(hdr->header.addr1, beacon->bssid); ether_addr_copy(hdr->header.addr2, ieee->dev->dev_addr); @@ -2488,7 +2488,7 @@ static struct sk_buff *rtllib_get_beacon_(struct rtll= ib_device *ieee) return NULL; =20 b =3D (struct rtllib_probe_response *)skb->data; - b->header.frame_ctl =3D cpu_to_le16(RTLLIB_STYPE_BEACON); + b->header.frame_control =3D cpu_to_le16(RTLLIB_STYPE_BEACON); =20 return skb; } @@ -2503,7 +2503,7 @@ struct sk_buff *rtllib_get_beacon(struct rtllib_devic= e *ieee) return NULL; =20 b =3D (struct rtllib_probe_response *)skb->data; - b->header.seq_ctl =3D cpu_to_le16(ieee->seq_ctrl[0] << 4); + b->header.seq_ctrl =3D cpu_to_le16(ieee->seq_ctrl[0] << 4); =20 if (ieee->seq_ctrl[0] =3D=3D 0xFFF) ieee->seq_ctrl[0] =3D 0; @@ -2730,7 +2730,7 @@ rtllib_disauth_skb(struct rtllib_network *beacon, skb_reserve(skb, ieee->tx_headroom); =20 disauth =3D skb_put(skb, sizeof(struct rtllib_disauth)); - disauth->header.frame_ctl =3D cpu_to_le16(RTLLIB_STYPE_DEAUTH); + disauth->header.frame_control =3D cpu_to_le16(RTLLIB_STYPE_DEAUTH); disauth->header.duration_id =3D 0; =20 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); =20 disass =3D skb_put(skb, sizeof(struct rtllib_disassoc)); - disass->header.frame_ctl =3D cpu_to_le16(RTLLIB_STYPE_DISASSOC); + disass->header.frame_control =3D cpu_to_le16(RTLLIB_STYPE_DISASSOC); disass->header.duration_id =3D 0; =20 ether_addr_copy(disass->header.addr1, beacon->bssid); --=20 2.42.0