Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267886
b: refs/heads/master
c: 9de9f96
h: refs/heads/master
v: v3
  • Loading branch information
Larry Finger authored and Larry Finger committed Aug 24, 2011
1 parent ee57dd9 commit f551124
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 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: e6605947508968e4020702f8dbe4d0bcad2028ae
refs/heads/master: 9de9f962c71ad2c512c40e30b84aca5392a89630
8 changes: 5 additions & 3 deletions trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ struct octet_string {
};
#define MAX_WMMELE_LENGTH 64

typedef u32 QOS_MODE, *PQOS_MODE;
#define QOS_MODE u32

#define QOS_DISABLE 0
#define QOS_WMM 1
#define QOS_WMMSA 2
Expand Down Expand Up @@ -174,7 +175,8 @@ enum qos_ie_source {
};


typedef u32 AC_CODING;
#define AC_CODING u32

#define AC0_BE 0
#define AC1_BK 1
#define AC2_VI 2
Expand Down Expand Up @@ -237,7 +239,7 @@ struct acm {



typedef u8 AC_UAPSD, *PAC_UAPSD;
#define AC_UAPSD u8

#define GET_VO_UAPSD(_apsd) ((_apsd) & BIT0)
#define SET_VO_UAPSD(_apsd) ((_apsd) |= BIT0)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192e/rtl_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
.vendor = (vend), .device = (dev), \
.subvendor = PCI_ANY_ID, .subdevice =PCI_ANY_ID , \
.driver_data = (kernel_ulong_t)&(cfg)
typedef irqreturn_t irqreturn_type;

#define irqreturn_type irqreturn_t

#define rtl8192_interrupt(x,y,z) rtl8192_interrupt_rsl(x,y)

Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/staging/rtl8192e/rtllib.h
Original file line number Diff line number Diff line change
Expand Up @@ -1910,7 +1910,8 @@ struct rt_pwr_save_ctrl {

};

typedef u32 RT_RF_CHANGE_SOURCE;
#define RT_RF_CHANGE_SOURCE u32

#define RF_CHANGE_BY_SW BIT31
#define RF_CHANGE_BY_HW BIT30
#define RF_CHANGE_BY_PS BIT29
Expand Down

0 comments on commit f551124

Please sign in to comment.