diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-17 00:05:02 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-17 00:05:02 -0800 |
commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /drivers/net/smsc911x.c | |
parent | 5c427ff9e4cc61625d48172ea082ae99e21eea6a (diff) | |
parent | 82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23 (diff) | |
download | kernel_samsung_smdk4412-a2bfbc072e279ff81e6b336acff612b9bc2e5281.zip kernel_samsung_smdk4412-a2bfbc072e279ff81e6b336acff612b9bc2e5281.tar.gz kernel_samsung_smdk4412-a2bfbc072e279ff81e6b336acff612b9bc2e5281.tar.bz2 |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/Kconfig
Diffstat (limited to 'drivers/net/smsc911x.c')
-rw-r--r-- | drivers/net/smsc911x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 6a9f51d..7f01e60 100644 --- 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; |