git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[pandora-kernel.git]
/
drivers
/
net
/
ixp2000
/
ixpdev.c
diff --git
a/drivers/net/ixp2000/ixpdev.c
b/drivers/net/ixp2000/ixpdev.c
index
6c0dd49
..
484cb2b
100644
(file)
--- a/
drivers/net/ixp2000/ixpdev.c
+++ b/
drivers/net/ixp2000/ixpdev.c
@@
-135,8
+135,6
@@
static int ixpdev_poll(struct napi_struct *napi, int budget)
struct net_device *dev = ip->dev;
int rx;
struct net_device *dev = ip->dev;
int rx;
- /* @@@ Have to stop polling when nds[0] is administratively
- * downed while we are polling. */
rx = 0;
do {
ixp2000_reg_write(IXP2000_IRQ_THD_RAW_STATUS_A_0, 0x00ff);
rx = 0;
do {
ixp2000_reg_write(IXP2000_IRQ_THD_RAW_STATUS_A_0, 0x00ff);