lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

b43: Do not use _irqsafe callbacks

Browse Source 
We don't need to call the irqsafe callbacks.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch
2009-09-10 20:22:02 +02:00
committed by John W. Linville
parent 3dbba8e281
commit ce6c4a1392
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/b43/dma.c
View File

@@ -1428,9 +1428,9 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
ring->nr_failed_tx_packets++; ring->nr_failed_tx_packets++;
ring->nr_total_packet_tries += status->frame_count; ring->nr_total_packet_tries += status->frame_count;
#endif /* DEBUG */ #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; meta->skb = NULL;
} else { } else {
/* No need to call free_descriptor_buffer here, as /* No need to call free_descriptor_buffer here, as

2
drivers/net/wireless/b43/pio.c
View File

@@ -574,7 +574,7 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev,
q->buffer_used -= total_len; q->buffer_used -= total_len;
q->free_packet_slots += 1; 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; pack->skb = NULL;
list_add(&pack->list, &q->packets_list); list_add(&pack->list, &q->packets_list);

2
drivers/net/wireless/b43/xmit.c
View File

@@ -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)); memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
ieee80211_rx_irqsafe(dev->wl->hw, skb); ieee80211_rx(dev->wl->hw, skb);
return; return;
drop: drop: