The patch titled natsemi: Improve diagnostics for DspCfg workaround has been added to the -mm tree. Its filename is natsemi-improve-diagnostics-for-dspcfg-workaround.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: natsemi: Improve diagnostics for DspCfg workaround From: Mark Brown <broonie@xxxxxxxxxxxxx> The natsemi driver has a workaround for broken hardware which resets itself from time to time. There is a diagnostic message for this workaround but it is not printed by default, making the driver behavior more obscure than it needs to be. Make the message be displayed by default. Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxx> Cc: Tim Hockin <thockin@xxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/natsemi.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/net/natsemi.c~natsemi-improve-diagnostics-for-dspcfg-workaround drivers/net/natsemi.c --- a/drivers/net/natsemi.c~natsemi-improve-diagnostics-for-dspcfg-workaround +++ a/drivers/net/natsemi.c @@ -1756,7 +1756,7 @@ static void netdev_timer(unsigned long d if (dspcfg != np->dspcfg) { if (!netif_queue_stopped(dev)) { spin_unlock_irq(&np->lock); - if (netif_msg_hw(np)) + if (netif_msg_drv(np)) printk(KERN_NOTICE "%s: possible phy reset: " "re-initializing\n", dev->name); disable_irq(dev->irq); _ Patches currently in -mm which might be from broonie@xxxxxxxxxxxxx are natsemi-improve-diagnostics-for-dspcfg-workaround.patch subject-natsemi-allow-users-to-disable-workaround-for.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html