1 files changed, 43 insertions, 43 deletions
diff --git a/drivers/staging/rt2860/rtmp_dot11.h b/drivers/staging/rt2860/rtmp_dot11.h
index fd9c7209bcb..e97034375e3 100644
--- a/drivers/staging/rt2860/rtmp_dot11.h
+++ b/drivers/staging/rt2860/rtmp_dot11.h
@@ -32,69 +32,69 @@
 /* 4-byte HTC field.  maybe included in any frame except non-QOS data frame.  The Order bit must set 1. */
 typedef struct PACKED {
-        UINT32 MA:1;            /*management action payload exist in (QoS Null+HTC) */
+        u32 MA:1;               /*management action payload exist in (QoS Null+HTC) */
-        UINT32 TRQ:1;           /*sounding request */
+        u32 TRQ:1;              /*sounding request */
-        UINT32 MRQ:1;           /*MCS feedback. Request for a MCS feedback */
+        u32 MRQ:1;              /*MCS feedback. Request for a MCS feedback */
-        UINT32 MRSorASI:3;      /* MRQ Sequence identifier. unchanged during entire procedure. 0x000-0x110. */
+        u32 MRSorASI:3; /* MRQ Sequence identifier. unchanged during entire procedure. 0x000-0x110. */
-        UINT32 MFS:3;           /*SET to the received value of MRS. 0x111 for unsolicited MFB. */
+        u32 MFS:3;              /*SET to the received value of MRS. 0x111 for unsolicited MFB. */
-        UINT32 MFBorASC:7;      /*Link adaptation feedback containing recommended MCS. 0x7f for no feedback or not available */
+        u32 MFBorASC:7; /*Link adaptation feedback containing recommended MCS. 0x7f for no feedback or not available */
-        UINT32 CalPos:2;        /* calibration position */
+        u32 CalPos:2;   /* calibration position */
-        UINT32 CalSeq:2;        /*calibration sequence */
+        u32 CalSeq:2;   /*calibration sequence */
-        UINT32 FBKReq:2;        /*feedback request */
+        u32 FBKReq:2;   /*feedback request */
-        UINT32 CSISTEERING:2;   /*CSI/ STEERING */
+        u32 CSISTEERING:2;      /*CSI/ STEERING */
-        UINT32 ZLFAnnouce:1;    /* ZLF announcement */
+        u32 ZLFAnnouce:1;       /* ZLF announcement */
-        UINT32 rsv:5;           /*calibration sequence */
+        u32 rsv:5;              /*calibration sequence */
-        UINT32 ACConstraint:1;  /*feedback request */
+        u32 ACConstraint:1;     /*feedback request */
-        UINT32 RDG:1;           /*RDG / More PPDU */
+        u32 RDG:1;              /*RDG / More PPDU */
 } HT_CONTROL, *PHT_CONTROL;
 /* 2-byte QOS CONTROL field */
 typedef struct PACKED {
-        USHORT TID:4;
+        u16 TID:4;
-        USHORT EOSP:1;
+        u16 EOSP:1;
-        USHORT AckPolicy:2;     /*0: normal ACK 1:No ACK 2:scheduled under MTBA/PSMP  3: BA */
+        u16 AckPolicy:2;        /*0: normal ACK 1:No ACK 2:scheduled under MTBA/PSMP  3: BA */
-        USHORT AMsduPresent:1;
+        u16 AMsduPresent:1;
-        USHORT Txop_QueueSize:8;
+        u16 Txop_QueueSize:8;
 } QOS_CONTROL, *PQOS_CONTROL;
 /* 2-byte Frame control field */
 typedef struct PACKED {
-        USHORT Ver:2;           /* Protocol version */
+        u16 Ver:2;              /* Protocol version */
-        USHORT Type:2;          /* MSDU type */
+        u16 Type:2;             /* MSDU type */
-        USHORT SubType:4;       /* MSDU subtype */
+        u16 SubType:4;  /* MSDU subtype */
-        USHORT ToDs:1;          /* To DS indication */
+        u16 ToDs:1;             /* To DS indication */
-        USHORT FrDs:1;          /* From DS indication */
+        u16 FrDs:1;             /* From DS indication */
-        USHORT MoreFrag:1;      /* More fragment bit */
+        u16 MoreFrag:1; /* More fragment bit */
-        USHORT Retry:1;         /* Retry status bit */
+        u16 Retry:1;            /* Retry status bit */
-        USHORT PwrMgmt:1;       /* Power management bit */
+        u16 PwrMgmt:1;  /* Power management bit */
-        USHORT MoreData:1;      /* More data bit */
+        u16 MoreData:1; /* More data bit */
-        USHORT Wep:1;           /* Wep data */
+        u16 Wep:1;              /* Wep data */
-        USHORT Order:1;         /* Strict order expected */
+        u16 Order:1;            /* Strict order expected */
 } FRAME_CONTROL, *PFRAME_CONTROL;
 typedef struct PACKED _HEADER_802_11 {
        FRAME_CONTROL FC;
-        USHORT Duration;
+        u16 Duration;
-        UCHAR Addr1[MAC_ADDR_LEN];
+        u8 Addr1[MAC_ADDR_LEN];
-        UCHAR Addr2[MAC_ADDR_LEN];
+        u8 Addr2[MAC_ADDR_LEN];
-        UCHAR Addr3[MAC_ADDR_LEN];
+        u8 Addr3[MAC_ADDR_LEN];
-        USHORT Frag:4;
+        u16 Frag:4;
-        USHORT Sequence:12;
+        u16 Sequence:12;
-        UCHAR Octet[0];
+        u8 Octet[0];
 } HEADER_802_11, *PHEADER_802_11;
 typedef struct PACKED _PSPOLL_FRAME {
        FRAME_CONTROL FC;
-        USHORT Aid;
+        u16 Aid;
-        UCHAR Bssid[MAC_ADDR_LEN];
+        u8 Bssid[MAC_ADDR_LEN];
-        UCHAR Ta[MAC_ADDR_LEN];
+        u8 Ta[MAC_ADDR_LEN];
 } PSPOLL_FRAME, *PPSPOLL_FRAME;
 typedef struct PACKED _RTS_FRAME {
        FRAME_CONTROL FC;
-        USHORT Duration;
+        u16 Duration;
-        UCHAR Addr1[MAC_ADDR_LEN];
+        u8 Addr1[MAC_ADDR_LEN];
-        UCHAR Addr2[MAC_ADDR_LEN];
+        u8 Addr2[MAC_ADDR_LEN];
 } RTS_FRAME, *PRTS_FRAME;
 #endif /* __DOT11_BASE_H__ // */

