Deleted Added
full compact
ieee80211_node.c (139520) ieee80211_node.c (139521)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 139520 2004-12-31 21:19:59Z sam $");
34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 139521 2004-12-31 21:22:12Z sam $");
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/mbuf.h>
39#include <sys/malloc.h>
40#include <sys/kernel.h>
41
42#include <sys/socket.h>

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

753 ieee80211_fix_rate(ic, selbs, IEEE80211_F_DOFRATE |
754 IEEE80211_F_DONEGO | IEEE80211_F_DODEL);
755 if (selbs->ni_rates.rs_nrates == 0) {
756 selbs->ni_fails++;
757 ic->ic_stats.is_ibss_norate++;
758 return 0;
759 }
760 /*
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/mbuf.h>
39#include <sys/malloc.h>
40#include <sys/kernel.h>
41
42#include <sys/socket.h>

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

753 ieee80211_fix_rate(ic, selbs, IEEE80211_F_DOFRATE |
754 IEEE80211_F_DONEGO | IEEE80211_F_DODEL);
755 if (selbs->ni_rates.rs_nrates == 0) {
756 selbs->ni_fails++;
757 ic->ic_stats.is_ibss_norate++;
758 return 0;
759 }
760 /*
761 * Create the neighbor table.
761 * Create the neighbor table; it will already
762 * exist if we are simply switching mastership.
762 */
763 */
763 ic->ic_sta = ieee80211_node_table_alloc(ic,
764 if (ic->ic_sta == NULL) {
765 ic->ic_sta = ieee80211_node_table_alloc(ic,
764 "neighbor", ic->ic_inact_run,
765 ieee80211_timeout_stations);
766 "neighbor", ic->ic_inact_run,
767 ieee80211_timeout_stations);
766 if (ic->ic_sta == NULL) {
767 /*
768 * Should remain in SCAN state and retry.
769 */
770 /* XXX stat+msg */
771 return 0;
768 if (ic->ic_sta == NULL) {
769 /*
770 * Should remain in SCAN state and retry.
771 */
772 /* XXX stat+msg */
773 return 0;
774 }
772 }
773 }
774
775 /*
776 * Committed to selbs, setup state.
777 */
778 obss = ic->ic_bss;
779 ic->ic_bss = selbs;

--- 1118 unchanged lines hidden ---
775 }
776 }
777
778 /*
779 * Committed to selbs, setup state.
780 */
781 obss = ic->ic_bss;
782 ic->ic_bss = selbs;

--- 1118 unchanged lines hidden ---