Deleted Added
full compact
ieee80211_scan_sta.c (189980) ieee80211_scan_sta.c (191746)
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

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

19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#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

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

19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_scan_sta.c 189980 2009-03-18 19:28:17Z sam $");
27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_scan_sta.c 191746 2009-05-02 15:14:18Z thompsa $");
28
29/*
30 * IEEE 802.11 station scanning support.
31 */
32#include "opt_wlan.h"
33
34#include <sys/param.h>
28
29/*
30 * IEEE 802.11 station scanning support.
31 */
32#include "opt_wlan.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
35#include
36#include <sys/kernel.h>
37#include <sys/module.h>
36#include <sys/kernel.h>
37#include <sys/module.h>
38
38
39#include <sys/socket.h>
40
41#include <net/if.h>
42#include <net/if_media.h>
43#include <net/ethernet.h>
44
45#include <net80211/ieee80211_var.h>
46#include <net80211/ieee80211_input.h>

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

1635static void
1636ap_force_promisc(struct ieee80211com *ic)
1637{
1638 struct ifnet *ifp = ic->ic_ifp;
1639
1640 IEEE80211_LOCK(ic);
1641 /* set interface into promiscuous mode */
1642 ifp->if_flags |= IFF_PROMISC;
39#include <sys/socket.h>
40
41#include <net/if.h>
42#include <net/if_media.h>
43#include <net/ethernet.h>
44
45#include <net80211/ieee80211_var.h>
46#include <net80211/ieee80211_input.h>

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

1635static void
1636ap_force_promisc(struct ieee80211com *ic)
1637{
1638 struct ifnet *ifp = ic->ic_ifp;
1639
1640 IEEE80211_LOCK(ic);
1641 /* set interface into promiscuous mode */
1642 ifp->if_flags |= IFF_PROMISC;
1643 ic->ic_update_promisc(ifp);
1643 ieee80211_runtask(ic, &ic->ic_promisc_task);
1644 IEEE80211_UNLOCK(ic);
1645}
1646
1647static void
1648ap_reset_promisc(struct ieee80211com *ic)
1649{
1650 IEEE80211_LOCK(ic);
1651 ieee80211_syncifflag_locked(ic, IFF_PROMISC);

--- 142 unchanged lines hidden ---
1644 IEEE80211_UNLOCK(ic);
1645}
1646
1647static void
1648ap_reset_promisc(struct ieee80211com *ic)
1649{
1650 IEEE80211_LOCK(ic);
1651 ieee80211_syncifflag_locked(ic, IFF_PROMISC);

--- 142 unchanged lines hidden ---