---

yaml --- r: 166271 b: refs/heads/master c: ce6c4a1 h: refs/heads/master i: 166269: 78c3801 166267: 2446441 166263: 8b5ee10 166255: 8d9e2a0 166239: 0fb9830 166207: 398acf8 166143: e264567 v: v3
git-mirror · Sep 23, 2009 · 06fccff · 06fccff
1 parent 7463be6
commit 06fccff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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:
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
-    	ieee80211_rx_irqsafe(dev->wl->hw, skb);
+    	ieee80211_rx(dev->wl->hw, skb);
     	return;
     drop:
@@ Expand Down @@