diff options
| author | Svyatoslav Nikolenko <nsvatoslav515@gmail.com> | 2026-10-01 17:12:41 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-10-01 16:52:14 +0200 |
| commit | dbc2fa996f44602af72ea56efa68c043407eaaac (patch) | |
| tree | 1e9c3eb5bcdc5f41449ffd7e87355307b6ed849b /drivers | |
| parent | eb903412616ff46a88d30fefb1c550d89a7c3d55 (diff) | |
staging: rtl8723bs: Remove manual ifname allocation
The manual ifname allocation via dev_alloc_name() is redundant because
the networking core handles interface naming automatically during
register_netdev().
Remove the ifname module parameter, the corresponding field from
struct registry_priv, and the rtw_init_netdev_name() callpath.
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Svyatoslav Nikolenko <nsvatoslav515@gmail.com>
Link: https://patch.msgid.link/20261001141242.2763-1-nsvatoslav515@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8723bs/include/drv_types.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/osdep_intf.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/os_dep/os_intfs.c | 26 |
3 files changed, 3 insertions, 26 deletions
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h index 0db276d46b1c..7f7d4fbad4bd 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -151,8 +151,6 @@ struct registry_priv { u8 enable80211d; - u8 ifname[16]; - u8 notch_filter; /* define for tx power adjust */ diff --git a/drivers/staging/rtl8723bs/include/osdep_intf.h b/drivers/staging/rtl8723bs/include/osdep_intf.h index 83a25598e962..f1e7a303a286 100644 --- a/drivers/staging/rtl8723bs/include/osdep_intf.h +++ b/drivers/staging/rtl8723bs/include/osdep_intf.h @@ -20,7 +20,6 @@ u32 rtw_start_drv_threads(struct adapter *padapter); void rtw_stop_drv_threads(struct adapter *padapter); void rtw_cancel_all_timer(struct adapter *padapter); -int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname); struct net_device *rtw_init_netdev(struct adapter *padapter); void rtw_unregister_netdevs(struct dvobj_priv *dvobj); diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c index ab291792459b..d220df325fa9 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -106,10 +106,6 @@ static int rtw_80211d; static int rtw_qos_opt_enable;/* 0: disable, 1:enable */ module_param(rtw_qos_opt_enable, int, 0644); -static char *ifname = "wlan%d"; -module_param(ifname, charp, 0644); -MODULE_PARM_DESC(ifname, "The default name to allocate for first interface"); - char *rtw_initmac; /* temp mac address if users want to use instead of the mac address in Efuse */ module_param(rtw_initmac, charp, 0644); @@ -249,8 +245,6 @@ static void loadparam(struct adapter *padapter) registry_par->enable80211d = (u8)rtw_80211d; - snprintf(registry_par->ifname, 16, "%s", ifname); - registry_par->notch_filter = (u8)rtw_notch_filter; registry_par->reg_enable_tx_power_limit = (u8)rtw_tx_pwr_lmt_enable; @@ -394,17 +388,6 @@ static const struct net_device_ops rtw_netdev_ops = { .ndo_get_stats = rtw_net_get_stats, }; -int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname) -{ - if (dev_alloc_name(pnetdev, ifname) < 0) { - pr_err("dev_alloc_name, fail for %s\n", ifname); - return 1; - } - netif_carrier_off(pnetdev); - - return 0; -} - struct net_device *rtw_init_netdev(struct adapter *old_padapter) { struct adapter *padapter; @@ -726,14 +709,12 @@ u8 rtw_free_drv_sw(struct adapter *padapter) return _SUCCESS; } -static int _rtw_drv_register_netdev(struct adapter *padapter, char *name) +static int _rtw_drv_register_netdev(struct adapter *padapter) { int ret = _SUCCESS; struct net_device *pnetdev = padapter->pnetdev; - /* alloc netdev name */ - if (rtw_init_netdev_name(pnetdev, name)) - return _FAIL; + netif_carrier_off(pnetdev); eth_hw_addr_set(pnetdev, padapter->eeprompriv.mac_addr); @@ -758,9 +739,8 @@ int rtw_drv_register_netdev(struct adapter *if1) { struct dvobj_priv *dvobj = if1->dvobj; struct adapter *padapter = dvobj->padapters; - char *name = if1->registrypriv.ifname; - return _rtw_drv_register_netdev(padapter, name); + return _rtw_drv_register_netdev(padapter); } static int _netdev_open(struct net_device *pnetdev) |
