From: David S. Miller <davem@davemloft.net>
Date: Tue, 16 Dec 2008 23:23:54 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.29-rc1~581^2~161
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=354ade9058687fdef8a612c7b298d4c51dae3da7;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/enc28j60.c
---

354ade9058687fdef8a612c7b298d4c51dae3da7
diff --cc drivers/net/enc28j60.c
index d3c8e742e9e,36cb6e95b46..535e1409497
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@@ -956,7 -958,8 +956,7 @@@ static void enc28j60_hw_rx(struct net_d
  			/* update statistics */
  			ndev->stats.rx_packets++;
  			ndev->stats.rx_bytes += len;
- 			netif_rx(skb);
 -			ndev->last_rx = jiffies;
+ 			netif_rx_ni(skb);
  		}
  	}
  	/*