diff options
| -rw-r--r-- | sys/conf/NOTES | 4 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 4 | ||||
| -rw-r--r-- | sys/pci/if_wx.c | 7 |
3 files changed, 14 insertions, 1 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 9faf3b0c..8471c12 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1770,6 +1770,10 @@ device miibus # the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA # bridge with a PCMCIA adapter plugged into it. # wx: Intel Gigabit Ethernet PCI card (`Wiseman') +# +# NOTE: THIS DRIVER IS SOON TO BE REMOVED FROM FREEBSD AND SHOULD BE +# CONSIDERED DEPRECATED +# # xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller, # Accton Fast EtherCard-16, Compaq Netelligent 10/100 PC Card, # Toshiba 10/100 Ethernet PC Card, Xircom 16-bit Ethernet + Modem 56 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 9faf3b0c..8471c12 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1770,6 +1770,10 @@ device miibus # the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA # bridge with a PCMCIA adapter plugged into it. # wx: Intel Gigabit Ethernet PCI card (`Wiseman') +# +# NOTE: THIS DRIVER IS SOON TO BE REMOVED FROM FREEBSD AND SHOULD BE +# CONSIDERED DEPRECATED +# # xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller, # Accton Fast EtherCard-16, Compaq Netelligent 10/100 PC Card, # Toshiba 10/100 Ethernet PC Card, Xircom 16-bit Ethernet + Modem 56 diff --git a/sys/pci/if_wx.c b/sys/pci/if_wx.c index ac83498..7a8b24a 100644 --- a/sys/pci/if_wx.c +++ b/sys/pci/if_wx.c @@ -1,5 +1,8 @@ /* $FreeBSD$ */ /* + * NOTE: THIS DRIVER IS SOON TO BE DEPRECATED AND REMOVED FROM FREEBSD + */ +/* * Principal Author: Matthew Jacob <mjacob@feral.com> * Copyright (c) 1999, 2001 by Traakan Software * All rights reserved. @@ -1819,7 +1822,9 @@ wx_ioctl(struct ifnet *ifp, IOCTL_CMD_TYPE command, caddr_t data) * such as IFF_PROMISC are handled. */ if (ifp->if_flags & IFF_UP) { - error = wx_init(sc); + if ((ifp->if_flags & IFF_RUNNING) == 0) { + error = wx_init(sc); + } } else { if (ifp->if_flags & IFF_RUNNING) { wx_stop(sc); |
