branch | stable-1.5 |
changeset 2421 | bc2d4bf9cbe5 |
parent 2232 | 6c5ca9444533 |
child 2582 | 87e502828b3f |
--- a/devices/e100-2.6.37-ethercat.c Thu Sep 06 19:52:17 2012 +0200 +++ b/devices/e100-2.6.37-ethercat.c Thu Sep 06 20:22:24 2012 +0200 @@ -1204,7 +1204,7 @@ config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */