Merge 2.6.38-rc5 into staging-next

[deliverable/linux.git] / drivers / staging / brcm80211 / brcmsmac / wlc_mac80211.c

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index d64171ff12aa88e0f93834fea9684ed3aa5be0f9..6debd45c796153c019495e348af747d69b5fc658 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
@@ -6327,6 +6327,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                                                    (u16) newfragthresh;
                                        }
                                }
+#if defined(BCMDBG)
                        } else
                                WL_ERROR("wl%d: %s txop invalid for rate %d\n",
                                         wlc->pub->unit, fifo_names[queue],
@@ -6338,6 +6339,9 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                                         fifo_names[queue],
                                         phylen, wlc->fragthresh[queue],
                                         dur, wlc->edcf_txop[ac]);
+#else
+                       }
+#endif
                }
        }
 
@@ -6607,7 +6611,9 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
        if (txs->phyerr) {
                WL_ERROR("phyerr 0x%x, rate 0x%x\n",
                         txs->phyerr, txh->MainRates);
+#if defined(BCMDBG)
                wlc_print_txdesc(txh);
+#endif
                wlc_print_txstatus(txs);
        }
 
@@ -8490,3 +8496,16 @@ static void wlc_txq_free(struct wlc_info *wlc, struct osl_info *osh,
 
        kfree(qi);
 }
+
+/*
+ * Flag 'scan in progress' to withold dynamic phy calibration
+ */
+void wlc_scan_start(struct wlc_info *wlc)
+{
+       wlc_phy_hold_upd(wlc->band->pi, PHY_HOLD_FOR_SCAN, true);
+}
+
+void wlc_scan_stop(struct wlc_info *wlc)
+{
+       wlc_phy_hold_upd(wlc->band->pi, PHY_HOLD_FOR_SCAN, false);
+}