We don't need to call the irqsafe callbacks. Signed-off-by: Michael Buesch <mb@xxxxxxxxx> --- Apply on top the other patches. Index: wireless-testing/drivers/net/wireless/b43/dma.c =================================================================== --- wireless-testing.orig/drivers/net/wireless/b43/dma.c 2009-09-05 12:31:01.000000000 +0200 +++ wireless-testing/drivers/net/wireless/b43/dma.c 2009-09-10 20:14:25.000000000 +0200 @@ -1428,9 +1428,9 @@ void b43_dma_handle_txstatus(struct b43_ ring->nr_failed_tx_packets++; ring->nr_total_packet_tries += status->frame_count; #endif /* DEBUG */ - ieee80211_tx_status_irqsafe(dev->wl->hw, meta->skb); + ieee80211_tx_status(dev->wl->hw, meta->skb); - /* skb is freed by ieee80211_tx_status_irqsafe() */ + /* skb is freed by ieee80211_tx_status() */ meta->skb = NULL; } else { /* No need to call free_descriptor_buffer here, as Index: wireless-testing/drivers/net/wireless/b43/pio.c =================================================================== --- wireless-testing.orig/drivers/net/wireless/b43/pio.c 2009-09-05 12:31:02.000000000 +0200 +++ wireless-testing/drivers/net/wireless/b43/pio.c 2009-09-10 20:14:37.000000000 +0200 @@ -574,7 +574,7 @@ void b43_pio_handle_txstatus(struct b43_ q->buffer_used -= total_len; q->free_packet_slots += 1; - ieee80211_tx_status_irqsafe(dev->wl->hw, pack->skb); + ieee80211_tx_status(dev->wl->hw, pack->skb); pack->skb = NULL; list_add(&pack->list, &q->packets_list); Index: wireless-testing/drivers/net/wireless/b43/xmit.c =================================================================== --- wireless-testing.orig/drivers/net/wireless/b43/xmit.c 2009-09-06 16:17:08.000000000 +0200 +++ wireless-testing/drivers/net/wireless/b43/xmit.c 2009-09-10 20:13:29.000000000 +0200 @@ -690,7 +690,7 @@ void b43_rx(struct b43_wldev *dev, struc } memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status)); - ieee80211_rx_irqsafe(dev->wl->hw, skb); + ieee80211_rx(dev->wl->hw, skb); return; drop: -- Greetings, Michael. -- 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