Deleted Added
full compact
if_rum.c (288618) if_rum.c (288619)
1/* $FreeBSD: head/sys/dev/usb/wlan/if_rum.c 288618 2015-10-03 17:11:21Z adrian $ */
1/* $FreeBSD: head/sys/dev/usb/wlan/if_rum.c 288619 2015-10-03 17:18:35Z adrian $ */
2
3/*-
4 * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
5 * Copyright (c) 2006 Niall O'Higgins <niallo@openbsd.org>
6 * Copyright (c) 2007-2008 Hans Petter Selasky <hselasky@FreeBSD.org>
7 *
8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above

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

14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */
20
21#include <sys/cdefs.h>
2
3/*-
4 * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
5 * Copyright (c) 2006 Niall O'Higgins <niallo@openbsd.org>
6 * Copyright (c) 2007-2008 Hans Petter Selasky <hselasky@FreeBSD.org>
7 *
8 * Permission to use, copy, modify, and distribute this software for any
9 * purpose with or without fee is hereby granted, provided that the above

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

14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 */
20
21#include <sys/cdefs.h>
22__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_rum.c 288618 2015-10-03 17:11:21Z adrian $");
22__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_rum.c 288619 2015-10-03 17:18:35Z adrian $");
23
24/*-
25 * Ralink Technology RT2501USB/RT2601USB chipset driver
26 * http://www.ralinktech.com.tw/
27 */
28
29#include <sys/param.h>
30#include <sys/sockio.h>

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

780 if (ic->ic_bsschan == IEEE80211_CHAN_ANYC) {
781 ret = EINVAL;
782 goto run_fail;
783 }
784 rum_update_slot(sc);
785 rum_enable_mrr(sc);
786 rum_set_txpreamble(sc);
787 rum_set_basicrates(sc);
23
24/*-
25 * Ralink Technology RT2501USB/RT2601USB chipset driver
26 * http://www.ralinktech.com.tw/
27 */
28
29#include <sys/param.h>
30#include <sys/sockio.h>

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

780 if (ic->ic_bsschan == IEEE80211_CHAN_ANYC) {
781 ret = EINVAL;
782 goto run_fail;
783 }
784 rum_update_slot(sc);
785 rum_enable_mrr(sc);
786 rum_set_txpreamble(sc);
787 rum_set_basicrates(sc);
788 IEEE80211_ADDR_COPY(ic->ic_macaddr, ni->ni_bssid);
789 rum_set_bssid(sc, ic->ic_macaddr);
788 IEEE80211_ADDR_COPY(sc->sc_bssid, ni->ni_bssid);
789 rum_set_bssid(sc, sc->sc_bssid);
790 }
791
792 if (vap->iv_opmode == IEEE80211_M_HOSTAP ||
793 vap->iv_opmode == IEEE80211_M_IBSS) {
794 if ((ret = rum_prepare_beacon(sc, vap)) != 0)
795 goto run_fail;
796 }
797

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

2363
2364static void
2365rum_scan_end(struct ieee80211com *ic)
2366{
2367 struct rum_softc *sc = ic->ic_softc;
2368
2369 RUM_LOCK(sc);
2370 rum_enable_tsf_sync(sc);
790 }
791
792 if (vap->iv_opmode == IEEE80211_M_HOSTAP ||
793 vap->iv_opmode == IEEE80211_M_IBSS) {
794 if ((ret = rum_prepare_beacon(sc, vap)) != 0)
795 goto run_fail;
796 }
797

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

2363
2364static void
2365rum_scan_end(struct ieee80211com *ic)
2366{
2367 struct rum_softc *sc = ic->ic_softc;
2368
2369 RUM_LOCK(sc);
2370 rum_enable_tsf_sync(sc);
2371 rum_set_bssid(sc, ic->ic_macaddr);
2371 rum_set_bssid(sc, sc->sc_bssid);
2372 RUM_UNLOCK(sc);
2373
2374}
2375
2376static void
2377rum_set_channel(struct ieee80211com *ic)
2378{
2379 struct rum_softc *sc = ic->ic_softc;

--- 80 unchanged lines hidden ---
2372 RUM_UNLOCK(sc);
2373
2374}
2375
2376static void
2377rum_set_channel(struct ieee80211com *ic)
2378{
2379 struct rum_softc *sc = ic->ic_softc;

--- 80 unchanged lines hidden ---