Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6bc372e authored by Magnus Damm's avatar Magnus Damm Committed by Jeff Garzik
Browse files

smc91x: fix nowait printout 



Commit c4f0e767 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: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 523a6094

drivers/net/smc91x.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1961,7 +1961,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr, 
		if (dev->dma != (unsigned char)-1)

		if (dev->dma != (unsigned char)-1)

			printk(" DMA %d", dev->dma);

			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]" : "");

			THROTTLE_TX_PKTS ? " [throttle_tx]" : "");





		if (!is_valid_ether_addr(dev->dev_addr)) {

		if (!is_valid_ether_addr(dev->dev_addr)) {