diff --git a/otus/freebsd/src/sys/dev/athp/ath10k/htt_rx.c b/otus/freebsd/src/sys/dev/athp/ath10k/htt_rx.c index 1b7a0436..fc1d88e9 100644 --- a/otus/freebsd/src/sys/dev/athp/ath10k/htt_rx.c +++ b/otus/freebsd/src/sys/dev/athp/ath10k/htt_rx.c @@ -1473,7 +1473,7 @@ static bool ath10k_htt_rx_amsdu_allowed(struct ath10k *ar, */ if (!rx_status->freq) { - ath10k_warn(ar, "no channel configured; ignoring frame(s)!\n"); + //ath10k_warn(ar, "no channel configured; ignoring frame(s)!\n"); return false; } diff --git a/otus/freebsd/src/sys/dev/athp/if_athp_core.c b/otus/freebsd/src/sys/dev/athp/if_athp_core.c index 0c8fda55..706bcd31 100644 --- a/otus/freebsd/src/sys/dev/athp/if_athp_core.c +++ b/otus/freebsd/src/sys/dev/athp/if_athp_core.c @@ -1710,7 +1710,7 @@ attempt_ath10k_core_probe_fw(struct ath10k *ar, int anum) { int status = ath10k_core_probe_fw(ar); if (status) { - ath10k_err(ar, "could not probe fw, clean up allocations and memory and retry. (%d)\n", status); + ath10k_err(ar, "could not probe fw, clean up allocations, memory and retry. (%d)\n", status); tsleep(ar, 1, "pausing to wait for the ath cpu to be ready.", 250); if(anum < ATH10K_FW_PROBE_RETRIES) { clean_ath10k_core_probe_fw(ar); diff --git a/otus/freebsd/src/sys/dev/athp/if_athp_fwlog.c b/otus/freebsd/src/sys/dev/athp/if_athp_fwlog.c index d819984f..8d5cf6ec 100644 --- a/otus/freebsd/src/sys/dev/athp/if_athp_fwlog.c +++ b/otus/freebsd/src/sys/dev/athp/if_athp_fwlog.c @@ -1550,18 +1550,23 @@ ath10k_fwlog_print_work(void *arg, int npending) void ath10k_handle_fwlog_msg(struct ath10k *ar, struct athp_buf *skb) { - ATHP_FWLOG_LOCK(ar); + if(ar != NULL && mtx_initialized(&ar->fwlog_mtx) != 0) { + ATHP_FWLOG_LOCK(ar); - if (ar->fwlog_tx_queue_len > ATH10K_FWLOG_MAX_EVT_QUEUE) { - ath10k_warn(ar, "reached fwlog queue limit\n"); - athp_freebuf(ar, &ar->buf_rx, skb); - return; - } + if (ar->fwlog_tx_queue_len > ATH10K_FWLOG_MAX_EVT_QUEUE) { + ath10k_warn(ar, "reached fwlog queue limit\n"); + athp_freebuf(ar, &ar->buf_rx, skb); + return; + } - TAILQ_INSERT_TAIL(&ar->fwlog_tx_queue, skb, next); - ar->fwlog_tx_queue_len++; - taskqueue_enqueue(ar->workqueue, &ar->fwlog_tx_work); - ATHP_FWLOG_UNLOCK(ar); + TAILQ_INSERT_TAIL(&ar->fwlog_tx_queue, skb, next); + ar->fwlog_tx_queue_len++; + taskqueue_enqueue(ar->workqueue, &ar->fwlog_tx_work); + ATHP_FWLOG_UNLOCK(ar); + } + else { + //log that mutext is being locked upon and has never been initialized. + } } void ath10k_fwlog_register(struct ath10k *ar) diff --git a/otus/freebsd/src/sys/dev/athp/if_athp_htt_rx.c b/otus/freebsd/src/sys/dev/athp/if_athp_htt_rx.c index 44595428..8a20b1a2 100644 --- a/otus/freebsd/src/sys/dev/athp/if_athp_htt_rx.c +++ b/otus/freebsd/src/sys/dev/athp/if_athp_htt_rx.c @@ -2034,7 +2034,7 @@ static bool ath10k_htt_rx_amsdu_allowed(struct ath10k *ar, */ if (!rx_status->c_ieee) { - ath10k_warn(ar, "no channel configured; ignoring frame(s)!\n"); + //ath10k_warn(ar, "no channel configured; ignoring frame(s)!\n"); return false; }