diff --git a/drivers/staging/rt2860/rtmp_dot11.h b/drivers/staging/rt2860/rtmp_dot11.h index fd9c7209bcb..e97034375e3 100644 --- a/drivers/staging/rt2860/rtmp_dot11.h +++ b/drivers/staging/rt2860/rtmp_dot11.h
@@ -32,69 +32,69 @@
32		32
33	/* 4-byte HTC field. maybe included in any frame except non-QOS data frame. The Order bit must set 1. */	33	/* 4-byte HTC field. maybe included in any frame except non-QOS data frame. The Order bit must set 1. */
34	typedef struct PACKED {	34	typedef struct PACKED {
35	UINT32 MA:1; /management action payload exist in (QoS Null+HTC) /	35	u32 MA:1; /management action payload exist in (QoS Null+HTC) /
36	UINT32 TRQ:1; /sounding request /	36	u32 TRQ:1; /sounding request /
37	UINT32 MRQ:1; /MCS feedback. Request for a MCS feedback /	37	u32 MRQ:1; /MCS feedback. Request for a MCS feedback /
38	UINT32 MRSorASI:3; /* MRQ Sequence identifier. unchanged during entire procedure. 0x000-0x110. */	38	u32 MRSorASI:3; /* MRQ Sequence identifier. unchanged during entire procedure. 0x000-0x110. */
39	UINT32 MFS:3; /SET to the received value of MRS. 0x111 for unsolicited MFB. /	39	u32 MFS:3; /SET to the received value of MRS. 0x111 for unsolicited MFB. /
40	UINT32 MFBorASC:7; /Link adaptation feedback containing recommended MCS. 0x7f for no feedback or not available /	40	u32 MFBorASC:7; /Link adaptation feedback containing recommended MCS. 0x7f for no feedback or not available /
41	UINT32 CalPos:2; /* calibration position */	41	u32 CalPos:2; /* calibration position */
42	UINT32 CalSeq:2; /calibration sequence /	42	u32 CalSeq:2; /calibration sequence /
43	UINT32 FBKReq:2; /feedback request /	43	u32 FBKReq:2; /feedback request /
44	UINT32 CSISTEERING:2; /CSI/ STEERING /	44	u32 CSISTEERING:2; /CSI/ STEERING /
45	UINT32 ZLFAnnouce:1; /* ZLF announcement */	45	u32 ZLFAnnouce:1; /* ZLF announcement */
46	UINT32 rsv:5; /calibration sequence /	46	u32 rsv:5; /calibration sequence /
47	UINT32 ACConstraint:1; /feedback request /	47	u32 ACConstraint:1; /feedback request /
48	UINT32 RDG:1; /RDG / More PPDU /	48	u32 RDG:1; /RDG / More PPDU /
49	} HT_CONTROL, *PHT_CONTROL;	49	} HT_CONTROL, *PHT_CONTROL;
50		50
51	/* 2-byte QOS CONTROL field */	51	/* 2-byte QOS CONTROL field */
52	typedef struct PACKED {	52	typedef struct PACKED {
53	USHORT TID:4;	53	u16 TID:4;
54	USHORT EOSP:1;	54	u16 EOSP:1;
55	USHORT AckPolicy:2; /0: normal ACK 1:No ACK 2:scheduled under MTBA/PSMP 3: BA /	55	u16 AckPolicy:2; /0: normal ACK 1:No ACK 2:scheduled under MTBA/PSMP 3: BA /
56	USHORT AMsduPresent:1;	56	u16 AMsduPresent:1;
57	USHORT Txop_QueueSize:8;	57	u16 Txop_QueueSize:8;
58	} QOS_CONTROL, *PQOS_CONTROL;	58	} QOS_CONTROL, *PQOS_CONTROL;
59		59
60	/* 2-byte Frame control field */	60	/* 2-byte Frame control field */
61	typedef struct PACKED {	61	typedef struct PACKED {
62	USHORT Ver:2; /* Protocol version */	62	u16 Ver:2; /* Protocol version */
63	USHORT Type:2; /* MSDU type */	63	u16 Type:2; /* MSDU type */
64	USHORT SubType:4; /* MSDU subtype */	64	u16 SubType:4; /* MSDU subtype */
65	USHORT ToDs:1; /* To DS indication */	65	u16 ToDs:1; /* To DS indication */
66	USHORT FrDs:1; /* From DS indication */	66	u16 FrDs:1; /* From DS indication */
67	USHORT MoreFrag:1; /* More fragment bit */	67	u16 MoreFrag:1; /* More fragment bit */
68	USHORT Retry:1; /* Retry status bit */	68	u16 Retry:1; /* Retry status bit */
69	USHORT PwrMgmt:1; /* Power management bit */	69	u16 PwrMgmt:1; /* Power management bit */
70	USHORT MoreData:1; /* More data bit */	70	u16 MoreData:1; /* More data bit */
71	USHORT Wep:1; /* Wep data */	71	u16 Wep:1; /* Wep data */
72	USHORT Order:1; /* Strict order expected */	72	u16 Order:1; /* Strict order expected */
73	} FRAME_CONTROL, *PFRAME_CONTROL;	73	} FRAME_CONTROL, *PFRAME_CONTROL;
74		74
75	typedef struct PACKED _HEADER_802_11 {	75	typedef struct PACKED _HEADER_802_11 {
76	FRAME_CONTROL FC;	76	FRAME_CONTROL FC;
77	USHORT Duration;	77	u16 Duration;
78	UCHAR Addr1[MAC_ADDR_LEN];	78	u8 Addr1[MAC_ADDR_LEN];
79	UCHAR Addr2[MAC_ADDR_LEN];	79	u8 Addr2[MAC_ADDR_LEN];
80	UCHAR Addr3[MAC_ADDR_LEN];	80	u8 Addr3[MAC_ADDR_LEN];
81	USHORT Frag:4;	81	u16 Frag:4;
82	USHORT Sequence:12;	82	u16 Sequence:12;
83	UCHAR Octet[0];	83	u8 Octet[0];
84	} HEADER_802_11, *PHEADER_802_11;	84	} HEADER_802_11, *PHEADER_802_11;
85		85
86	typedef struct PACKED _PSPOLL_FRAME {	86	typedef struct PACKED _PSPOLL_FRAME {
87	FRAME_CONTROL FC;	87	FRAME_CONTROL FC;
88	USHORT Aid;	88	u16 Aid;
89	UCHAR Bssid[MAC_ADDR_LEN];	89	u8 Bssid[MAC_ADDR_LEN];
90	UCHAR Ta[MAC_ADDR_LEN];	90	u8 Ta[MAC_ADDR_LEN];
91	} PSPOLL_FRAME, *PPSPOLL_FRAME;	91	} PSPOLL_FRAME, *PPSPOLL_FRAME;
92		92
93	typedef struct PACKED _RTS_FRAME {	93	typedef struct PACKED _RTS_FRAME {
94	FRAME_CONTROL FC;	94	FRAME_CONTROL FC;
95	USHORT Duration;	95	u16 Duration;
96	UCHAR Addr1[MAC_ADDR_LEN];	96	u8 Addr1[MAC_ADDR_LEN];
97	UCHAR Addr2[MAC_ADDR_LEN];	97	u8 Addr2[MAC_ADDR_LEN];
98	} RTS_FRAME, *PRTS_FRAME;	98	} RTS_FRAME, *PRTS_FRAME;
99		99
100	#endif /* __DOT11_BASE_H__ // */	100	#endif /* __DOT11_BASE_H__ // */