From nobody Mon Jun 8 05:25:29 2026 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6ED3728643A for ; Mon, 1 Jun 2026 16:11:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780330288; cv=none; b=mD0qNmTQy1+wVsAyNcSAsIxef0l16vxh87hlllaTRMzGMP/rd5Yck4IWcK0Ym/SFMJGJmj4YfVhV9dZaod/NP8Q3GZT2pVVaVjUOoxFs9xlrK25KOns9HoCXCtrNAjGJp4Cj+eEk9i/KGwIR5Hw1NqF3MiMrPCQhzUEsNZo3Noo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780330288; c=relaxed/simple; bh=H7eDTqseq6cv78i7dJ+2EYOo7noO6WFHZKFGTlwDCLk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=CiSVjza+RMLRB5wZRaxo8zpju0x0GAVF/q1PIFRHjXinqlvtUgMlle029iA33WI1SzKb8kh8fh9qGggdOsyjP7eRGTsjauFgZe73VPZ7HKmgCdcgbuMtf/MHJf2ts36y9MrBMjoZDvCFO+rRPqFJGO3IEV4g4u0eluCieJ0Qg64= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HdeD/fBH; arc=none smtp.client-ip=209.85.215.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HdeD/fBH" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c855599a77aso2242012a12.0 for ; Mon, 01 Jun 2026 09:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780330286; x=1780935086; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+ukqpC/Wwyxi0wL9G3D/InzysAyew8ct8T6ZPP6vHmE=; b=HdeD/fBHsaieEhEPIgPQdPIWhMZeKXPblBernK6s/p0ps75EgzmjVnHZRGmhGvVFxn NkJOqe+lgFfgzIdElbVQcG8BuBzAD2BWFV1LizKDjsT80ziqxipoJaCHTjoHvcd+ZrrR rm3JQDa2edrnXTJ81OrjyDLKTX/chd1A3jsQkZUWtcItTu4xiUJEmBw0pGuQmeJ8KjLs M7ZdD4meUuZgpY1jjCYnFxQd0vNwDMnzS0e3Yl37QVWWiIbbGqIz5/ildEZVbxJQ0GqR fi3bykhMEtXmcv2VkUnjCCqDxujJQi/hy6GbJYJb3qiYcdfV2/i/Fz4Zi0b5DABEJdia V3Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780330286; x=1780935086; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+ukqpC/Wwyxi0wL9G3D/InzysAyew8ct8T6ZPP6vHmE=; b=RMHTQFBSHAPf4iTtGSM0pZHDyyKj+ILWYl8//nyjmkDKY4xAGc4VBN6/tQIZF5rJjT B3Np/muiDq/RmvD+Ndyv3eSw0RJj02dRBYQ4XLUU2TckqkGcBmin2364o5bi6bg8O73T 8nDecXlyQr7unu/cRDXp/Ta3T0zlQRte2Bz+ve/X1jxOvWlOCUFqSlC8goPJD6GjkhDs 5d148HpQGEjt20gZJcWwwPnW8tSlLZwC8iUHwjIvfs/IIMqpRrsS9t9Q74+deVUNXqQK 7lIqA841O7J0dEkqDom6aA/Xi25cW2pozGui8YuLO2p0r74pfyyiNrkYDv0/7qi0p+p7 ZZUw== X-Forwarded-Encrypted: i=1; AFNElJ+QbOgJUNiqrjVpVAZfoVuilz2FBMohooaAMR2i/ekw+otebctJmYvvCTWqpXHbgt7cS/Nx+MgWWRw103I=@vger.kernel.org X-Gm-Message-State: AOJu0YxJK1vVCbuAha8ntNmW41UaTrZkImLK5RR/wSte5XppOt4LxUo1 JvlQp88Qqu19l/N6Pd86YJ94lfJNDPTNRXhsGLzregWMGPcYDsZX4UND X-Gm-Gg: Acq92OGzfZb+LUCv9jbmXK+EViKiaBuQc2muXYs1fonaKporInPHB6E4qoC10viSpZ9 RAc2SbTkvOqbvtFBt1VlETkBBtOfA1VTMfZYOgMJb+IC3JIW7+z5ZUZR1Ap6LP9VN7yk9qDriil 0epQ2ojivjk25zLvW3473vBYgA5yNnFW31PKNo5kgNPq3MU0uSmxcLJPgCyCfKOjQrE+yT34c4w /jGsXyYaSkbYOP1fPHnEwv6n4BFFFmaHgptKZ3XTyHexPGG5G7Wb0DBallraXwR+R5tBO7MO6Wv eUBeAhjQxyKo6BWWmjwcDbWfqR78Wwa2GfvpXed+tLnfww8YWACGOSxTvma5mZyI8GFSOgnjHQy 3UoOzh1hmm4/hUPzBYhbVR6/WkM5RSPY5soV/9o3es7dr5iGNY2Iv+XF5m46my1UlWxDRs+8rJZ l251S5f95Z1SFTt3ZX/NYwcziDIQwhaCt3nGX8E+Roo4TihynSvgLyrfyaCCRhNQ== X-Received: by 2002:a05:6a21:398e:b0:3b3:258f:7a1 with SMTP id adf61e73a8af0-3b427e9c891mr12557318637.15.1780330285440; Mon, 01 Jun 2026 09:11:25 -0700 (PDT) Received: from SGN-LDSENG.tasernet.com ([2405:4800:5cc3:11a:1ac0:4dff:fe8b:4a69]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84238500528sm6129800b3a.54.2026.06.01.09.11.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2026 09:11:24 -0700 (PDT) From: Cong Nguyen To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Cong Nguyen Subject: [PATCH v2] staging: rtl8723bs: use nl80211_iftype instead of custom NDIS enum Date: Mon, 1 Jun 2026 23:10:51 +0700 Message-Id: <20260601161051.1832080-1-congnt264@gmail.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The driver defined its own enum ndis_802_11_network_infrastructure to represent the operating mode (STA/AP/IBSS) and translated nl80211 iftypes into it in cfg80211_rtw_change_iface(). The kernel already provides enum nl80211_iftype for this purpose, so use it directly and drop the redundant translation layer. Map the removed values as follows: Ndis802_11IBSS -> NL80211_IFTYPE_ADHOC Ndis802_11Infrastructure -> NL80211_IFTYPE_STATION Ndis802_11APMode -> NL80211_IFTYPE_AP Ndis802_11AutoUnknown -> NL80211_IFTYPE_UNSPECIFIED Compile-tested only. Signed-off-by: Cong Nguyen --- Changes in v2: - Replace the custom enum ndis_802_11_network_infrastructure with the standard enum nl80211_iftype and drop the translation layer, instead of just renaming the enum values to uppercase (Greg Kroah-Hartman). v1: https://lore.kernel.org/linux-staging/20260511134930.4086521-1-congnt26= 4@gmail.com/ drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_cmd.c | 12 ++++------ .../staging/rtl8723bs/core/rtw_ioctl_set.c | 21 ++++++++--------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 +++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 14 +++++------ drivers/staging/rtl8723bs/hal/hal_intf.c | 8 +++---- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 6 ++--- drivers/staging/rtl8723bs/include/rtw_cmd.h | 2 +- .../staging/rtl8723bs/include/rtw_ioctl_set.h | 2 +- .../staging/rtl8723bs/include/wlan_bssdef.h | 14 +---------- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 23 ++++++------------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 12 files changed, 46 insertions(+), 70 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8= 723bs/core/rtw_ap.c index 4b4012411011..ddac8dd9250f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -826,7 +826,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 = *pbuf, int len) =20 memcpy(ie, pbuf, pbss_network->ie_length); =20 - if (pbss_network->infrastructure_mode !=3D Ndis802_11APMode) + if (pbss_network->infrastructure_mode !=3D NL80211_IFTYPE_AP) return _FAIL; =20 pbss_network->rssi =3D 0; @@ -1954,7 +1954,7 @@ void rtw_ap_restore_network(struct adapter *padapter) char chk_alive_list[NUM_STA]; int i; =20 - rtw_setopmode_cmd(padapter, Ndis802_11APMode, false); + rtw_setopmode_cmd(padapter, NL80211_IFTYPE_AP, false); =20 set_channel_bwmode(padapter, pmlmeext->cur_channel, diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index c1185c25ed36..e03aa0ba13dc 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -681,7 +681,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wl= an_network *pnetwork) struct security_priv *psecuritypriv =3D &padapter->securitypriv; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; - enum ndis_802_11_network_infrastructure ndis_network_mode =3D pnetwork->n= etwork.infrastructure_mode; + enum nl80211_iftype ndis_network_mode =3D pnetwork->network.infrastructur= e_mode; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; u32 tmp_len; @@ -698,17 +698,15 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct = wlan_network *pnetwork) /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_ADHOC_STATE) !=3D = true) { switch (ndis_network_mode) { - case Ndis802_11IBSS: + case NL80211_IFTYPE_ADHOC: set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); break; =20 - case Ndis802_11Infrastructure: + case NL80211_IFTYPE_STATION: set_fwstate(pmlmepriv, WIFI_STATION_STATE); break; =20 - case Ndis802_11APMode: - case Ndis802_11AutoUnknown: - case Ndis802_11InfrastructureMax: + default: break; } } @@ -824,7 +822,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deaut= h_timeout_ms, bool enqueu return res; } =20 -u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_i= nfrastructure networktype, bool enqueue) +u8 rtw_setopmode_cmd(struct adapter *padapter, enum nl80211_iftype networ= ktype, bool enqueue) { struct cmd_obj *ph2c; struct setopmode_parm *psetop; diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/stagi= ng/rtl8723bs/core/rtw_ioctl_set.c index c70541f95a73..9e3cb0f1d418 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c @@ -280,15 +280,15 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u= 8 *bssid, struct ndis_802_1 } =20 u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, - enum ndis_802_11_network_infrastructure networktype) + enum nl80211_iftype networktype) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct wlan_network *cur_network =3D &pmlmepriv->cur_network; - enum ndis_802_11_network_infrastructure *pold_state =3D &(cur_network->ne= twork.infrastructure_mode); + enum nl80211_iftype *pold_state =3D &(cur_network->network.infrastructure= _mode); =20 if (*pold_state !=3D networktype) { - if (*pold_state =3D=3D Ndis802_11APMode) { - /* change to other mode from Ndis802_11APMode */ + if (*pold_state =3D=3D NL80211_IFTYPE_AP) { + /* change to other mode from AP mode */ cur_network->join_res =3D -1; =20 stop_ap_mode(padapter); @@ -296,14 +296,14 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter = *padapter, =20 spin_lock_bh(&pmlmepriv->lock); =20 - if ((check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) || (*pold_state = =3D=3D Ndis802_11IBSS)) + if ((check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) || (*pold_state = =3D=3D NL80211_IFTYPE_ADHOC)) rtw_disassoc_cmd(padapter, 0, true); =20 if ((check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) || (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true)) rtw_free_assoc_resources(padapter, 1); =20 - if ((*pold_state =3D=3D Ndis802_11Infrastructure) || (*pold_state =3D=3D= Ndis802_11IBSS)) { + if ((*pold_state =3D=3D NL80211_IFTYPE_STATION) || (*pold_state =3D=3D N= L80211_IFTYPE_ADHOC)) { if (check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) rtw_indicate_disconnect(padapter); /* will clr Linked_state; before th= is function, we must have checked whether issue dis-assoc_cmd or not */ } @@ -313,23 +313,22 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter = *padapter, _clr_fwstate_(pmlmepriv, ~WIFI_NULL_STATE); =20 switch (networktype) { - case Ndis802_11IBSS: + case NL80211_IFTYPE_ADHOC: set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); break; =20 - case Ndis802_11Infrastructure: + case NL80211_IFTYPE_STATION: set_fwstate(pmlmepriv, WIFI_STATION_STATE); break; =20 - case Ndis802_11APMode: + case NL80211_IFTYPE_AP: set_fwstate(pmlmepriv, WIFI_AP_STATE); start_ap_mode(padapter); /* rtw_indicate_connect(padapter); */ =20 break; =20 - case Ndis802_11AutoUnknown: - case Ndis802_11InfrastructureMax: + default: break; } =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index ddfc56f0253d..961f6ca7b691 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -51,7 +51,7 @@ int rtw_init_mlme_priv(struct adapter *padapter) =20 pmlmepriv->pscanned =3D NULL; pmlmepriv->fw_state =3D WIFI_STATION_STATE; /* Must sync with rtw_wdev_a= lloc() */ - pmlmepriv->cur_network.network.infrastructure_mode =3D Ndis802_11AutoUnkn= own; + pmlmepriv->cur_network.network.infrastructure_mode =3D NL80211_IFTYPE_UNS= PECIFIED; pmlmepriv->scan_mode =3D SCAN_ACTIVE;/* 1: active, 0: passive. Maybe som= eday we should rename this varable to "active_mode" (Jeff) */ =20 spin_lock_init(&pmlmepriv->lock); @@ -1056,7 +1056,7 @@ static void rtw_joinbss_update_network(struct adapter= *padapter, struct wlan_net =20 /* update fw_state will clr _FW_UNDER_LINKING here indirectly */ switch (pnetwork->network.infrastructure_mode) { - case Ndis802_11Infrastructure: + case NL80211_IFTYPE_STATION: =20 if (pmlmepriv->fw_state & WIFI_UNDER_WPS) pmlmepriv->fw_state =3D WIFI_STATION_STATE | WIFI_UNDER_WPS; @@ -1064,7 +1064,7 @@ static void rtw_joinbss_update_network(struct adapter= *padapter, struct wlan_net pmlmepriv->fw_state =3D WIFI_STATION_STATE; =20 break; - case Ndis802_11IBSS: + case NL80211_IFTYPE_ADHOC: pmlmepriv->fw_state =3D WIFI_ADHOC_STATE; break; default: @@ -2145,7 +2145,7 @@ void rtw_update_registrypriv_dev_network(struct adapt= er *adapter) =20 pdev_network->configuration.ds_config =3D (pregistrypriv->channel); =20 - if (cur_network->network.infrastructure_mode =3D=3D Ndis802_11IBSS) + if (cur_network->network.infrastructure_mode =3D=3D NL80211_IFTYPE_ADHOC) pdev_network->configuration.atim_window =3D (0); =20 pdev_network->infrastructure_mode =3D (cur_network->network.infrastructur= e_mode); diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 5f00fe282d1b..0fba1639b20b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -4003,10 +4003,10 @@ u8 collect_bss_info(struct adapter *padapter, union= recv_frame *precv_frame, str val16 =3D rtw_get_capability((struct wlan_bssid_ex *)bssid); =20 if (val16 & BIT(0)) { - bssid->infrastructure_mode =3D Ndis802_11Infrastructure; + bssid->infrastructure_mode =3D NL80211_IFTYPE_STATION; memcpy(bssid->mac_address, GetAddr2Ptr(pframe), ETH_ALEN); } else { - bssid->infrastructure_mode =3D Ndis802_11IBSS; + bssid->infrastructure_mode =3D NL80211_IFTYPE_ADHOC; memcpy(bssid->mac_address, GetAddr3Ptr(pframe), ETH_ALEN); } =20 @@ -5171,15 +5171,15 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf) struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; struct setopmode_parm *psetop =3D (struct setopmode_parm *)pbuf; =20 - if (psetop->mode =3D=3D Ndis802_11APMode) { + if (psetop->mode =3D=3D NL80211_IFTYPE_AP) { pmlmeinfo->state =3D WIFI_FW_AP_STATE; type =3D _HW_STATE_AP_; /* start_ap_mode(padapter); */ - } else if (psetop->mode =3D=3D Ndis802_11Infrastructure) { + } else if (psetop->mode =3D=3D NL80211_IFTYPE_STATION) { pmlmeinfo->state &=3D ~(BIT(0) | BIT(1));/* clear state */ pmlmeinfo->state |=3D WIFI_FW_STATION_STATE;/* set to STATION_STATE */ type =3D _HW_STATE_STATION_; - } else if (psetop->mode =3D=3D Ndis802_11IBSS) { + } else if (psetop->mode =3D=3D NL80211_IFTYPE_ADHOC) { type =3D _HW_STATE_ADHOC_; } else { type =3D _HW_STATE_NOLINK_; @@ -5188,7 +5188,7 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf) rtw_hal_set_hwreg(padapter, HW_VAR_SET_OPMODE, (u8 *)(&type)); /* set_msr(padapter, type); */ =20 - if (psetop->mode =3D=3D Ndis802_11APMode) { + if (psetop->mode =3D=3D NL80211_IFTYPE_AP) { /* Do this after port switch to */ /* prevent from downloading rsvd page to wrong port */ rtw_btcoex_MediaStatusNotify(padapter, 1); /* connect */ @@ -5211,7 +5211,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) } =20 /* below is for ad-hoc master */ - if (pparm->network.infrastructure_mode =3D=3D Ndis802_11IBSS) { + if (pparm->network.infrastructure_mode =3D=3D NL80211_IFTYPE_ADHOC) { rtw_joinbss_reset(padapter); =20 pmlmeext->cur_bwmode =3D CHANNEL_WIDTH_20; diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 27c0c0198714..d0b5e572d7d4 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -40,18 +40,18 @@ void rtw_hal_dm_init(struct adapter *padapter) =20 static void rtw_hal_init_opmode(struct adapter *padapter) { - enum ndis_802_11_network_infrastructure networkType =3D Ndis802_11Infrast= ructureMax; + enum nl80211_iftype networkType =3D NL80211_IFTYPE_UNSPECIFIED; struct mlme_priv *pmlmepriv =3D &(padapter->mlmepriv); signed int fw_state; =20 fw_state =3D get_fwstate(pmlmepriv); =20 if (fw_state & WIFI_ADHOC_STATE) - networkType =3D Ndis802_11IBSS; + networkType =3D NL80211_IFTYPE_ADHOC; else if (fw_state & WIFI_STATION_STATE) - networkType =3D Ndis802_11Infrastructure; + networkType =3D NL80211_IFTYPE_STATION; else if (fw_state & WIFI_AP_STATE) - networkType =3D Ndis802_11APMode; + networkType =3D NL80211_IFTYPE_AP; else return; =20 diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging= /rtl8723bs/hal/rtl8723b_cmd.c index 12416e499ac3..467d369a16d9 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c @@ -245,19 +245,19 @@ static void ConstructNullFunctionData( SetPwrMgt(fctrl); =20 switch (cur_network->network.infrastructure_mode) { - case Ndis802_11Infrastructure: + case NL80211_IFTYPE_STATION: SetToDs(fctrl); ether_addr_copy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network))); ether_addr_copy(pwlanhdr->addr2, myid(&(padapter->eeprompriv))); ether_addr_copy(pwlanhdr->addr3, StaAddr); break; - case Ndis802_11APMode: + case NL80211_IFTYPE_AP: SetFrDs(fctrl); ether_addr_copy(pwlanhdr->addr1, StaAddr); ether_addr_copy(pwlanhdr->addr2, get_my_bssid(&(pmlmeinfo->network))); ether_addr_copy(pwlanhdr->addr3, myid(&(padapter->eeprompriv))); break; - case Ndis802_11IBSS: + case NL80211_IFTYPE_ADHOC: default: ether_addr_copy(pwlanhdr->addr1, StaAddr); ether_addr_copy(pwlanhdr->addr2, myid(&(padapter->eeprompriv))); diff --git a/drivers/staging/rtl8723bs/include/rtw_cmd.h b/drivers/staging/= rtl8723bs/include/rtw_cmd.h index c4c3edee809d..a42493f2fa6d 100644 --- a/drivers/staging/rtl8723bs/include/rtw_cmd.h +++ b/drivers/staging/rtl8723bs/include/rtw_cmd.h @@ -586,7 +586,7 @@ extern u8 rtw_clearstakey_cmd(struct adapter *padapter,= struct sta_info *sta, u8 =20 extern u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *p= network); u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool = enqueue); -extern u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_ne= twork_infrastructure networktype, bool enqueue); +extern u8 rtw_setopmode_cmd(struct adapter *padapter, enum nl80211_iftype= networktype, bool enqueue); extern u8 rtw_setrfintfs_cmd(struct adapter *padapter, u8 mode); =20 extern u8 rtw_gettssi_cmd(struct adapter *padapter, u8 offset, u8 *pval); diff --git a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h b/drivers/st= aging/rtl8723bs/include/rtw_ioctl_set.h index ab349de733c8..5c6cfc482731 100644 --- a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h +++ b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h @@ -14,7 +14,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *pda= pter, enum ndis_802_11_ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep= *wep); u8 rtw_set_802_11_disassociate(struct adapter *padapter); u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_80= 2_11_ssid *pssid, int ssid_max_num); -u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, enum ndis_= 802_11_network_infrastructure networktype); +u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, enum nl802= 11_iftype networktype); u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *= ssid); u8 rtw_set_802_11_connect(struct adapter *padapter, u8 *bssid, struct ndis= _802_11_ssid *ssid); =20 diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/stag= ing/rtl8723bs/include/wlan_bssdef.h index 812a68394268..bcc5a1712670 100644 --- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h +++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h @@ -42,14 +42,6 @@ struct ndis_802_11_conf { u32 ds_config; /* Frequency, units are kHz */ }; =20 -enum ndis_802_11_network_infrastructure { - Ndis802_11IBSS, - Ndis802_11Infrastructure, - Ndis802_11AutoUnknown, - Ndis802_11InfrastructureMax, /* Not a real value, defined as upper b= ound */ - Ndis802_11APMode, -}; - struct ndis_802_11_fix_ie { u8 time_stamp[8]; u16 beacon_interval; @@ -125,10 +117,6 @@ struct ndis_802_11_wep { /* MIC check time, 60 seconds. */ #define MIC_CHECK_TIME 60000000 =20 -#ifndef Ndis802_11APMode -#define Ndis802_11APMode (Ndis802_11InfrastructureMax + 1) -#endif - struct wlan_phy_info { u8 signal_strength;/* in percentage) */ u8 signal_quality;/* in percentage) */ @@ -161,7 +149,7 @@ struct wlan_bssid_ex { long rssi;/* in dBM, raw data , get from PHY) */ enum ndis_802_11_network_type network_type_in_use; struct ndis_802_11_conf configuration; - enum ndis_802_11_network_infrastructure infrastructure_mode; + enum nl80211_iftype infrastructure_mode; NDIS_802_11_RATES_EX supported_rates; struct wlan_phy_info phy_info; u32 ie_length; diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index fd3bae31b0ed..cd8fa486404f 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -1027,7 +1027,6 @@ static int cfg80211_rtw_change_iface(struct wiphy *wi= phy, struct vif_params *params) { enum nl80211_iftype old_type; - enum ndis_802_11_network_infrastructure networkType; struct adapter *padapter =3D rtw_netdev_priv(ndev); struct wireless_dev *rtw_wdev =3D padapter->rtw_wdev; struct mlme_ext_priv *pmlmeext =3D &(padapter->mlmeextpriv); @@ -1057,30 +1056,22 @@ static int cfg80211_rtw_change_iface(struct wiphy *= wiphy, pmlmeext->action_public_dialog_token =3D 0xff; } =20 - switch (type) { - case NL80211_IFTYPE_ADHOC: - networkType =3D Ndis802_11IBSS; - break; - case NL80211_IFTYPE_STATION: - networkType =3D Ndis802_11Infrastructure; - break; - case NL80211_IFTYPE_AP: - networkType =3D Ndis802_11APMode; - break; - default: + if (type !=3D NL80211_IFTYPE_ADHOC && + type !=3D NL80211_IFTYPE_STATION && + type !=3D NL80211_IFTYPE_AP) { ret =3D -EOPNOTSUPP; goto exit; } =20 rtw_wdev->iftype =3D type; =20 - if (rtw_set_802_11_infrastructure_mode(padapter, networkType) =3D=3D fals= e) { + if (rtw_set_802_11_infrastructure_mode(padapter, type) =3D=3D false) { rtw_wdev->iftype =3D old_type; ret =3D -EPERM; goto exit; } =20 - rtw_setopmode_cmd(padapter, networkType, true); + rtw_setopmode_cmd(padapter, type, true); =20 exit: =20 @@ -1610,12 +1601,12 @@ static int cfg80211_rtw_leave_ibss(struct wiphy *wi= phy, struct net_device *ndev) =20 rtw_wdev->iftype =3D NL80211_IFTYPE_STATION; =20 - if (rtw_set_802_11_infrastructure_mode(padapter, Ndis802_11Infrastructur= e) =3D=3D false) { + if (rtw_set_802_11_infrastructure_mode(padapter, NL80211_IFTYPE_STATION)= =3D=3D false) { rtw_wdev->iftype =3D old_type; ret =3D -EPERM; goto leave_ibss; } - rtw_setopmode_cmd(padapter, Ndis802_11Infrastructure, true); + rtw_setopmode_cmd(padapter, NL80211_IFTYPE_STATION, true); } =20 leave_ibss: diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/= rtl8723bs/os_dep/os_intfs.c index e943dcea1a21..c33a3137845f 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -19,7 +19,7 @@ static int rtw_rfintfs =3D HWPI; static int rtw_lbkmode;/* RTL8712_AIR_TRX; */ =20 =20 -static int rtw_network_mode =3D Ndis802_11IBSS;/* Ndis802_11Infrastructure= ;infra, ad-hoc, auto */ +static int rtw_network_mode =3D NL80211_IFTYPE_ADHOC;/* infra, ad-hoc, aut= o */ /* struct ndis_802_11_ssid ssid; */ static int rtw_channel =3D 1;/* ad-hoc support requirement */ static int rtw_wireless_mode =3D WIRELESS_11BG_24N; --=20 2.25.1