summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00queue.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-17 21:09:11 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-17 21:09:11 -0700
commit820ae8a80eb59962aefbbd4908dfe144ec0f9edb (patch)
tree6c0f7356afff14e1c7d266de644810cd2de7caa9 /drivers/net/wireless/rt2x00/rt2x00queue.h
parent380fefb2ddabd4cd5f14dbe090481f0544e65078 (diff)
parent6fe70aae0d128339febfabc073ba4c4a03de4f45 (diff)
downloadop-kernel-dev-820ae8a80eb59962aefbbd4908dfe144ec0f9edb.zip
op-kernel-dev-820ae8a80eb59962aefbbd4908dfe144ec0f9edb.tar.gz
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.h')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00queue.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index 36a957a..f791708 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -94,12 +94,15 @@ enum data_queue_qid {
* mac80211 but was stripped for processing by the driver.
* @SKBDESC_NOT_MAC80211: Frame didn't originate from mac80211,
* don't try to pass it back.
+ * @SKBDESC_DESC_IN_SKB: The descriptor is at the start of the
+ * skb, instead of in the desc field.
*/
enum skb_frame_desc_flags {
SKBDESC_DMA_MAPPED_RX = 1 << 0,
SKBDESC_DMA_MAPPED_TX = 1 << 1,
SKBDESC_IV_STRIPPED = 1 << 2,
SKBDESC_NOT_MAC80211 = 1 << 3,
+ SKBDESC_DESC_IN_SKB = 1 << 4,
};
/**
OpenPOWER on IntegriCloud