Deleted Added
full compact
if_wi_pci.c (286410) if_wi_pci.c (286437)
1/*-
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
1/*-
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/dev/wi/if_wi_pci.c 286410 2015-08-07 11:43:14Z glebius $
32 * $FreeBSD: head/sys/dev/wi/if_wi_pci.c 286437 2015-08-08 01:10:17Z adrian $
33 */
34
35/*
36 * Lucent WaveLAN/IEEE 802.11 PCMCIA driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

--- 192 unchanged lines hidden (view full) ---

233 return (error);
234}
235
236static int
237wi_pci_suspend(device_t dev)
238{
239 struct wi_softc *sc = device_get_softc(dev);
240
33 */
34
35/*
36 * Lucent WaveLAN/IEEE 802.11 PCMCIA driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

--- 192 unchanged lines hidden (view full) ---

233 return (error);
234}
235
236static int
237wi_pci_suspend(device_t dev)
238{
239 struct wi_softc *sc = device_get_softc(dev);
240
241 WI_LOCK(sc);
242 wi_stop(sc, 1);
241 wi_stop(sc, 1);
243 WI_UNLOCK(sc);
244
245 return (0);
246}
247
248static int
249wi_pci_resume(device_t dev)
250{
251 struct wi_softc *sc = device_get_softc(dev);
242
243 return (0);
244}
245
246static int
247wi_pci_resume(device_t dev)
248{
249 struct wi_softc *sc = device_get_softc(dev);
252 struct ieee80211com *ic = &sc->sc_ic;
250 struct ifnet *ifp = sc->sc_ifp;
253
251
254 WI_LOCK(sc);
255 if (sc->wi_bus_type != WI_BUS_PCI_NATIVE) {
252 if (sc->wi_bus_type != WI_BUS_PCI_NATIVE)
256 return (0);
253 return (0);
257 WI_UNLOCK(sc);
254
255 if (ifp->if_flags & IFF_UP) {
256 ifp->if_init(ifp->if_softc);
257 if (ifp->if_drv_flags & IFF_DRV_RUNNING)
258 ifp->if_start(ifp);
258 }
259 }
259 if (ic->ic_nrunning > 0)
260 wi_init(sc);
261 WI_UNLOCK(sc);
260
262 return (0);
263}
261 return (0);
262}