From b2fdc4d90728f36a7bb1351f92f7d822c0551d68 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 19 Jul 2011 21:06:24 -0500 Subject: [PATCH] --- yaml --- r: 267883 b: refs/heads/master c: 74082c929d07ced0d7cad5ce94230a97880ed0bc h: refs/heads/master i: 267881: fc7c77b1840b371d68ea0a23e591f86b80d89564 267879: baf65644a95b4e6b6ef49d537a68cd7bf2e8be4e v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/rtllib.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 01e4a437fb3d..ffdf91c880f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 472ba3265503203f70012d2decff4007fed270db +refs/heads/master: 74082c929d07ced0d7cad5ce94230a97880ed0bc diff --git a/trunk/drivers/staging/rtl8192e/rtllib.h b/trunk/drivers/staging/rtl8192e/rtllib.h index 76c372c5f061..461c150d3a24 100644 --- a/trunk/drivers/staging/rtl8192e/rtllib.h +++ b/trunk/drivers/staging/rtl8192e/rtllib.h @@ -1940,7 +1940,7 @@ enum scan_op_backup_opt { SCAN_OPT_MAX }; -typedef enum _FW_CMD_IO_TYPE{ +enum fw_cmd_io_type { FW_CMD_DIG_ENABLE = 0, FW_CMD_DIG_DISABLE = 1, FW_CMD_DIG_HALT = 2, @@ -1972,7 +1972,7 @@ typedef enum _FW_CMD_IO_TYPE{ FW_CMD_CTRL_DM_BY_DRIVER_NEW = 28, FW_CMD_PAPE_CONTROL = 29, FW_CMD_CHAN_SET = 30, -} FW_CMD_IO_TYPE,*PFW_CMD_IO_TYPE; +}; #define RT_MAX_LD_SLOT_NUM 10 struct rt_link_detect { @@ -2513,7 +2513,7 @@ struct rtllib_device { u8 (*rtllib_ap_sec_type)(struct rtllib_device *ieee); void (*HalUsbRxAggrHandler)(struct net_device *dev, bool Value); void (*InitialGainHandler)(struct net_device *dev, u8 Operation); - bool (*SetFwCmdHandler)(struct net_device *dev, FW_CMD_IO_TYPE FwCmdIO); + bool (*SetFwCmdHandler)(struct net_device *dev, enum fw_cmd_io_type FwCmdIO); void (*UpdateHalRAMaskHandler)(struct net_device* dev, bool bMulticast, u8 macId, u8 MimoPs, u8 WirelessMode, u8 bCurTxBW40MHz, u8 rssi_level); void (*UpdateBeaconInterruptHandler)(struct net_device* dev, bool start); void (*UpdateInterruptMaskHandler)(struct net_device* dev, u32 AddMSR, u32 RemoveMSR);