From ca16bf09bdd2c2cebff342a72b3003998f1c6c3d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 18 Jul 2011 22:30:34 -0500 Subject: [PATCH] --- yaml --- r: 267757 b: refs/heads/master c: e91dbf030128ddd975a336a6e11f76874f5c3985 h: refs/heads/master i: 267755: 0d1f49298b9a5a5f00a1629c8ac462028f7df359 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/r8192E_dev.c | 2 +- trunk/drivers/staging/rtl8192e/rtl_core.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fc243d0b1d4c..bed30a68af46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc27e89b27e9b96075c1dc1d93c848b65aee3b3f +refs/heads/master: e91dbf030128ddd975a336a6e11f76874f5c3985 diff --git a/trunk/drivers/staging/rtl8192e/r8192E_dev.c b/trunk/drivers/staging/rtl8192e/r8192E_dev.c index 688b4f536bcb..b5324a3fc359 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_dev.c +++ b/trunk/drivers/staging/rtl8192e/r8192E_dev.c @@ -2280,7 +2280,7 @@ void ActUpdateChannelAccessSetting( struct net_device* dev, WIRELESS_MODE WirelessMode, - PCHANNEL_ACCESS_SETTING ChnlAccessSetting + struct channel_access_setting *ChnlAccessSetting ) { struct r8192_priv* priv = rtllib_priv(dev); diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.h b/trunk/drivers/staging/rtl8192e/rtl_core.h index c4d70e3ccd88..9ffac40acda0 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.h +++ b/trunk/drivers/staging/rtl8192e/rtl_core.h @@ -472,14 +472,14 @@ typedef struct Stats u32 CurrentShowTxate; } Stats; -typedef struct ChnlAccessSetting { +struct channel_access_setting { u16 SIFS_Timer; u16 DIFS_Timer; u16 SlotTimeTimer; u16 EIFS_Timer; u16 CWminIndex; u16 CWmaxIndex; -}*PCHANNEL_ACCESS_SETTING,CHANNEL_ACCESS_SETTING; +}; typedef enum _TWO_PORT_STATUS { @@ -579,7 +579,7 @@ typedef struct r8192_priv struct workqueue_struct *priv_wq; - CHANNEL_ACCESS_SETTING ChannelAccessSetting; + struct channel_access_setting ChannelAccessSetting; mp_adapter NdisAdapter; @@ -1106,7 +1106,7 @@ void ActUpdateChannelAccessSetting( struct net_device* dev, WIRELESS_MODE WirelessMode, - PCHANNEL_ACCESS_SETTING ChnlAccessSetting + struct channel_access_setting *ChnlAccessSetting ); #endif