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

2009-10-13 11:41:34 -07:00
parent 91cd1756cb c49de94a56
commit 417c5233db
6 changed files with 11 additions and 4 deletions
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@ -1669,6 +1669,8 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw);
 * to this function and ieee80211_rx_irqsafe() may not be mixed for a
 * single hardware.
 *
+ * Note that right now, this function must be called with softirqs disabled.
+ *
 * @hw: the hardware this frame came in on
 * @skb: the buffer to receive, owned by mac80211 after this call
 */