From owner-svn-src-user@FreeBSD.ORG Wed Aug 17 07:53:06 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 1F670106566C;
Wed, 17 Aug 2011 07:53:06 +0000 (UTC)
(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 056318FC12;
Wed, 17 Aug 2011 07:53:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7H7r52h093150;
Wed, 17 Aug 2011 07:53:05 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7H7r5dc093147;
Wed, 17 Aug 2011 07:53:05 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201108170753.p7H7r5dc093147@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 17 Aug 2011 07:53:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r224928 - user/adrian/if_ath_tx/sys/dev/ath
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Aug 2011 07:53:06 -0000
Author: adrian
Date: Wed Aug 17 07:53:05 2011
New Revision: 224928
URL: http://svn.freebsd.org/changeset/base/224928
Log:
In preparation for the aggregate list creation code, move some
needed code/defines into public view.
Modified:
user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c
user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h
Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Wed Aug 17 07:52:14 2011 (r224927)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Wed Aug 17 07:53:05 2011 (r224928)
@@ -101,31 +101,10 @@ __FBSDID("$FreeBSD$");
#include <dev/ath/if_ath_tx_ht.h>
/*
- * some general macros
- */
-#define INCR(_l, _sz) (_l) ++; (_l) &= ((_sz) - 1)
-/*
- * return block-ack bitmap index given sequence and starting sequence
- */
-#define ATH_BA_INDEX(_st, _seq) (((_seq) - (_st)) & (IEEE80211_SEQ_RANGE - 1))
-
-/* extracting the seqno from buffer seqno */
-#define SEQNO(_a) ((_a) >> IEEE80211_SEQ_SEQ_SHIFT)
-
-/*
- * Whether the current sequence number is within the
- * BAW.
- */
-#define BAW_WITHIN(_start, _bawsz, _seqno) \
- ((((_seqno) - (_start)) & 4095) < (_bawsz))
-
-/*
* How many retries to perform in software
*/
#define SWMAX_RETRIES 10
-static struct ieee80211_tx_ampdu * ath_tx_get_tx_tid(struct ath_node *an,
- int tid);
static int ath_tx_ampdu_pending(struct ath_softc *sc, struct ath_node *an,
int tid);
static int ath_tx_ampdu_running(struct ath_softc *sc, struct ath_node *an,
@@ -1600,7 +1579,7 @@ ath_tx_action_frame_override_queue(struc
* + fits inside the BAW;
* + already has had a sequence number allocated.
*/
-static void
+void
ath_tx_addto_baw(struct ath_softc *sc, struct ath_node *an,
struct ath_tid *tid, struct ath_buf *bf)
{
@@ -2255,7 +2234,7 @@ ath_tx_aggr_retry_unaggr(struct ath_soft
* Fail is set to 1 if the entry is being freed via a call to
* ath_tx_draintxq().
*/
-static void
+void
ath_tx_aggr_comp(struct ath_softc *sc, struct ath_buf *bf, int fail)
{
struct ieee80211_node *ni = bf->bf_node;
@@ -2502,7 +2481,7 @@ ath_txq_sched(struct ath_softc *sc, stru
/*
* Return net80211 TID struct pointer, or NULL for none
*/
-static struct ieee80211_tx_ampdu *
+struct ieee80211_tx_ampdu *
ath_tx_get_tx_tid(struct ath_node *an, int tid)
{
struct ieee80211_node *ni = &an->an_node;
Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h Wed Aug 17 07:52:14 2011 (r224927)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h Wed Aug 17 07:53:05 2011 (r224928)
@@ -31,6 +31,25 @@
#ifndef __IF_ATH_TX_H__
#define __IF_ATH_TX_H__
+/*
+ * some general macros
+ */
+#define INCR(_l, _sz) (_l) ++; (_l) &= ((_sz) - 1)
+/*
+ * return block-ack bitmap index given sequence and starting sequence
+ */
+#define ATH_BA_INDEX(_st, _seq) (((_seq) - (_st)) & (IEEE80211_SEQ_RANGE - 1))
+
+/* extracting the seqno from buffer seqno */
+#define SEQNO(_a) ((_a) >> IEEE80211_SEQ_SEQ_SHIFT)
+
+/*
+ * Whether the current sequence number is within the
+ * BAW.
+ */
+#define BAW_WITHIN(_start, _bawsz, _seqno) \
+ ((((_seqno) - (_start)) & 4095) < (_bawsz))
+
extern void ath_freetx(struct mbuf *m);
extern void ath_tx_node_flush(struct ath_softc *sc, struct ath_node *an);
extern void ath_txfrag_cleanup(struct ath_softc *sc, ath_bufhead *frags,
@@ -54,6 +73,12 @@ extern void ath_tx_tid_hw_queue_norm(str
extern void ath_txq_sched(struct ath_softc *sc, struct ath_txq *txq);
extern void ath_tx_normal_comp(struct ath_softc *sc, struct ath_buf *bf,
int fail);
+extern void ath_tx_aggr_comp(struct ath_softc *sc, struct ath_buf *bf,
+ int fail);
+extern void ath_tx_addto_baw(struct ath_softc *sc, struct ath_node *an,
+ struct ath_tid *tid, struct ath_buf *bf);
+extern struct ieee80211_tx_ampdu * ath_tx_get_tx_tid(struct ath_node *an,
+ int tid);
/* TX addba handling */
extern int ath_addba_request(struct ieee80211_node *ni,