On Wed, Oct 14, 2009 at 03:33, Kalle Valo <kalle.valo@xxxxxx> wrote: > From: Kalle Valo <kalle.valo@xxxxxxxxx> > > ieee80211_rx() must be called with bottom halves disabled. To simplify > driver development implement ieee80211_rx_ni() which disables BH. This > function must be used when in process context. > > Signed-off-by: Kalle Valo <kalle.valo@xxxxxxxxx> > --- > > include/net/mac80211.h | 32 ++++++++++++++++++++++++++------ > 1 files changed, 26 insertions(+), 6 deletions(-) > > diff --git a/include/net/mac80211.h b/include/net/mac80211.h > index c75b960..c42c4a8 100644 > --- a/include/net/mac80211.h > +++ b/include/net/mac80211.h > @@ -1665,11 +1665,11 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw); > * header if %RX_FLAG_RADIOTAP is set in the @status flags. > * > * 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 and ieee80211_rx_irqsafe() may not be mixed for a > - * single hardware. > + * 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. [snip] > - * Calls to this function and ieee80211_rx() may not be mixed for a > - * single hardware. > + * Calls to this function, ieee80211_rx() or ieee80211_rx_ni() may not > + * be mixed for a single hardware. You missed out ieee80211_rx_irqsafe() here. Thanks, -- Julian Calaby Email: julian.calaby@xxxxxxxxx .Plan: http://sites.google.com/site/juliancalaby/ -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html