diff options
| author | Magnus Damm <damm@igel.co.jp> | 2008-09-08 07:02:56 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-25 00:48:55 +0200 |
| commit | d6bc372ea1196066b618908dc522b08cd28993df (patch) | |
| tree | 54680c998cc36fe96f0da17dbe138884d406cfc2 /drivers/net/smc91x.c | |
| parent | r8169: fix RxMissed register access (diff) | |
| download | linux-d6bc372ea1196066b618908dc522b08cd28993df.tar.xz linux-d6bc372ea1196066b618908dc522b08cd28993df.zip | |
smc91x: fix nowait printout
Commit c4f0e76747e80578a8f7fddd82fd0ce8127bd2f8 added nowait platform
data support. The printout code was however not updated, so the value
of SMC_NOWAIT is still used. This patch makes sure that nowait is printed
accordingly to platform data.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/smc91x.c')
| -rw-r--r-- | drivers/net/smc91x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 24768c10cadb..53c2dda1dc89 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c @@ -1961,7 +1961,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr, if (dev->dma != (unsigned char)-1) printk(" DMA %d", dev->dma); - printk("%s%s\n", nowait ? " [nowait]" : "", + printk("%s%s\n", + lp->cfg.flags & SMC91X_NOWAIT ? " [nowait]" : "", THROTTLE_TX_PKTS ? " [throttle_tx]" : ""); if (!is_valid_ether_addr(dev->dev_addr)) { |