---

yaml --- r: 79433 b: refs/heads/master c: ae3e0fc h: refs/heads/master i: 79431: 02e7dff v: v3
git-mirror · Jan 28, 2008 · 597b64a · 597b64a
1 parent 6182fb7
commit 597b64a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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: