Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: KbKENCfQH1OIrB28RBmYIFFdZdiYfkWp2a7BpFEEJgC9VzLZBF090BomB7i01gSzbVgDAmWJ6+
 m7E8Ag7ZGnDQ==
IronPort-SDR: pduRjcwuNQh3o3yk5ufRkSmFVF5xDFkTYJ7uf1GsFvFABAtK1rvUSe5aEito6fpZCex1xZ25J4
 AfdRueVQmqKQ==
From:   "Chen, Mike Ximing" <mike.ximing.chen@intel.com>
To:     Ivan Safonov <insafonov@gmail.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC:     Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
        Larry Finger <Larry.Finger@lwfinger.net>,
        Michael Straube <straube.linux@gmail.com>,
        Pascal Terjan <pterjan@google.com>,
        "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 4/4] staging:rtl8712: replace cap_* definitions with
 native kernel WLAN_CAPABILITY_*
Thread-Topic: [PATCH 4/4] staging:rtl8712: replace cap_* definitions with
 native kernel WLAN_CAPABILITY_*
Thread-Index: AQHXDVeeUVNQLtl5cEi6vSs2UgiCuqpuwrZA
Date:   Mon, 1 Mar 2021 08:11:29 +0000
Message-ID: <BYAPR11MB3095A70AA243675FF0960B89D99A9@BYAPR11MB3095.namprd11.prod.outlook.com>
References: <20210227222236.581490-1-insafonov@gmail.com>
 <20210227222236.581490-5-insafonov@gmail.com>
In-Reply-To: <20210227222236.581490-5-insafonov@gmail.com>
Accept-Language: en-US
Content-Language: en-US
dlp-version: 11.5.1.3
dlp-reaction: no-action
dlp-product: dlpe-windows
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 170f4d80-8cfb-46df-0e51-08d8dc899e81
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2021 08:11:29.9414
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: RAnpsExIZ43A95vlxm3lqbA7YyPoGcfi+tYtq7bg8tJ68qwPEzx9c+mOoG67SSLkmdduSTfiflS6hfMAgzq/bEeC4EIpgTspS6qKINahmXE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3831
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Ivan Safonov <insafonov@gmail.com>
> Sent: Saturday, February 27, 2021 5:23 PM
> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Florian Schilhabel <florian.c.schilhabel@googlemail.com>; Larry Finge=
r
> <Larry.Finger@lwfinger.net>; Michael Straube <straube.linux@gmail.com>; P=
ascal
> Terjan <pterjan@google.com>; devel@driverdev.osuosl.org; linux-
> kernel@vger.kernel.org; Ivan Safonov <insafonov@gmail.com>
> Subject: [PATCH 4/4] staging:rtl8712: replace cap_* definitions with nati=
ve kernel
> WLAN_CAPABILITY_*
>=20
> cap_* definitions duplicate WLAN_CAPABILITY_*. Remove cap_* definitions,
> improve code consistency.
>=20
> Signed-off-by: Ivan Safonov <insafonov@gmail.com>
> ---
>  drivers/staging/rtl8712/ieee80211.c | 6 +++---
>  drivers/staging/rtl8712/wifi.h      | 7 -------
>  2 files changed, 3 insertions(+), 10 deletions(-)
>=20
> diff --git a/drivers/staging/rtl8712/ieee80211.c
> b/drivers/staging/rtl8712/ieee80211.c
> index b4a099169c7c..13fc3c1ec0db 100644
> --- a/drivers/staging/rtl8712/ieee80211.c
> +++ b/drivers/staging/rtl8712/ieee80211.c
> @@ -173,11 +173,11 @@ int r8712_generate_ie(struct registry_priv *registr=
ypriv)
>  	ie +=3D 2;
>  	/*capability info*/
>  	*(u16 *)ie =3D 0;
> -	*(__le16 *)ie |=3D cpu_to_le16(cap_IBSS);
> +	*(__le16 *)ie |=3D cpu_to_le16(WLAN_CAPABILITY_IBSS);
>  	if (registrypriv->preamble =3D=3D PREAMBLE_SHORT)
> -		*(__le16 *)ie |=3D cpu_to_le16(cap_ShortPremble);
> +		*(__le16 *)ie |=3D
> cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE);
>  	if (dev_network->Privacy)
> -		*(__le16 *)ie |=3D cpu_to_le16(cap_Privacy);
> +		*(__le16 *)ie |=3D cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
>  	sz +=3D 2;
>  	ie +=3D 2;
>  	/*SSID*/
> diff --git a/drivers/staging/rtl8712/wifi.h b/drivers/staging/rtl8712/wif=
i.h
> index b7889ac3dce9..f941efb1f4e2 100644
> --- a/drivers/staging/rtl8712/wifi.h
> +++ b/drivers/staging/rtl8712/wifi.h
> @@ -278,13 +278,6 @@ static inline unsigned char *get_hdr_bssid(unsigned =
char
> *pframe)
>  #define AUTH_ODD_TO				0
>  #define AUTH_EVEN_TO			1
>=20
> -#define cap_ESS BIT(0)
> -#define cap_IBSS BIT(1)
> -#define cap_CFPollable BIT(2)
> -#define cap_CFRequest BIT(3)
> -#define cap_Privacy BIT(4)
> -#define cap_ShortPremble BIT(5)
> -
>  /*----------------------------------------------------------------------=
-------
>   *			Below is the definition for 802.11i / 802.1x
>   *----------------------------------------------------------------------=
--------
> --
> 2.26.2

Reviewed-by: Mike Ximing Chen <mike.ximing.chen@intel.com>