Deleted Added
full compact
ieee80211_node.c (148306) ieee80211_node.c (148307)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2005 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-2005 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 148306 2005-07-22 17:54:40Z sam $");
34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 148307 2005-07-22 17:57:16Z 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>

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

1043 struct ieee80211com *ic = nt->nt_ic;
1044 struct ieee80211_node *ni;
1045
1046 ni = ieee80211_dup_bss(nt, macaddr);
1047 if (ni != NULL) {
1048 /* XXX no rate negotiation; just dup */
1049 ni->ni_rates = ic->ic_bss->ni_rates;
1050 if (ic->ic_newassoc != NULL)
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>

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

1043 struct ieee80211com *ic = nt->nt_ic;
1044 struct ieee80211_node *ni;
1045
1046 ni = ieee80211_dup_bss(nt, macaddr);
1047 if (ni != NULL) {
1048 /* XXX no rate negotiation; just dup */
1049 ni->ni_rates = ic->ic_bss->ni_rates;
1050 if (ic->ic_newassoc != NULL)
1051 ic->ic_newassoc(ic, ni, 1);
1051 ic->ic_newassoc(ni, 1);
1052 /* XXX not right for 802.1x/WPA */
1053 ieee80211_node_authorize(ni);
1054 }
1055 return ni;
1056}
1057
1058/*
1059 * Locate the node for sender, track state, and then pass the

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

1673 ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long",
1674 ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long",
1675 ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "",
1676 ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : ""
1677 );
1678
1679 /* give driver a chance to setup state like ni_txrate */
1680 if (ic->ic_newassoc != NULL)
1052 /* XXX not right for 802.1x/WPA */
1053 ieee80211_node_authorize(ni);
1054 }
1055 return ni;
1056}
1057
1058/*
1059 * Locate the node for sender, track state, and then pass the

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

1673 ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long",
1674 ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long",
1675 ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "",
1676 ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : ""
1677 );
1678
1679 /* give driver a chance to setup state like ni_txrate */
1680 if (ic->ic_newassoc != NULL)
1681 ic->ic_newassoc(ic, ni, newassoc);
1681 ic->ic_newassoc(ni, newassoc);
1682 ni->ni_inact_reload = ic->ic_inact_auth;
1683 ni->ni_inact = ni->ni_inact_reload;
1684 IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_SUCCESS);
1685 /* tell the authenticator about new station */
1686 if (ic->ic_auth->ia_node_join != NULL)
1687 ic->ic_auth->ia_node_join(ic, ni);
1688 ieee80211_notify_node_join(ic, ni, newassoc);
1689}

--- 249 unchanged lines hidden ---
1682 ni->ni_inact_reload = ic->ic_inact_auth;
1683 ni->ni_inact = ni->ni_inact_reload;
1684 IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_SUCCESS);
1685 /* tell the authenticator about new station */
1686 if (ic->ic_auth->ia_node_join != NULL)
1687 ic->ic_auth->ia_node_join(ic, ni);
1688 ieee80211_notify_node_join(ic, ni, newassoc);
1689}

--- 249 unchanged lines hidden ---