Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267883
b: refs/heads/master
c: 74082c9
h: refs/heads/master
i:
  267881: fc7c77b
  267879: baf6564
v: v3
  • Loading branch information
Larry Finger authored and Larry Finger committed Aug 24, 2011
1 parent 979f6c3 commit b2fdc4d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 472ba3265503203f70012d2decff4007fed270db
refs/heads/master: 74082c929d07ced0d7cad5ce94230a97880ed0bc
6 changes: 3 additions & 3 deletions trunk/drivers/staging/rtl8192e/rtllib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b2fdc4d

Please sign in to comment.