summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller2009-12-02 07:13:38 +0100
committerDavid S. Miller2009-12-02 07:13:38 +0100
commitff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch)
tree93bd6152d9fa28348be99ef1c788040cc7b7a94d /include/net
parentnet: remove [un]register_pernet_gen_... and update the docs. (diff)
parentip_fragment: also adjust skb->truesize for packets not owned by a socket (diff)
downloadkernel-qcow2-linux-ff9c38bba37937adb909cceb2a6521f2e92e17c6.tar.gz
kernel-qcow2-linux-ff9c38bba37937adb909cceb2a6521f2e92e17c6.tar.xz
kernel-qcow2-linux-ff9c38bba37937adb909cceb2a6521f2e92e17c6.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/mac80211/ht.c
Diffstat (limited to 'include/net')
-rw-r--r--include/net/mac80211.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 3754ea405c88..68a9c5f3412f 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1300,6 +1300,12 @@ enum ieee80211_filter_flags {
*
* These flags are used with the ampdu_action() callback in
* &struct ieee80211_ops to indicate which action is needed.
+ *
+ * Note that drivers MUST be able to deal with a TX aggregation
+ * session being stopped even before they OK'ed starting it by
+ * calling ieee80211_start_tx_ba_cb(_irqsafe), because the peer
+ * might receive the addBA frame and send a delBA right away!
+ *
* @IEEE80211_AMPDU_RX_START: start Rx aggregation
* @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation
* @IEEE80211_AMPDU_TX_START: start Tx aggregation