diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-06 15:02:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-06 15:02:34 +0200 |
| commit | d9b2002c406011164f245de7a81304625989f1c9 (patch) | |
| tree | a2bb74773cd1409acbec5eb2fbba2ae9889d55e8 /drivers/net/wireless/b43/xmit.c | |
| parent | c3b32fcbc7f4fd9a9b84718b991b175b0fd53f8c (diff) | |
| parent | 906010b2134e14a2e377decbadd357b3d0ab9c6a (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Upcoming patch is dependent on a fix in perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/wireless/b43/xmit.c')
| -rw-r--r-- | drivers/net/wireless/b43/xmit.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 14f541248b5..ac9f600995e 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c @@ -690,8 +690,11 @@ 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); +#if B43_DEBUG + dev->rx_count++; +#endif return; drop: b43dbg(dev->wl, "RX: Packet dropped\n"); |