From ab56b67e3bd712decb13f8a41b39b98bbc8da785 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 20 Apr 2012 09:44:44 +0300 Subject: [PATCH] --- yaml --- r: 306731 b: refs/heads/master c: b86aeb502af956894612b3f726ca75790238b84e h: refs/heads/master i: 306729: 8fcc511c9a497d60e75f5de56885e5872bc2ca1c 306727: 1637713937ab9dbaf1abcd38a614c85b8bca82b2 v: v3 --- [refs] | 2 +- .../net/wireless/ath/ath6kl/htc_mbox.c | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 2e53da39bbf5..090c5117f3b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3acabc88072341a0ef6ad8ce5aee3af7429ac522 +refs/heads/master: b86aeb502af956894612b3f726ca75790238b84e diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c index 086a8e194700..65310d5ae46a 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c @@ -793,16 +793,17 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint, * itself */ txb_mask = ((1 << ac) - 1); - /* - * when the scatter request resources drop below a - * certain threshold, disable Tx bundling for all - * AC's with priority lower than the current requesting - * AC. Otherwise re-enable Tx bundling for them - */ - if (scat_req->scat_q_depth < ATH6KL_SCATTER_REQS) - target->tx_bndl_mask &= ~txb_mask; - else - target->tx_bndl_mask |= txb_mask; + + /* + * when the scatter request resources drop below a + * certain threshold, disable Tx bundling for all + * AC's with priority lower than the current requesting + * AC. Otherwise re-enable Tx bundling for them + */ + if (scat_req->scat_q_depth < ATH6KL_SCATTER_REQS) + target->tx_bndl_mask &= ~txb_mask; + else + target->tx_bndl_mask |= txb_mask; } ath6kl_dbg(ATH6KL_DBG_HTC, "htc tx pkts to scatter: %d\n",