From 01d1a6c35535c8e33035f87c45b2dc5358f0a4ae Mon Sep 17 00:00:00 2001 From: Pyun YongHyeon Date: Thu, 19 Nov 2009 23:14:40 +0000 Subject: [PATCH] Move interface reinitialization down after disabling WOL in resume path. --- sys/dev/re/if_re.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index ed2b4494dfe..aeb9cf20d7e 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -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);