Date: Thu, 19 Nov 2009 23:14:40 +0000 (UTC) From: Pyun YongHyeon <yongari@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r199565 - head/sys/dev/re Message-ID: <200911192314.nAJNEek2023082@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yongari Date: Thu Nov 19 23:14:40 2009 New Revision: 199565 URL: http://svn.freebsd.org/changeset/base/199565 Log: Move interface reinitialization down after disabling WOL in resume path. Modified: head/sys/dev/re/if_re.c Modified: head/sys/dev/re/if_re.c ============================================================================== --- head/sys/dev/re/if_re.c Thu Nov 19 23:12:44 2009 (r199564) +++ head/sys/dev/re/if_re.c Thu Nov 19 23:14:40 2009 (r199565) @@ -3023,15 +3023,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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911192314.nAJNEek2023082>