svn commit: r199943 - stable/7/sys/dev/msk

[Pyun YongHyeon]

Author: yongari
Date: Sun Nov 29 20:20:34 2009
New Revision: 199943
URL: http://svn.freebsd.org/changeset/base/199943

Log:
  MFC r199413:
    It seems generation of link state change of e1000phy(4) is not
    reliable on some Marvell PHYs. If msk(4) know it still does not
    have established link check whether msk(4) missed the link state
    change by looking into polled link state.
  
    Reported by:	Mel Flynn < mel.flynn+fbsd.current <> mailing.thruhere dot net >,
  		Gleb Kurtsou <gleb.kurtsou <> gmail dot com >
    Tested by:	Gleb Kurtsou <gleb.kurtsou <> gmail dot com >

Modified:
  stable/7/sys/dev/msk/if_msk.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/msk/if_msk.c
==============================================================================
--- stable/7/sys/dev/msk/if_msk.c	Sun Nov 29 20:19:24 2009	(r199942)
+++ stable/7/sys/dev/msk/if_msk.c	Sun Nov 29 20:20:34 2009	(r199943)
@@ -3200,6 +3200,8 @@ msk_tick(void *xsc_if)
 	mii = device_get_softc(sc_if->msk_miibus);
 
 	mii_tick(mii);
+	if ((sc_if->msk_flags & MSK_FLAG_LINK) == 0)
+		msk_miibus_statchg(sc_if->msk_if_dev);
 	msk_watchdog(sc_if);
 	callout_reset(&sc_if->msk_tick_ch, hz, msk_tick, sc_if);
 }