staging: rtl8723bs: Remove manual ifname allocation
PATCH v6 1/1 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.
---
Changes in v6:
- Rebased one more time. Should be working now. I'm so sorry for it.
Changes in v5:
- Rebased onto latest staging-testing to resolve merge conflicts caused by recent tree updates.
Changes in v4:
- Rebased onto latest staging-testing branch.
Changes in v3:
- Added missing changelog.
Changes in v2:
- Removed rtw_init_netdev_name() and the entire manual naming callpath instead of hardcoding "wlan%d", as suggested by Greg KH.
--- drivers/staging/rtl8723bs/include/drv_types.h | 2 -- .../staging/rtl8723bs/include/osdep_intf.h | 1 - drivers/staging/rtl8723bs/os_dep/os_intfs.c | 26 +++---------------- 3 files changed, 3 insertions(+), 26 deletions(-)
drivers/staging/rtl8723bs/include/drv_types.h +0 -2
@@ -151,8 +151,6 @@ struct registry_priv {u8 enable80211d; -u8 ifname[16 ]; -u8 notch_filter;/* define for tx power adjust */
drivers/staging/rtl8723bs/include/osdep_intf.h +0 -1
@@ -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);
drivers/staging/rtl8723bs/os_dep/os_intfs.c +3 -23
@@ -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)
Signature · 1 line
2.47.3