diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index d9daa9c406fa..6c1ff4c15c84 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -177,16 +177,15 @@ struct rt2x00_chip { | |||
177 | #define RT2573 0x2573 | 177 | #define RT2573 0x2573 |
178 | #define RT2860 0x2860 /* 2.4GHz PCI/CB */ | 178 | #define RT2860 0x2860 /* 2.4GHz PCI/CB */ |
179 | #define RT2870 0x2870 | 179 | #define RT2870 0x2870 |
180 | #define RT2872 0x2872 | 180 | #define RT2872 0x2872 /* WSOC */ |
181 | #define RT2880 0x2880 /* WSOC */ | ||
182 | #define RT2883 0x2883 /* WSOC */ | 181 | #define RT2883 0x2883 /* WSOC */ |
183 | #define RT2890 0x2890 /* 2.4GHz PCIe */ | ||
184 | #define RT3052 0x3052 /* WSOC */ | ||
185 | #define RT3070 0x3070 | 182 | #define RT3070 0x3070 |
186 | #define RT3071 0x3071 | 183 | #define RT3071 0x3071 |
187 | #define RT3090 0x3090 /* 2.4GHz PCIe */ | 184 | #define RT3090 0x3090 /* 2.4GHz PCIe */ |
188 | #define RT3390 0x3390 | 185 | #define RT3390 0x3390 |
189 | #define RT3572 0x3572 | 186 | #define RT3572 0x3572 |
187 | #define RT3593 0x3593 /* PCIe */ | ||
188 | #define RT3883 0x3883 /* WSOC */ | ||
190 | 189 | ||
191 | u16 rf; | 190 | u16 rf; |
192 | u16 rev; | 191 | u16 rev; |
@@ -550,8 +549,10 @@ struct rt2x00lib_ops { | |||
550 | void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev, | 549 | void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev, |
551 | struct sk_buff *skb, | 550 | struct sk_buff *skb, |
552 | struct txentry_desc *txdesc); | 551 | struct txentry_desc *txdesc); |
553 | int (*write_tx_data) (struct queue_entry *entry); | 552 | int (*write_tx_data) (struct queue_entry *entry, |
554 | void (*write_beacon) (struct queue_entry *entry); | 553 | struct txentry_desc *txdesc); |
554 | void (*write_beacon) (struct queue_entry *entry, | ||
555 | struct txentry_desc *txdesc); | ||
555 | int (*get_tx_data_len) (struct queue_entry *entry); | 556 | int (*get_tx_data_len) (struct queue_entry *entry); |
556 | void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev, | 557 | void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev, |
557 | const enum data_queue_qid queue); | 558 | const enum data_queue_qid queue); |
@@ -930,12 +931,12 @@ static inline void rt2x00_set_chip(struct rt2x00_dev *rt2x00dev, | |||
930 | rt2x00dev->chip.rt, rt2x00dev->chip.rf, rt2x00dev->chip.rev); | 931 | rt2x00dev->chip.rt, rt2x00dev->chip.rf, rt2x00dev->chip.rev); |
931 | } | 932 | } |
932 | 933 | ||
933 | static inline char rt2x00_rt(struct rt2x00_dev *rt2x00dev, const u16 rt) | 934 | static inline bool rt2x00_rt(struct rt2x00_dev *rt2x00dev, const u16 rt) |
934 | { | 935 | { |
935 | return (rt2x00dev->chip.rt == rt); | 936 | return (rt2x00dev->chip.rt == rt); |
936 | } | 937 | } |
937 | 938 | ||
938 | static inline char rt2x00_rf(struct rt2x00_dev *rt2x00dev, const u16 rf) | 939 | static inline bool rt2x00_rf(struct rt2x00_dev *rt2x00dev, const u16 rf) |
939 | { | 940 | { |
940 | return (rt2x00dev->chip.rf == rf); | 941 | return (rt2x00dev->chip.rf == rf); |
941 | } | 942 | } |
@@ -945,6 +946,24 @@ static inline u16 rt2x00_rev(struct rt2x00_dev *rt2x00dev) | |||
945 | return rt2x00dev->chip.rev; | 946 | return rt2x00dev->chip.rev; |
946 | } | 947 | } |
947 | 948 | ||
949 | static inline bool rt2x00_rt_rev(struct rt2x00_dev *rt2x00dev, | ||
950 | const u16 rt, const u16 rev) | ||
951 | { | ||
952 | return (rt2x00_rt(rt2x00dev, rt) && rt2x00_rev(rt2x00dev) == rev); | ||
953 | } | ||
954 | |||
955 | static inline bool rt2x00_rt_rev_lt(struct rt2x00_dev *rt2x00dev, | ||
956 | const u16 rt, const u16 rev) | ||
957 | { | ||
958 | return (rt2x00_rt(rt2x00dev, rt) && rt2x00_rev(rt2x00dev) < rev); | ||
959 | } | ||
960 | |||
961 | static inline bool rt2x00_rt_rev_gte(struct rt2x00_dev *rt2x00dev, | ||
962 | const u16 rt, const u16 rev) | ||
963 | { | ||
964 | return (rt2x00_rt(rt2x00dev, rt) && rt2x00_rev(rt2x00dev) >= rev); | ||
965 | } | ||
966 | |||
948 | static inline void rt2x00_set_chip_intf(struct rt2x00_dev *rt2x00dev, | 967 | static inline void rt2x00_set_chip_intf(struct rt2x00_dev *rt2x00dev, |
949 | enum rt2x00_chip_intf intf) | 968 | enum rt2x00_chip_intf intf) |
950 | { | 969 | { |