svn commit: r184282 - head/sys/net80211
Sam Leffler
sam at FreeBSD.org
Sat Oct 25 17:43:12 PDT 2008
Author: sam
Date: Sun Oct 26 00:43:11 2008
New Revision: 184282
URL: http://svn.freebsd.org/changeset/base/184282
Log:
o change ieee80211_mgmt_output to take a raw xmit parameters block so
the net80211 layer has complete control over the handling of mgt frames
(in particular, the ac, tx rate, and retry count); this also allows us
to purge the M_LINK0 flag that was attached to mbufs to mark them as
needing encryption for shared key auth
o change ieee80211_send_setup to take a tid parameter so it can be used
to setup QoS frames
Modified:
head/sys/net80211/ieee80211_freebsd.h
head/sys/net80211/ieee80211_ht.c
head/sys/net80211/ieee80211_output.c
head/sys/net80211/ieee80211_proto.h
Modified: head/sys/net80211/ieee80211_freebsd.h
==============================================================================
--- head/sys/net80211/ieee80211_freebsd.h Sun Oct 26 00:32:02 2008 (r184281)
+++ head/sys/net80211/ieee80211_freebsd.h Sun Oct 26 00:43:11 2008 (r184282)
@@ -239,7 +239,6 @@ void ieee80211_vap_destroy(struct ieee80
struct mbuf *ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen);
/* tx path usage */
-#define M_LINK0 M_PROTO1 /* WEP requested */
#define M_WDS M_PROTO2 /* WDS frame */
#define M_EAPOL M_PROTO3 /* PAE/EAPOL frame */
#define M_PWR_SAV M_PROTO4 /* bypass PS handling */
@@ -248,7 +247,7 @@ struct mbuf *ieee80211_getmgtframe(uint8
#define M_TXCB M_PROTO7 /* do tx complete callback */
#define M_AMPDU_MPDU M_PROTO8 /* ok for A-MPDU aggregation */
#define M_80211_TX \
- (M_LINK0|M_WDS|M_EAPOL|M_PWR_SAV|M_MORE_DATA|M_FF|M_TXCB|M_AMPDU_MPDU)
+ (M_WDS|M_EAPOL|M_PWR_SAV|M_MORE_DATA|M_FF|M_TXCB|M_AMPDU_MPDU)
/* rx path usage */
#define M_AMPDU M_PROTO1 /* A-MPDU subframe */
Modified: head/sys/net80211/ieee80211_ht.c
==============================================================================
--- head/sys/net80211/ieee80211_ht.c Sun Oct 26 00:32:02 2008 (r184281)
+++ head/sys/net80211/ieee80211_ht.c Sun Oct 26 00:43:11 2008 (r184282)
@@ -2104,6 +2104,7 @@ ieee80211_send_action(struct ieee80211_n
} while (0)
struct ieee80211vap *vap = ni->ni_vap;
struct ieee80211com *ic = ni->ni_ic;
+ struct ieee80211_bpf_params params;
struct mbuf *m;
uint8_t *frm;
uint16_t baparamset;
@@ -2207,7 +2208,14 @@ ieee80211_send_action(struct ieee80211_n
}
m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
- return ieee80211_mgmt_output(ni, m, IEEE80211_FC0_SUBTYPE_ACTION);
+ memset(¶ms, 0, sizeof(params));
+ params.ibp_pri = WME_AC_VO;
+ params.ibp_rate0 = ni->ni_txparms->mgmtrate;
+ /* NB: we know all frames are unicast */
+ params.ibp_try0 = ni->ni_txparms->maxretry;
+ params.ibp_power = ni->ni_txpower;
+ return ieee80211_mgmt_output(ni, m, IEEE80211_FC0_SUBTYPE_ACTION,
+ ¶ms);
bad:
ieee80211_free_node(ni);
if (m != NULL)
Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c Sun Oct 26 00:32:02 2008 (r184281)
+++ head/sys/net80211/ieee80211_output.c Sun Oct 26 00:43:11 2008 (r184282)
@@ -409,7 +409,7 @@ static void
ieee80211_send_setup(
struct ieee80211_node *ni,
struct ieee80211_frame *wh,
- int type,
+ int type, int tid,
const uint8_t sa[IEEE80211_ADDR_LEN],
const uint8_t da[IEEE80211_ADDR_LEN],
const uint8_t bssid[IEEE80211_ADDR_LEN])
@@ -457,11 +457,9 @@ ieee80211_send_setup(
IEEE80211_ADDR_COPY(wh->i_addr3, bssid);
}
*(uint16_t *)&wh->i_dur[0] = 0;
- /* XXX probe response use per-vap seq#? */
- /* NB: use non-QoS tid */
*(uint16_t *)&wh->i_seq[0] =
- htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT);
- ni->ni_txseqs[IEEE80211_NONQOS_TID]++;
+ htole16(ni->ni_txseqs[tid] << IEEE80211_SEQ_SEQ_SHIFT);
+ ni->ni_txseqs[tid]++;
#undef WH4
}
@@ -474,7 +472,8 @@ ieee80211_send_setup(
* otherwise deal with reclaiming any reference (on error).
*/
int
-ieee80211_mgmt_output(struct ieee80211_node *ni, struct mbuf *m, int type)
+ieee80211_mgmt_output(struct ieee80211_node *ni, struct mbuf *m, int type,
+ struct ieee80211_bpf_params *params)
{
struct ieee80211vap *vap = ni->ni_vap;
struct ieee80211com *ic = ni->ni_ic;
@@ -501,20 +500,18 @@ ieee80211_mgmt_output(struct ieee80211_n
}
wh = mtod(m, struct ieee80211_frame *);
- ieee80211_send_setup(ni, wh,
- IEEE80211_FC0_TYPE_MGT | type,
- vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid);
- if ((m->m_flags & M_LINK0) != 0 && ni->ni_challenge != NULL) {
- m->m_flags &= ~M_LINK0;
+ ieee80211_send_setup(ni, wh,
+ IEEE80211_FC0_TYPE_MGT | type, IEEE80211_NONQOS_TID,
+ vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid);
+ if (params->ibp_flags & IEEE80211_BPF_CRYPTO) {
IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr1,
"encrypting frame (%s)", __func__);
wh->i_fc[1] |= IEEE80211_FC1_WEP;
}
- if (type != IEEE80211_FC0_SUBTYPE_PROBE_RESP) {
- /* NB: force non-ProbeResp frames to the highest queue */
- M_WME_SETAC(m, WME_AC_VO);
- } else
- M_WME_SETAC(m, WME_AC_BE);
+
+ KASSERT(type != IEEE80211_FC0_SUBTYPE_PROBE_RESP, ("probe response?"));
+ M_WME_SETAC(m, params->ibp_pri);
+
#ifdef IEEE80211_DEBUG
/* avoid printing too many frames */
if ((ieee80211_msg_debug(vap) && doprint(vap, type)) ||
@@ -529,7 +526,7 @@ ieee80211_mgmt_output(struct ieee80211_n
#endif
IEEE80211_NODE_STAT(ni, tx_mgmt);
- return ic->ic_raw_xmit(ni, m, NULL);
+ return ic->ic_raw_xmit(ni, m, params);
}
/*
@@ -569,8 +566,9 @@ ieee80211_send_nulldata(struct ieee80211
wh = mtod(m, struct ieee80211_frame *);
ieee80211_send_setup(ni, wh,
- IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_NODATA,
- vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid);
+ IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_NODATA,
+ IEEE80211_NONQOS_TID,
+ vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid);
if (vap->iv_opmode != IEEE80211_M_WDS) {
/* NB: power management bit is never sent by an AP */
if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT) &&
@@ -1726,8 +1724,8 @@ ieee80211_send_probereq(struct ieee80211
wh = mtod(m, struct ieee80211_frame *);
ieee80211_send_setup(ni, wh,
- IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ,
- sa, da, bssid);
+ IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ,
+ IEEE80211_NONQOS_TID, sa, da, bssid);
/* XXX power management? */
M_WME_SETAC(m, WME_AC_BE);
@@ -1785,6 +1783,7 @@ ieee80211_send_mgmt(struct ieee80211_nod
struct ieee80211vap *vap = ni->ni_vap;
struct ieee80211com *ic = ni->ni_ic;
struct ieee80211_node *bss = vap->iv_bss;
+ struct ieee80211_bpf_params params;
struct mbuf *m;
uint8_t *frm;
uint16_t capinfo;
@@ -1804,6 +1803,7 @@ ieee80211_send_mgmt(struct ieee80211_nod
ieee80211_node_refcnt(ni)+1);
ieee80211_ref_node(ni);
+ memset(¶ms, 0, sizeof(params));
switch (type) {
case IEEE80211_FC0_SUBTYPE_AUTH:
@@ -1826,7 +1826,7 @@ ieee80211_send_mgmt(struct ieee80211_nod
bss->ni_authmode == IEEE80211_AUTH_SHARED);
m = ieee80211_getmgtframe(&frm,
- ic->ic_headroom + sizeof(struct ieee80211_frame),
+ ic->ic_headroom + sizeof(struct ieee80211_frame),
3 * sizeof(uint16_t)
+ (has_challenge && status == IEEE80211_STATUS_SUCCESS ?
sizeof(uint16_t)+IEEE80211_CHALLENGE_LEN : 0)
@@ -1851,7 +1851,8 @@ ieee80211_send_mgmt(struct ieee80211_nod
if (arg == IEEE80211_AUTH_SHARED_RESPONSE) {
IEEE80211_NOTE(vap, IEEE80211_MSG_AUTH, ni,
"request encrypt frame (%s)", __func__);
- m->m_flags |= M_LINK0; /* WEP-encrypt, please */
+ /* mark frame for encryption */
+ params.ibp_flags |= IEEE80211_BPF_CRYPTO;
}
} else
m->m_pkthdr.len = m->m_len = 3 * sizeof(uint16_t);
@@ -2092,7 +2093,13 @@ ieee80211_send_mgmt(struct ieee80211_nod
/* NOTREACHED */
}
- return ieee80211_mgmt_output(ni, m, type);
+ /* NB: force non-ProbeResp frames to the highest queue */
+ params.ibp_pri = WME_AC_VO;
+ params.ibp_rate0 = bss->ni_txparms->mgmtrate;
+ /* NB: we know all frames are unicast */
+ params.ibp_try0 = bss->ni_txparms->maxretry;
+ params.ibp_power = bss->ni_txpower;
+ return ieee80211_mgmt_output(ni, m, type, ¶ms);
bad:
ieee80211_free_node(ni);
return ret;
@@ -2296,8 +2303,8 @@ ieee80211_send_proberesp(struct ieee8021
wh = mtod(m, struct ieee80211_frame *);
ieee80211_send_setup(bss, wh,
- IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP,
- vap->iv_myaddr, da, bss->ni_bssid);
+ IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP,
+ IEEE80211_NONQOS_TID, vap->iv_myaddr, da, bss->ni_bssid);
/* XXX power management? */
M_WME_SETAC(m, WME_AC_BE);
Modified: head/sys/net80211/ieee80211_proto.h
==============================================================================
--- head/sys/net80211/ieee80211_proto.h Sun Oct 26 00:32:02 2008 (r184281)
+++ head/sys/net80211/ieee80211_proto.h Sun Oct 26 00:43:11 2008 (r184282)
@@ -64,7 +64,8 @@ void ieee80211_syncflag_ext(struct ieee8
((ni)->ni_vap->iv_input(ni, m, rssi, noise, rstamp))
int ieee80211_input_all(struct ieee80211com *, struct mbuf *,
int, int, uint32_t);
-int ieee80211_mgmt_output(struct ieee80211_node *, struct mbuf *, int);
+int ieee80211_mgmt_output(struct ieee80211_node *, struct mbuf *, int,
+ struct ieee80211_bpf_params *);
struct ieee80211_bpf_params;
int ieee80211_raw_xmit(struct ieee80211_node *, struct mbuf *,
const struct ieee80211_bpf_params *);
More information about the svn-src-all
mailing list