diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 15ec797c5ec1..0da8f972a1b2 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -44,7 +44,7 @@ | |||
44 | /* | 44 | /* |
45 | * Module information. | 45 | * Module information. |
46 | */ | 46 | */ |
47 | #define DRV_VERSION "2.1.6" | 47 | #define DRV_VERSION "2.1.7" |
48 | #define DRV_PROJECT "http://rt2x00.serialmonkey.com" | 48 | #define DRV_PROJECT "http://rt2x00.serialmonkey.com" |
49 | 49 | ||
50 | /* | 50 | /* |
@@ -546,8 +546,7 @@ struct rt2x00lib_ops { | |||
546 | void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev, | 546 | void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev, |
547 | struct sk_buff *skb, | 547 | struct sk_buff *skb, |
548 | struct txentry_desc *txdesc); | 548 | struct txentry_desc *txdesc); |
549 | int (*write_tx_data) (struct rt2x00_dev *rt2x00dev, | 549 | int (*write_tx_data) (struct queue_entry *entry); |
550 | struct data_queue *queue, struct sk_buff *skb); | ||
551 | int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev, | 550 | int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev, |
552 | struct sk_buff *skb); | 551 | struct sk_buff *skb); |
553 | void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev, | 552 | void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev, |
@@ -827,7 +826,7 @@ struct rt2x00_dev { | |||
827 | * The Beacon array also contains the Atim queue | 826 | * The Beacon array also contains the Atim queue |
828 | * if that is supported by the device. | 827 | * if that is supported by the device. |
829 | */ | 828 | */ |
830 | int data_queues; | 829 | unsigned int data_queues; |
831 | struct data_queue *rx; | 830 | struct data_queue *rx; |
832 | struct data_queue *tx; | 831 | struct data_queue *tx; |
833 | struct data_queue *bcn; | 832 | struct data_queue *bcn; |
@@ -931,6 +930,12 @@ static inline u16 get_duration_res(const unsigned int size, const u8 rate) | |||
931 | } | 930 | } |
932 | 931 | ||
933 | /** | 932 | /** |
933 | * rt2x00queue_alloc_rxskb - allocate a skb for RX purposes. | ||
934 | * @queue: The queue for which the skb will be applicable. | ||
935 | */ | ||
936 | struct sk_buff *rt2x00queue_alloc_rxskb(struct data_queue *queue); | ||
937 | |||
938 | /** | ||
934 | * rt2x00queue_create_tx_descriptor - Create TX descriptor from mac80211 input | 939 | * rt2x00queue_create_tx_descriptor - Create TX descriptor from mac80211 input |
935 | * @entry: The entry which will be used to transfer the TX frame. | 940 | * @entry: The entry which will be used to transfer the TX frame. |
936 | * @txdesc: rt2x00 TX descriptor which will be initialized by this function. | 941 | * @txdesc: rt2x00 TX descriptor which will be initialized by this function. |