diff --git a/[refs] b/[refs] index 5cac43ede12e..25d56382e52d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49f4e74a94920807bfa5d952954c5b08b2d33359 +refs/heads/master: 2fac6fc46d7bf8f92b0174d12c4fb2385e592a19 diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl_core.c index e8e6d601479c..578c3c807e6a 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.c +++ b/trunk/drivers/staging/rtl8192e/rtl_core.c @@ -1354,7 +1354,7 @@ short rtl8192_init(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); - memset(&(priv->stats),0,sizeof(struct Stats)); + memset(&(priv->stats),0,sizeof(struct rt_stats)); rtl8192_dbgp_flag_init(dev); diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.h b/trunk/drivers/staging/rtl8192e/rtl_core.h index 803cfe870ece..1271e3dea938 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.h +++ b/trunk/drivers/staging/rtl8192e/rtl_core.h @@ -376,8 +376,7 @@ struct rt_smooth_data_4rf { u32 TotalVal[4]; };//, *struct rt_smooth_data_4rf *; -typedef struct Stats -{ +struct rt_stats { unsigned long txrdu; unsigned long rxrdu; unsigned long rxok; @@ -470,7 +469,7 @@ typedef struct Stats u32 Slide_Beacon_Total; struct rt_smooth_data_4rf cck_adc_pwdb; u32 CurrentShowTxate; -} Stats; +}; struct channel_access_setting { u16 SIFS_Timer; @@ -632,7 +631,7 @@ typedef struct r8192_priv struct semaphore rf_sem; struct mutex mutex; - struct Stats stats; + struct rt_stats stats; struct iw_statistics wstats; struct proc_dir_entry *dir_dev;