Deleted Added
full compact
if_ath.c (235680) if_ath.c (235957)
1/*-
2 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
3 * 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

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

23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
3 * 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

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

23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 235680 2012-05-20 04:14:29Z adrian $");
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 235957 2012-05-25 02:07:59Z adrian $");
32
33/*
34 * Driver for the Atheros Wireless LAN controller.
35 *
36 * This software is derived from work of Atsushi Onoe; his contribution
37 * is greatly appreciated.
38 */
39

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

1313 ath_stop(ifp);
1314 else
1315 ieee80211_suspend_all(ic);
1316 /*
1317 * NB: don't worry about putting the chip in low power
1318 * mode; pci will power off our socket on suspend and
1319 * CardBus detaches the device.
1320 */
32
33/*
34 * Driver for the Atheros Wireless LAN controller.
35 *
36 * This software is derived from work of Atsushi Onoe; his contribution
37 * is greatly appreciated.
38 */
39

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

1313 ath_stop(ifp);
1314 else
1315 ieee80211_suspend_all(ic);
1316 /*
1317 * NB: don't worry about putting the chip in low power
1318 * mode; pci will power off our socket on suspend and
1319 * CardBus detaches the device.
1320 */
1321
1322 /* For PCIe, this matters */
1323 ath_hal_disablepcie(sc->sc_ah);
1321}
1322
1323/*
1324 * Reset the key cache since some parts do not reset the
1325 * contents on resume. First we clear all entries, then
1326 * re-load keys that the 802.11 layer assumes are setup
1327 * in h/w.
1328 */

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

1345 struct ifnet *ifp = sc->sc_ifp;
1346 struct ieee80211com *ic = ifp->if_l2com;
1347 struct ath_hal *ah = sc->sc_ah;
1348 HAL_STATUS status;
1349
1350 DPRINTF(sc, ATH_DEBUG_ANY, "%s: if_flags %x\n",
1351 __func__, ifp->if_flags);
1352
1324}
1325
1326/*
1327 * Reset the key cache since some parts do not reset the
1328 * contents on resume. First we clear all entries, then
1329 * re-load keys that the 802.11 layer assumes are setup
1330 * in h/w.
1331 */

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

1348 struct ifnet *ifp = sc->sc_ifp;
1349 struct ieee80211com *ic = ifp->if_l2com;
1350 struct ath_hal *ah = sc->sc_ah;
1351 HAL_STATUS status;
1352
1353 DPRINTF(sc, ATH_DEBUG_ANY, "%s: if_flags %x\n",
1354 __func__, ifp->if_flags);
1355
1356 /* Re-enable PCIe, re-enable the PCIe bus */
1357 ath_hal_enablepcie(ah, 1);
1358
1353 /*
1354 * Must reset the chip before we reload the
1355 * keycache as we were powered down on suspend.
1356 */
1357 ath_hal_reset(ah, sc->sc_opmode,
1358 sc->sc_curchan != NULL ? sc->sc_curchan : ic->ic_curchan,
1359 AH_FALSE, &status);
1360 ath_reset_keycache(sc);

--- 3570 unchanged lines hidden ---
1359 /*
1360 * Must reset the chip before we reload the
1361 * keycache as we were powered down on suspend.
1362 */
1363 ath_hal_reset(ah, sc->sc_opmode,
1364 sc->sc_curchan != NULL ? sc->sc_curchan : ic->ic_curchan,
1365 AH_FALSE, &status);
1366 ath_reset_keycache(sc);

--- 3570 unchanged lines hidden ---