diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2013-05-25 00:01:30 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-25 00:01:30 +0200 |
| commit | dde7dc759b777f385fc5df2af691c82eb455c7f3 (patch) | |
| tree | 5e8f1fcd10a6b264d60bc8a0503656c0611de222 /include/net/mac80211.h | |
| parent | {cfg,mac}80211: move mandatory rates calculation to cfg80211 (diff) | |
| parent | mac80211: close AP_VLAN interfaces before unregistering all (diff) | |
| download | linux-dev-dde7dc759b777f385fc5df2af691c82eb455c7f3.tar.xz linux-dev-dde7dc759b777f385fc5df2af691c82eb455c7f3.zip | |
Merge remote-tracking branch 'mac80211/master' into mac80211-next
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index c9e6fb7417f6..1f0014bd4d87 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -3053,7 +3053,8 @@ void ieee80211_napi_complete(struct ieee80211_hw *hw); * This function may not be called in IRQ context. Calls to this function * for a single hardware must be synchronized against each other. Calls to * this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be - * mixed for a single hardware. + * mixed for a single hardware. Must not run concurrently with + * ieee80211_tx_status() or ieee80211_tx_status_ni(). * * In process context use instead ieee80211_rx_ni(). * @@ -3069,7 +3070,8 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb); * (internally defers to a tasklet.) * * Calls to this function, ieee80211_rx() or ieee80211_rx_ni() may not - * be mixed for a single hardware. + * be mixed for a single hardware.Must not run concurrently with + * ieee80211_tx_status() or ieee80211_tx_status_ni(). * * @hw: the hardware this frame came in on * @skb: the buffer to receive, owned by mac80211 after this call @@ -3083,7 +3085,8 @@ void ieee80211_rx_irqsafe(struct ieee80211_hw *hw, struct sk_buff *skb); * (internally disables bottom halves). * * Calls to this function, ieee80211_rx() and ieee80211_rx_irqsafe() may - * not be mixed for a single hardware. + * not be mixed for a single hardware. Must not run concurrently with + * ieee80211_tx_status() or ieee80211_tx_status_ni(). * * @hw: the hardware this frame came in on * @skb: the buffer to receive, owned by mac80211 after this call @@ -3206,7 +3209,8 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif, * This function may not be called in IRQ context. Calls to this function * for a single hardware must be synchronized against each other. Calls * to this function, ieee80211_tx_status_ni() and ieee80211_tx_status_irqsafe() - * may not be mixed for a single hardware. + * may not be mixed for a single hardware. Must not run concurrently with + * ieee80211_rx() or ieee80211_rx_ni(). * * @hw: the hardware the frame was transmitted by * @skb: the frame that was transmitted, owned by mac80211 after this call |