From 06fccff4f8ca60597efc65a14cc32a1b65d29a85 Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Thu, 10 Sep 2009 20:22:02 +0200
Subject: [PATCH] --- yaml --- r: 166271 b: refs/heads/master c:
 ce6c4a13927bc0418169fe543c6614abfab051eb h: refs/heads/master i:   166269:
 78c3801a38e31980c5c1b73eeb8d6f7198f7a090   166267:
 2446441bf6bb2c68712e4e79e83fcce1bf8e0e22   166263:
 8b5ee1080ed7b9b692aff058f0df03ae052032b1   166255:
 8d9e2a047562a97cb5255136505c9bdaa9e1de03   166239:
 0fb983089142d2f0c2607c53decac6a3d8010aa7   166207:
 398acf8547926f74316f903471738428222dfbd1   166143:
 e264567707b1d299393fe4ea521ce2a6c5d692d1 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/wireless/b43/dma.c  | 4 ++--
 trunk/drivers/net/wireless/b43/pio.c  | 2 +-
 trunk/drivers/net/wireless/b43/xmit.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 72a262b71018..3d1a25439b1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dbba8e281552da640080f08a0f127d48456669f
+refs/heads/master: ce6c4a13927bc0418169fe543c6614abfab051eb
diff --git a/trunk/drivers/net/wireless/b43/dma.c b/trunk/drivers/net/wireless/b43/dma.c
index a467ee260a19..8701034569fa 100644
--- a/trunk/drivers/net/wireless/b43/dma.c
+++ b/trunk/drivers/net/wireless/b43/dma.c
@@ -1428,9 +1428,9 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
 				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
diff --git a/trunk/drivers/net/wireless/b43/pio.c b/trunk/drivers/net/wireless/b43/pio.c
index 3498b68385e7..e96091b31499 100644
--- a/trunk/drivers/net/wireless/b43/pio.c
+++ b/trunk/drivers/net/wireless/b43/pio.c
@@ -574,7 +574,7 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev,
 	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);
 
diff --git a/trunk/drivers/net/wireless/b43/xmit.c b/trunk/drivers/net/wireless/b43/xmit.c
index 14f541248b5c..c403c616d3bd 100644
--- a/trunk/drivers/net/wireless/b43/xmit.c
+++ b/trunk/drivers/net/wireless/b43/xmit.c
@@ -690,7 +690,7 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
 	}
 
 	memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
-	ieee80211_rx_irqsafe(dev->wl->hw, skb);
+	ieee80211_rx(dev->wl->hw, skb);
 
 	return;
 drop: