Deleted Added
full compact
if_ath.c (204100) if_ath.c (206457)
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 204100 2010-02-19 18:23:45Z deischen $");
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 206457 2010-04-10 13:54:00Z bschmidt $");
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

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

3649 * frame we just received.
3650 */
3651 ath_beacon_config(sc, vap);
3652 }
3653 /* fall thru... */
3654 case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
3655 if (vap->iv_opmode == IEEE80211_M_IBSS &&
3656 vap->iv_state == IEEE80211_S_RUN) {
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

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

3649 * frame we just received.
3650 */
3651 ath_beacon_config(sc, vap);
3652 }
3653 /* fall thru... */
3654 case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
3655 if (vap->iv_opmode == IEEE80211_M_IBSS &&
3656 vap->iv_state == IEEE80211_S_RUN) {
3657 uint32_t rstamp = sc->sc_lastrs->rs_tstamp;
3658 u_int64_t tsf = ath_extend_tsf(rstamp,
3657 uint32_t rstamp;
3658 uint64_t tsf;
3659
3660 if (sc->sc_lastrs == NULL)
3661 break;
3662
3663 rstamp = sc->sc_lastrs->rs_tstamp;
3664 tsf = ath_extend_tsf(rstamp,
3659 ath_hal_gettsf64(sc->sc_ah));
3660 /*
3661 * Handle ibss merge as needed; check the tsf on the
3662 * frame before attempting the merge. The 802.11 spec
3663 * says the station should change it's bssid to match
3664 * the oldest station with the same ssid, where oldest
3665 * is determined by the tsf. Note that hardware
3666 * reconfiguration happens through callback to

--- 3663 unchanged lines hidden ---
3665 ath_hal_gettsf64(sc->sc_ah));
3666 /*
3667 * Handle ibss merge as needed; check the tsf on the
3668 * frame before attempting the merge. The 802.11 spec
3669 * says the station should change it's bssid to match
3670 * the oldest station with the same ssid, where oldest
3671 * is determined by the tsf. Note that hardware
3672 * reconfiguration happens through callback to

--- 3663 unchanged lines hidden ---