tree 91153680d9ad5ed9aa3d29207fbbeecc82bbb738
parent 45542479fb261342d5244869cf3ca4636b7ffd43
author Jeff Garzik <jgarzik@redhat.com> 1192688803 -0700
committer David S. Miller <davem@davemloft.net> 1192688803 -0700

[NET]: fix carrier-on bug?

While looking at a net driver with the following construct,

	if (!netif_carrier_ok(dev))
		netif_carrier_on(dev);

it stuck me that the netif_carrier_ok() check was redundant, since
netif_carrier_on() checks bit __LINK_STATE_NOCARRIER anyway.  This is
the same reason why netif_queue_stopped() need not be called prior to
netif_wake_queue().

This is true, but there is however an unwanted side effect from assuming
that netif_carrier_on() can be called multiple times:  it touches the
watchdog, regardless of pre-existing carrier state.

The fix:  move watchdog-up inside the bit-cleared code path.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>