- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / staging / rt2860 / common / action.h

diff --git a/drivers/staging/rt2860/common/action.h b/drivers/staging/rt2860/common/action.h
index cfc2a5f..974f8b8 100644 (file)
--- a/drivers/staging/rt2860/common/action.h
+++ b/drivers/staging/rt2860/common/action.h
@@ -39,23 +39,18 @@
 #ifndef        __ACTION_H__
 #define        __ACTION_H__
 
-typedef struct PACKED __HT_INFO_OCTET
-{
-       UCHAR   Request:1;
-       UCHAR   Forty_MHz_Intolerant:1;
-       UCHAR   STA_Channel_Width:1;
-       UCHAR   Reserved:5;
-} HT_INFORMATION_OCTET;
-
-
-typedef struct PACKED __FRAME_HT_INFO
-{
-       HEADER_802_11                   Hdr;
-       UCHAR                                   Category;
-       UCHAR                                   Action;
-       HT_INFORMATION_OCTET    HT_Info;
-}   FRAME_HT_INFO, *PFRAME_HT_INFO;
+struct PACKED rt_ht_information_octet {
+       u8 Request:1;
+       u8 Forty_MHz_Intolerant:1;
+       u8 STA_Channel_Width:1;
+       u8 Reserved:5;
+};
+
+struct PACKED rt_frame_ht_info {
+       struct rt_header_802_11 Hdr;
+       u8 Category;
+       u8 Action;
+       struct rt_ht_information_octet HT_Info;
+};
 
 #endif /* __ACTION_H__ */
-
-