From 4992c5adb66f3c0b85a0684c1e3be6732ef39c0d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 19 Jul 2011 20:50:21 -0500 Subject: [PATCH] --- yaml --- r: 267872 b: refs/heads/master c: dc20a3265e242a307810a5f327206d934e4552fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/r8192E_dev.c | 2 +- trunk/drivers/staging/rtl8192e/rtl_core.h | 2 +- trunk/drivers/staging/rtl8192e/rtllib.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2d613be04454..bfc1cf95e379 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e608063303979ae4241455bd4752f2c6928e1219 +refs/heads/master: dc20a3265e242a307810a5f327206d934e4552fc diff --git a/trunk/drivers/staging/rtl8192e/r8192E_dev.c b/trunk/drivers/staging/rtl8192e/r8192E_dev.c index a3a269ba5d20..453481959ff3 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_dev.c +++ b/trunk/drivers/staging/rtl8192e/r8192E_dev.c @@ -2279,7 +2279,7 @@ u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc) void ActUpdateChannelAccessSetting( struct net_device* dev, - WIRELESS_MODE WirelessMode, + enum wireless_mode WirelessMode, struct channel_access_setting *ChnlAccessSetting ) { diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.h b/trunk/drivers/staging/rtl8192e/rtl_core.h index f81680814fb4..d09c62aa63ce 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.h +++ b/trunk/drivers/staging/rtl8192e/rtl_core.h @@ -1096,7 +1096,7 @@ MgntActSet_RF_State( void ActUpdateChannelAccessSetting( struct net_device* dev, - WIRELESS_MODE WirelessMode, + enum wireless_mode WirelessMode, struct channel_access_setting *ChnlAccessSetting ); diff --git a/trunk/drivers/staging/rtl8192e/rtllib.h b/trunk/drivers/staging/rtl8192e/rtllib.h index 71bf821bad59..6bba2a54a785 100644 --- a/trunk/drivers/staging/rtl8192e/rtllib.h +++ b/trunk/drivers/staging/rtl8192e/rtllib.h @@ -646,7 +646,7 @@ enum rt_rf_type_def { RF_819X_MAX_TYPE }; -typedef enum _WIRELESS_MODE { +enum wireless_mode { WIRELESS_MODE_UNKNOWN = 0x00, WIRELESS_MODE_A = 0x01, WIRELESS_MODE_B = 0x02, @@ -654,7 +654,7 @@ typedef enum _WIRELESS_MODE { WIRELESS_MODE_AUTO = 0x08, WIRELESS_MODE_N_24G = 0x10, WIRELESS_MODE_N_5G = 0x20 -} WIRELESS_MODE; +}; typedef enum _WIRELESS_NETWORK_TYPE{ WIRELESS_11B = 1,