From: Larry Finger <Larry.Finger@lwfinger.net>
To: Christian Lamparter <chunkeey@googlemail.com>
Cc: wireless <linux-wireless@vger.kernel.org>
Subject: Re: Locking problem reported for mainline
Date: Mon, 10 Jan 2011 13:11:38 -0600 [thread overview]
Message-ID: <4D2B59EA.4000200@lwfinger.net> (raw)
In-Reply-To: <201101101913.17311.chunkeey@googlemail.com>
On 01/10/2011 12:13 PM, Christian Lamparter wrote:
> Does this patch help?
>
> ---
> diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
> index a6701ed..8f13a83 100644
> --- a/net/mac80211/rx.c
> +++ b/net/mac80211/rx.c
> @@ -549,7 +549,9 @@ static void ieee80211_release_reorder_frame(struct ieee80211_hw *hw,
> tid_agg_rx->reorder_buf[index] = NULL;
> status = IEEE80211_SKB_RXCB(skb);
> status->rx_flags |= IEEE80211_RX_DEFERRED_RELEASE;
> - skb_queue_tail(&local->rx_skb_queue, skb);
> + spin_lock(&rx->local->rx_skb_queue.lock);
> + __skb_queue_tail(&local->rx_skb_queue, skb);
> + spin_unlock(&rx->local->rx_skb_queue.lock);
>
> no_frame:
> tid_agg_rx->head_seq_num = seq_inc(tid_agg_rx->head_seq_num);
> @@ -780,7 +782,9 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx)
> return;
>
> dont_reorder:spin_lock(&rx->local->rx_skb_queue.lock);
> - skb_queue_tail(&local->rx_skb_queue, skb);
> + spin_lock(&rx->local->rx_skb_queue.lock);
> + __skb_queue_tail(&local->rx_skb_queue, skb);
> + spin_unlock(&rx->local->rx_skb_queue.lock);
> }
>
> static ieee80211_rx_result debug_noinline
Did not compile. In ieee80211_release_reorder_frame at lines 552 and 554, rx is
not defined.
Larry
next prev parent reply other threads:[~2011-01-10 19:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-10 5:03 Locking problem reported for mainline Larry Finger
2011-01-10 16:06 ` Stanislaw Gruszka
2011-01-10 18:13 ` Christian Lamparter
2011-01-10 19:11 ` Larry Finger [this message]
2011-01-10 19:18 ` Christian Lamparter
2011-01-11 16:31 ` Larry Finger
2011-01-11 19:45 ` Bob Copeland
2011-01-11 20:52 ` Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D2B59EA.4000200@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=chunkeey@googlemail.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).