diff --git a/include/drv_types.h b/include/drv_types.h index e653a6b..e98e004 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -156,7 +156,6 @@ struct registry_priv { u8 enable80211d; #endif u8 ifname[16]; - u8 if2name[16]; u8 notch_filter; u8 regulatory_tid; u8 qos_opt_enable; diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 159991d..5cdd5ce 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -5395,7 +5395,7 @@ static int rtw_rereg_nd_name(struct net_device *dev, if (rereg_priv->old_ifname[0] == 0) { char *reg_ifname; - reg_ifname = padapter->registrypriv.if2name; + reg_ifname = padapter->registrypriv.ifname; strncpy(rereg_priv->old_ifname, reg_ifname, IFNAMSIZ); rereg_priv->old_ifname[IFNAMSIZ-1] = 0; diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 3581c31..e2a08a3 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -154,10 +154,6 @@ static char* ifname = "wlan%d"; module_param(ifname, charp, 0644); MODULE_PARM_DESC(ifname, "The default name to allocate for first interface"); -static char* if2name = "wlan%d"; -module_param(if2name, charp, 0644); -MODULE_PARM_DESC(if2name, "The default name to allocate for second interface"); - char* rtw_initmac = NULL; /* temp mac address if users want to use instead of the mac address in Efuse */ module_param(rtw_initmac, charp, 0644); @@ -341,7 +337,6 @@ static uint loadparam( struct adapter *padapter, struct net_device * pnetdev) #endif snprintf(registry_par->ifname, 16, "%s", ifname); - snprintf(registry_par->if2name, 16, "%s", if2name); registry_par->notch_filter = (u8)rtw_notch_filter; @@ -1066,8 +1061,6 @@ int rtw_drv_register_netdev(struct adapter *if1) if (padapter->iface_id == IFACE_ID0) name = if1->registrypriv.ifname; - else if (padapter->iface_id == IFACE_ID1) - name = if1->registrypriv.if2name; else name = "wlan%d";