staging: rtl8723au: Remove another pile of unused entries from struct rtw_adapter

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/include/drv_types.h b/drivers/staging/rtl8723au/include/drv_types.h
index 519f888d89d6073a1b5c7ff3f951ffcbc53c21a4..bec8fd7126d1bf82fa34cde59607a944ffc342e7 100644 (file)
--- a/drivers/staging/rtl8723au/include/drv_types.h
+++ b/drivers/staging/rtl8723au/include/drv_types.h
@@ -262,17 +262,8 @@ struct rtw_adapter {
        struct net_device *pnetdev;
 
        /*  used by rtw_rereg_nd_name related function */
-       struct rereg_nd_name_data {
-               struct net_device *old_pnetdev;
-               char old_ifname[IFNAMSIZ];
-               u8 old_ips_mode;
-               u8 old_bRegUseLed;
-       } rereg_nd_name_priv;
-
        int bup;
        struct net_device_stats stats;
-       struct iw_statistics iwstats;
-       struct proc_dir_entry *dir_dev;/*  for proc directory */
 
        struct wireless_dev *rtw_wdev;
        int net_closed;
@@ -289,11 +280,6 @@ struct rtw_adapter {
        /* IFACE_ID0 is equals to PRIMARY_ADAPTER */
        /* IFACE_ID1 is equals to SECONDARY_ADAPTER */
        u8 iface_id;
-
-       u8    fix_rate;
-
-       unsigned char     in_cta_test;
-
 };
 
 #define adapter_to_dvobj(adapter) (adapter->dvobj)

diff --git a/drivers/staging/rtl8723au/os_dep/os_intfs.c b/drivers/staging/rtl8723au/os_dep/os_intfs.c
index dd401e6ce41502cabf43ee806a3e23cb2a75a693..25fce303c37bdc73baf995a08c21003b97c129e4 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723au/os_dep/os_intfs.c
@@ -588,12 +588,6 @@ u8 rtw_free_drv_sw23a(struct rtw_adapter *padapter)
 
        RT_TRACE(_module_os_intfs_c_, _drv_info_, ("<== rtw_free_drv_sw23a\n"));
 
-       /* free the old_pnetdev */
-       if (padapter->rereg_nd_name_priv.old_pnetdev) {
-               free_netdev(padapter->rereg_nd_name_priv.old_pnetdev);
-               padapter->rereg_nd_name_priv.old_pnetdev = NULL;
-       }
-
        /*  clear pbuddy_adapter to avoid access wrong pointer. */
        if (padapter->pbuddy_adapter != NULL)
                padapter->pbuddy_adapter->pbuddy_adapter = NULL;