[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Tue Mar 13 10:57:51 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/f799a5e7eb16
changeset: 430:f799a5e7eb16
user:      ray at terran.dlink.ua
date:      Tue Mar 13 12:58:39 2012 +0200
description:
Rename sysctl to ral.

diffstat:

 head/sys/dev/ral/rt2860.c |  51 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 46 insertions(+), 5 deletions(-)

diffs (90 lines):

diff -r 8e3435571ec3 -r f799a5e7eb16 head/sys/dev/ral/rt2860.c

--- a/head/sys/dev/ral/rt2860.c	Tue Mar 13 12:06:53 2012 +0200
+++ b/head/sys/dev/ral/rt2860.c	Tue Mar 13 12:58:39 2012 +0200
@@ -618,15 +618,15 @@
 SYSCTL_NODE(_hw, OID_AUTO, rt2860, CTLFLAG_RD, 0, "RT2860 driver parameters");
 
 static int rt2860_tx_stbc = 1;
-SYSCTL_INT(_hw_rt2860, OID_AUTO, tx_stbc, CTLFLAG_RW, &rt2860_tx_stbc, 0,
+SYSCTL_INT(_hw_ral, OID_AUTO, tx_stbc, CTLFLAG_RW, &rt2860_tx_stbc, 0,
 	   "RT2860 Tx STBC");
-TUNABLE_INT("hw.rt2860.tx_stbc", &rt2860_tx_stbc);
+TUNABLE_INT("hw.ral.tx_stbc", &rt2860_tx_stbc);
 
 #ifdef RT2860_DEBUG
 static int rt2860_debug = 0;
-SYSCTL_INT(_hw_rt2860, OID_AUTO, debug, CTLFLAG_RW, &rt2860_debug, 0,
+SYSCTL_INT(_hw_ral, OID_AUTO, debug, CTLFLAG_RW, &rt2860_debug, 0,
 	   "RT2860 debug level");
-TUNABLE_INT("hw.rt2860.debug", &rt2860_debug);
+TUNABLE_INT("hw.ral.debug", &rt2860_debug);
 #endif
 
 /*
@@ -2873,9 +2873,11 @@
 static int rt2860_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	const struct ieee80211_bpf_params *params)
 {
+	struct ieee80211_frame *wh;
 	struct rt2860_softc *sc;
 	struct ieee80211com *ic;
 	struct ifnet *ifp;
+	int ismcast;
 
 	ic = ni->ni_ic;
 	ifp = ic->ic_ifp;
@@ -2889,7 +2891,6 @@
 	}
 
 	RT2860_SOFTC_TX_RING_LOCK(&sc->tx_ring[sc->tx_ring_mgtqid]);
-
 	if (sc->tx_ring[sc->tx_ring_mgtqid].data_queued >= RT2860_SOFTC_TX_RING_DATA_COUNT) {
 		RT2860_SOFTC_TX_RING_UNLOCK(&sc->tx_ring[sc->tx_ring_mgtqid]);
 
@@ -2907,6 +2908,46 @@
 		return ENOBUFS;
 	}
 
+#ifdef notyet
+	if (params != NULL) {
+		if (params->ibp_flags & IEEE80211_BPF_CRYPTO) {
+			/* TODO */
+		}
+		if (params->ibp_flags & IEEE80211_BPF_RTS) {
+			/* TODO */
+		} else if (params->ibp_flags & IEEE80211_BPF_CTS) {
+			/* TODO */
+		}
+		wh = mtod(m, struct ieee80211_frame *);
+		ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1);
+		if ((params->ibp_flags & IEEE80211_BPF_NOACK) || ismcast) {
+			/* TODO */
+		}
+		/* Apply rate index params->ibp_rate0 */
+		if (params->ibp_flags & IEEE80211_BPF_SHORTPRE) {
+			/* TODO handle Short Preamble */
+		}
+		/*
+		 * try0 = params->ibp_try0;
+		 * ismrr = (params->ibp_try1 != 0);
+		 * txantenna = params->ibp_pri >> 2;
+		 * params->ibp_ctsrate;
+		 * pri = params->ibp_pri & 3;
+		 * txpower = params->ibp_power;
+		 * if (ismrr) {
+		 * params->ibp_rate1
+		 * params->ibp_try1
+		 * params->ibp_rate2
+		 * params->ibp_try2
+		 * params->ibp_rate3
+		 * params->ibp_try3
+		 * }
+		 * Everything stolen from ath(9) driver
+		 */
+
+	}
+#endif
+
 	if (rt2860_tx_mgmt(sc, m, ni, sc->tx_ring_mgtqid) != 0) {
 		RT2860_SOFTC_TX_RING_UNLOCK(&sc->tx_ring[sc->tx_ring_mgtqid]);
 
