svn commit: r200075 - stable/7/sys/dev/re

[Pyun YongHyeon]

Author: yongari
Date: Thu Dec  3 18:50:04 2009
New Revision: 200075
URL: http://svn.freebsd.org/changeset/base/200075

Log:
  MFC r199565:
    Move interface reinitialization down after disabling WOL in resume
    path.

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

Modified: stable/7/sys/dev/re/if_re.c
==============================================================================
--- stable/7/sys/dev/re/if_re.c	Thu Dec  3 18:48:32 2009	(r200074)
+++ stable/7/sys/dev/re/if_re.c	Thu Dec  3 18:50:04 2009	(r200075)
@@ -3017,15 +3017,16 @@ re_resume(device_t dev)
 			    CSR_READ_1(sc, RL_GPIO) | 0x01);
 	}
 
-	/* reinitialize interface if necessary */
-	if (ifp->if_flags & IFF_UP)
-		re_init_locked(sc);
-
 	/*
 	 * Clear WOL matching such that normal Rx filtering
 	 * wouldn't interfere with WOL patterns.
 	 */
 	re_clrwol(sc);
+
+	/* reinitialize interface if necessary */
+	if (ifp->if_flags & IFF_UP)
+		re_init_locked(sc);
+
 	sc->suspended = 0;
 	RL_UNLOCK(sc);