diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
| commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
| tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /drivers/net/smsc911x.c | |
| parent | 5c427ff9e4cc61625d48172ea082ae99e21eea6a (diff) | |
| parent | 82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23 (diff) | |
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 6a9f51d1d9f..7f01e60d517 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) | |||
| 986 | struct net_device *dev = pdata->dev; | 986 | struct net_device *dev = pdata->dev; |
| 987 | int npackets = 0; | 987 | int npackets = 0; |
| 988 | 988 | ||
| 989 | while (likely(netif_running(dev)) && (npackets < budget)) { | 989 | while (npackets < budget) { |
| 990 | unsigned int pktlength; | 990 | unsigned int pktlength; |
| 991 | unsigned int pktwords; | 991 | unsigned int pktwords; |
| 992 | struct sk_buff *skb; | 992 | struct sk_buff *skb; |