xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt2x00queue.h
This commit is contained in:
John W. Linville
2011-04-25 14:34:25 -04:00
parent b71d1d426d 73b48099cc
commit cfef6047c4
192 changed files with 7236 additions and 5970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/net/wireless/rt2x00/rt2x00queue.h
View File

@@ -364,6 +364,7 @@ enum queue_entry_flags {
* struct queue_entry: Entry inside the &struct data_queue
*
* @flags: Entry flags, see &enum queue_entry_flags.
* @last_action: Timestamp of last change.
* @queue: The data queue (&struct data_queue) to which this entry belongs.
* @skb: The buffer which is currently being transmitted (for TX queue),
* or used to directly receive data in (for RX queue).
@@ -373,6 +374,7 @@ enum queue_entry_flags {
*/
struct queue_entry {
unsigned long flags;
unsigned long last_action;
struct data_queue *queue;
@@ -463,7 +465,6 @@ struct data_queue {
unsigned short threshold;
unsigned short length;
unsigned short index[Q_INDEX_MAX];
unsigned long last_action[Q_INDEX_MAX];
unsigned short txop;
unsigned short aifs;
@@ -580,16 +581,22 @@ struct data_queue_desc {
* @queue: Pointer to @data_queue
* @start: &enum queue_index Pointer to start index
* @end: &enum queue_index Pointer to end index
* @data: Data to pass to the callback function
* @fn: The function to call for each &struct queue_entry
*
* This will walk through all entries in the queue, in chronological
* order. This means it will start at the current @start pointer
* and will walk through the queue until it reaches the @end pointer.
*
* If fn returns true for an entry rt2x00queue_for_each_entry will stop
* processing and return true as well.
*/
void rt2x00queue_for_each_entry(struct data_queue *queue,
bool rt2x00queue_for_each_entry(struct data_queue *queue,
enum queue_index start,
enum queue_index end,
void (*fn)(struct queue_entry *entry));
void *data,
bool (*fn)(struct queue_entry *entry,
void *data));
/**
* rt2x00queue_empty - Check if the queue is empty.
@@ -629,22 +636,24 @@ static inline int rt2x00queue_threshold(struct data_queue *queue)
/**
* rt2x00queue_status_timeout - Check if a timeout occurred for STATUS reports
* @queue: Queue to check.
* @entry: Queue entry to check.
*/
static inline int rt2x00queue_status_timeout(struct data_queue *queue)
static inline int rt2x00queue_status_timeout(struct queue_entry *entry)
{
return time_after(queue->last_action[Q_INDEX_DMA_DONE],
queue->last_action[Q_INDEX_DONE] + (HZ / 10));
if (!test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags))
return false;
return time_after(jiffies, entry->last_action + msecs_to_jiffies(100));
}
/**
* rt2x00queue_timeout - Check if a timeout occurred for DMA transfers
* @queue: Queue to check.
* rt2x00queue_dma_timeout - Check if a timeout occurred for DMA transfers
* @entry: Queue entry to check.
*/
static inline int rt2x00queue_dma_timeout(struct data_queue *queue)
static inline int rt2x00queue_dma_timeout(struct queue_entry *entry)
{
return time_after(queue->last_action[Q_INDEX],
queue->last_action[Q_INDEX_DMA_DONE] + (HZ / 10));
if (!test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
return false;
return time_after(jiffies, entry->last_action + msecs_to_jiffies(100));
}
/**