diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index 3305520464403a2d77997921b94ec21d8e6d5be0..3fa2406af7008914778029c93936e47eb1a1bda0 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -315,17 +315,17 @@ struct txentry_desc {
 
 		struct {
 			u16 mcs;
-			u16 stbc;
-			u16 ba_size;
-			u16 mpdu_density;
-			short txop;
+			u8 stbc;
+			u8 ba_size;
+			u8 mpdu_density;
+			enum txop txop;
 		} ht;
 	} u;
 
 	u16 rate_mode;
 
 	short retry_limit;
-	short ifs;
+	enum ifs ifs;
 
 	enum cipher cipher;
 	u16 key_idx;