diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-13 14:41:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-13 14:41:34 -0400 |
| commit | 417c5233dbe35ffd6fa9e53754773f73690e1ce3 (patch) | |
| tree | 1cfcbeddd1f91d5811de67dcb86f060d194ad6f5 /include/net | |
| parent | 91cd1756cbbe9ba8772e6a5908f20cee56019c0d (diff) | |
| parent | c49de94a56f02768fa881cd7cbf58907910ceb8e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 466859b285e1..c75b960c8ac8 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -1669,6 +1669,8 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw); | |||
| 1669 | * to this function and ieee80211_rx_irqsafe() may not be mixed for a | 1669 | * to this function and ieee80211_rx_irqsafe() may not be mixed for a |
| 1670 | * single hardware. | 1670 | * single hardware. |
| 1671 | * | 1671 | * |
| 1672 | * Note that right now, this function must be called with softirqs disabled. | ||
| 1673 | * | ||
| 1672 | * @hw: the hardware this frame came in on | 1674 | * @hw: the hardware this frame came in on |
| 1673 | * @skb: the buffer to receive, owned by mac80211 after this call | 1675 | * @skb: the buffer to receive, owned by mac80211 after this call |
| 1674 | */ | 1676 | */ |