diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-01-05 16:06:25 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-05 16:06:25 -0500 |
| commit | c96e96354a6c9456cdf1f150eca504e2ea35301e (patch) | |
| tree | 751bec601fb8152116b8e31e0f1f83d687a37d6f /net/mac80211/ieee80211_i.h | |
| parent | dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a (diff) | |
| parent | 33af88138b859f515b365a074e0a014d7cdbf846 (diff) | |
| download | op-kernel-dev-c96e96354a6c9456cdf1f150eca504e2ea35301e.zip op-kernel-dev-c96e96354a6c9456cdf1f150eca504e2ea35301e.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
net/bluetooth/Makefile
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index a05893a..95cdd2a 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -168,6 +168,7 @@ typedef unsigned __bitwise__ ieee80211_rx_result; * @IEEE80211_RX_FRAGMENTED: fragmented frame * @IEEE80211_RX_AMSDU: a-MSDU packet * @IEEE80211_RX_MALFORMED_ACTION_FRM: action frame is malformed + * @IEEE80211_RX_DEFERRED_RELEASE: frame was subjected to receive reordering * * These are per-frame flags that are attached to a frame in the * @rx_flags field of &struct ieee80211_rx_status. @@ -178,6 +179,7 @@ enum ieee80211_packet_rx_flags { IEEE80211_RX_FRAGMENTED = BIT(2), IEEE80211_RX_AMSDU = BIT(3), IEEE80211_RX_MALFORMED_ACTION_FRM = BIT(4), + IEEE80211_RX_DEFERRED_RELEASE = BIT(5), }; /** @@ -774,6 +776,15 @@ struct ieee80211_local { struct sk_buff_head skb_queue; struct sk_buff_head skb_queue_unreliable; + /* + * Internal FIFO queue which is shared between multiple rx path + * stages. Its main task is to provide a serialization mechanism, + * so all rx handlers can enjoy having exclusive access to their + * private data structures. + */ + struct sk_buff_head rx_skb_queue; + bool running_rx_handler; /* protected by rx_skb_queue.lock */ + /* Station data */ /* * The mutex only protects the list and counter, |
