Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 255767
b: refs/heads/master
c: d4bb17c
h: refs/heads/master
i:
  255765: bad35be
  255763: dfc3808
  255759: fcae0e2
v: v3
  • Loading branch information
Mohammed Shafi Shajakhan authored and John W. Linville committed Jun 17, 2011
1 parent c65ace7 commit 7132945
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aec7ffdf4ff24df1fe85ed5bc9e050c4dd77617b
refs/heads/master: d4bb17c4bed70892ea8b749a843a516424ba5638
15 changes: 11 additions & 4 deletions trunk/drivers/net/wireless/ath/ath9k/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int
txctl.paprd = BIT(chain);

if (ath_tx_start(hw, skb, &txctl) != 0) {
ath_dbg(common, ATH_DBG_XMIT, "PAPRD TX failed\n");
ath_dbg(common, ATH_DBG_CALIBRATE, "PAPRD TX failed\n");
dev_kfree_skb_any(skb);
return false;
}
Expand All @@ -369,7 +369,7 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int
msecs_to_jiffies(ATH_PAPRD_TIMEOUT));

if (!time_left)
ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_CALIBRATE,
ath_dbg(common, ATH_DBG_CALIBRATE,
"Timeout waiting for paprd training on TX chain %d\n",
chain);

Expand Down Expand Up @@ -431,11 +431,18 @@ void ath_paprd_calibrate(struct work_struct *work)
if (!ath_paprd_send_frame(sc, skb, chain))
goto fail_paprd;

if (!ar9003_paprd_is_done(ah))
if (!ar9003_paprd_is_done(ah)) {
ath_dbg(common, ATH_DBG_CALIBRATE,
"PAPRD not yet done on chain %d\n", chain);
break;
}

if (ar9003_paprd_create_curve(ah, caldata, chain) != 0)
if (ar9003_paprd_create_curve(ah, caldata, chain)) {
ath_dbg(common, ATH_DBG_CALIBRATE,
"PAPRD create curve failed on chain %d\n",
chain);
break;
}

chain_ok = 1;
}
Expand Down

0 comments on commit 7132945

Please sign in to comment.