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

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

Browse Source 
Conflicts:

	drivers/net/enc28j60.c
This commit is contained in:
David S. Miller
2008-12-16 15:23:54 -08:00
parent 9f690db7ff bb5f133dbc
commit 354ade9058
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/enc28j60.c
View File

@@ -956,7 +956,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
/* update statistics */
ndev->stats.rx_packets++;
ndev->stats.rx_bytes += len;
netif_rx(skb);
netif_rx_ni(skb);
}
}
/*