diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-16 18:23:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-16 18:23:54 -0500 |
| commit | 354ade9058687fdef8a612c7b298d4c51dae3da7 (patch) | |
| tree | 842cf24f53e8451058afa9a58a4ac7e54c7099be /drivers/net/enc28j60.c | |
| parent | 9f690db7ff4cb32493c0b0b13334cc4f5fd49a6b (diff) | |
| parent | bb5f133dbc4f04b6388715d364ae5865455166c2 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/enc28j60.c
Diffstat (limited to 'drivers/net/enc28j60.c')
| -rw-r--r-- | drivers/net/enc28j60.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index d3c8e742e9ea..535e14094971 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c | |||
| @@ -956,7 +956,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) | |||
| 956 | /* update statistics */ | 956 | /* update statistics */ |
| 957 | ndev->stats.rx_packets++; | 957 | ndev->stats.rx_packets++; |
| 958 | ndev->stats.rx_bytes += len; | 958 | ndev->stats.rx_bytes += len; |
| 959 | netif_rx(skb); | 959 | netif_rx_ni(skb); |
| 960 | } | 960 | } |
| 961 | } | 961 | } |
| 962 | /* | 962 | /* |