The patch "mac80211: AMPDU rx reorder timeout timer" clashes with "mac80211: use netif_receive_skb in ieee80211_rx callpath" The timer itself is part of the station's private struct. The clean-up routine will deactivate the timer as soon as the station is removed. Therefore the extra sta->lock protection should not be necessary. Cc: Ben Greear <greearb@xxxxxxxxxxxxxxx> Reported-by: Ming Lei<tom.leiming@xxxxxxxxx> Signed-off-by: Christian Lamparter<chunkeey@xxxxxxxxxxxxxx> --- reference from Ben Greear: (no tested-by, because no-one could actually reproduce the original lockdep warning) http://www.spinics.net/lists/linux-wireless/msg56900.html --- diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index 58eab9e..309ed70 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c @@ -129,9 +129,7 @@ static void sta_rx_agg_reorder_timer_expired(unsigned long data) timer_to_tid[0]); rcu_read_lock(); - spin_lock(&sta->lock); ieee80211_release_reorder_timeout(sta, *ptid); - spin_unlock(&sta->lock); rcu_read_unlock(); } -- 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
