mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-21 22:11:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Aid debugging by helpfully not dereferencing NULL pointers and oopsing when debugging messages are turned on.

Browse Source 
git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3679 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mentor 2008-05-24 12:15:44 +00:00
parent 2cb3887369
commit 7045e12375
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ath/if_ath.c
View File

@ -1779,6 +1779,12 @@ ath_ds_link_swap(u_int32_t dp) {
#endif
}
static __inline u_int32_t
ath_get_last_ds_link(struct ath_txq *txq) {
struct ath_desc *ds = ath_txq_last_desc(txq);
return (ds ? ds->ds_link : 0);
}
static void
ath_intr_process_rx_descriptors(struct ath_softc *sc, int* pneedmark, u_int64_t hw_tsf)
{
@ -2949,7 +2955,7 @@ ath_tx_txqaddbuf(struct ath_softc *sc, struct ieee80211_node *ni,
DPRINTF(sc, ATH_DEBUG_XMIT,
"link[%u] (%08x)=%08llx (%p)\n",
txq->axq_qnum,
ATH_TXQ_LAST_DESC(txq)->ds_link,
ath_get_last_ds_link(txq),
(u_int64_t)bf->bf_daddr, bf->bf_desc);
ath_hal_txstart(ah, txq->axq_qnum);
@ -8156,7 +8162,7 @@ ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
DPRINTF(sc, ATH_DEBUG_TX_PROC, "TX queue: %d (0x%x), link: %08x\n",
txq->axq_qnum, ath_hal_gettxbuf(sc->sc_ah, txq->axq_qnum),
ATH_TXQ_LAST_DESC(txq)->ds_link);
ath_get_last_ds_link(txq));
if (txq == sc->sc_uapsdq) {
DPRINTF(sc, ATH_DEBUG_UAPSD, "Reaping U-APSD txq\n");
@ -8534,7 +8540,7 @@ ath_tx_stopdma(struct ath_softc *sc, struct ath_txq *txq)
DPRINTF(sc, ATH_DEBUG_RESET, "TX queue [%u] 0x%x, link %08x\n",
txq->axq_qnum,
ath_hal_gettxbuf(ah, txq->axq_qnum),
ATH_TXQ_LAST_DESC(txq)->ds_link);
ath_get_last_ds_link(txq));
}
/*

7
ath/if_athvar.h
View File

@ -587,8 +587,11 @@ struct ath_vap {
#define ATH_TXQ_LAST(_txq) \
STAILQ_LAST(&(_txq)->axq_q, ath_buf, bf_list)
#define ATH_TXQ_LAST_DESC(_txq) \
ATH_BUF_LAST_DESC(ATH_TXQ_LAST((_txq)))
static __inline struct ath_desc *ath_txq_last_desc(struct ath_txq *txq)
{
struct ath_buf *tbf = ATH_TXQ_LAST(txq);
return tbf ? ATH_BUF_LAST_DESC(tbf) : NULL;
}
#define ATH_TXQ_INSERT_TAIL(_tq, _elm, _field) do { \
STAILQ_INSERT_TAIL(&(_tq)->axq_q, (_elm), _field); \
(_tq)->axq_depth++; \