git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
smsc911x.c
diff --git
a/drivers/net/smsc911x.c
b/drivers/net/smsc911x.c
index
6a9f51d
..
7f01e60
100644
(file)
--- a/
drivers/net/smsc911x.c
+++ b/
drivers/net/smsc911x.c
@@
-986,7
+986,7
@@
static int smsc911x_poll(struct napi_struct *napi, int budget)
struct net_device *dev = pdata->dev;
int npackets = 0;
- while (
likely(netif_running(dev)) && (npackets < budget)
) {
+ while (
npackets < budget
) {
unsigned int pktlength;
unsigned int pktwords;
struct sk_buff *skb;