summaryrefslogtreecommitdiffstats
path: root/sys/pci
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1997-06-22 09:36:50 +0000
committerpeter <peter@FreeBSD.org>1997-06-22 09:36:50 +0000
commitbfb7bb3f17b5d5bd6e7cd672d06dab6c80ca47cf (patch)
tree860035f3e3620e933f5a45340b7b98cc73a6cade /sys/pci
parent3a07ded1585e2be8cc5be6af69327d2aafdc0342 (diff)
downloadFreeBSD-src-bfb7bb3f17b5d5bd6e7cd672d06dab6c80ca47cf.zip
FreeBSD-src-bfb7bb3f17b5d5bd6e7cd672d06dab6c80ca47cf.tar.gz
Clean import of if_de.c as of 970513, if_de.c rev 1.86. This should
have optional if_media support. Obtained from: Matt Thomas via http://www.3am-software.com/
Diffstat (limited to 'sys/pci')
-rw-r--r--sys/pci/if_de.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index a2c0916..87479da 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_de.c,v 1.85 1997/05/08 16:48:22 thomas Exp $
+ * $Id: if_de.c,v 1.86 1997/05/13 15:03:11 thomas Exp $
*
*/
@@ -3833,8 +3833,10 @@ tulip_ifioctl(
for (media = TULIP_MEDIA_UNKNOWN; media < TULIP_MEDIA_MAX; media++) {
if (sc->tulip_mediums[media] != NULL && --flags == 0) {
sc->tulip_flags |= TULIP_NOAUTOSENSE;
- if (sc->tulip_media != media)
+ if (sc->tulip_media != media || (sc->tulip_flags & TULIP_DIDNWAY)) {
+ sc->tulip_flags &= ~TULIP_DIDNWAY;
tulip_linkup(sc, media);
+ }
break;
}
}
OpenPOWER on IntegriCloud