summaryrefslogtreecommitdiffstats
path: root/drivers/net/enc28j60.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-16 15:23:54 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-16 15:23:54 -0800
commit354ade9058687fdef8a612c7b298d4c51dae3da7 (patch)
tree842cf24f53e8451058afa9a58a4ac7e54c7099be /drivers/net/enc28j60.c
parent9f690db7ff4cb32493c0b0b13334cc4f5fd49a6b (diff)
parentbb5f133dbc4f04b6388715d364ae5865455166c2 (diff)
downloadop-kernel-dev-354ade9058687fdef8a612c7b298d4c51dae3da7.zip
op-kernel-dev-354ade9058687fdef8a612c7b298d4c51dae3da7.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index d3c8e74..535e140 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -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);
}
}
/*
OpenPOWER on IntegriCloud