skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-26 06:23:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8723bs: Remove second interface name

Browse source 
Only the RTL8192D chips have multiple interfaces per chip, thus
this logic has no value here.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-09-26 13:54:47 -05:00
parent 2601c36dd9
commit 69faa02ea5
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/drv_types.h
View file

@ -156,7 +156,6 @@ struct registry_priv {
u8 enable80211d; u8 enable80211d;
#endif #endif
u8 ifname[16]; u8 ifname[16];
u8 if2name[16];
u8 notch_filter; u8 notch_filter;
u8 regulatory_tid; u8 regulatory_tid;
u8 qos_opt_enable; u8 qos_opt_enable;

2
os_dep/ioctl_linux.c
View file

@ -5395,7 +5395,7 @@ static int rtw_rereg_nd_name(struct net_device *dev,
if (rereg_priv->old_ifname[0] == 0) { if (rereg_priv->old_ifname[0] == 0) {
char *reg_ifname; char *reg_ifname;
reg_ifname = padapter->registrypriv.if2name; reg_ifname = padapter->registrypriv.ifname;
strncpy(rereg_priv->old_ifname, reg_ifname, IFNAMSIZ); strncpy(rereg_priv->old_ifname, reg_ifname, IFNAMSIZ);
rereg_priv->old_ifname[IFNAMSIZ-1] = 0; rereg_priv->old_ifname[IFNAMSIZ-1] = 0;

7
os_dep/os_intfs.c
View file

@ -154,10 +154,6 @@ static char* ifname = "wlan%d";
module_param(ifname, charp, 0644); module_param(ifname, charp, 0644);
MODULE_PARM_DESC(ifname, "The default name to allocate for first interface"); 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 */ 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); module_param(rtw_initmac, charp, 0644);
@ -341,7 +337,6 @@ static uint loadparam( struct adapter *padapter, struct net_device * pnetdev)
#endif #endif
snprintf(registry_par->ifname, 16, "%s", ifname); snprintf(registry_par->ifname, 16, "%s", ifname);
snprintf(registry_par->if2name, 16, "%s", if2name);
registry_par->notch_filter = (u8)rtw_notch_filter; 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) if (padapter->iface_id == IFACE_ID0)
name = if1->registrypriv.ifname; name = if1->registrypriv.ifname;
else if (padapter->iface_id == IFACE_ID1)
name = if1->registrypriv.if2name;
else else
name = "wlan%d"; name = "wlan%d";