From 597b64aef4b33d1c5fbd586d41f045e75a931537 Mon Sep 17 00:00:00 2001 From: Holger Schurig Date: Wed, 16 Jan 2008 15:48:44 +0100 Subject: [PATCH] --- yaml --- r: 79433 b: refs/heads/master c: ae3e0fcf901e4b7df87aef7ab39093e142a8de8b h: refs/heads/master i: 79431: 02e7dff1b1c92389cc797343bc2e2b8b138701db v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/rx.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1902bd0280c6..a17bd96bd247 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ac919be0520b22d106b1d5f3e8f9b5c142089eb +refs/heads/master: ae3e0fcf901e4b7df87aef7ab39093e142a8de8b diff --git a/trunk/drivers/net/wireless/libertas/rx.c b/trunk/drivers/net/wireless/libertas/rx.c index 6332fd451a1e..149557a478ac 100644 --- a/trunk/drivers/net/wireless/libertas/rx.c +++ b/trunk/drivers/net/wireless/libertas/rx.c @@ -247,7 +247,10 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb) priv->stats.rx_packets++; skb->protocol = eth_type_trans(skb, dev); - netif_rx(skb); + if (in_interrupt()) + netif_rx(skb); + else + netif_rx_ni(skb); ret = 0; done: