SVN-Revision: 22419master
Felix Fietkau
14 years ago
parent
da7493d8f9
commit
fc16d8ae02
@ -0,0 +1,69 @@ |
||||
--- a/include/net/cfg80211.h
|
||||
+++ b/include/net/cfg80211.h
|
||||
@@ -2443,9 +2443,8 @@ void cfg80211_cqm_rssi_notify(struct net
|
||||
wiphy_printk(KERN_NOTICE, wiphy, format, ##args)
|
||||
#define wiphy_info(wiphy, format, args...) \
|
||||
wiphy_printk(KERN_INFO, wiphy, format, ##args)
|
||||
-
|
||||
-int wiphy_debug(const struct wiphy *wiphy, const char *format, ...)
|
||||
- __attribute__ ((format (printf, 2, 3)));
|
||||
+#define wiphy_debug(wiphy, format, args...) \
|
||||
+ wiphy_printk(KERN_DEBUG, wiphy, format, ##args)
|
||||
|
||||
#if defined(DEBUG)
|
||||
#define wiphy_dbg(wiphy, format, args...) \
|
||||
--- a/net/wireless/core.c
|
||||
+++ b/net/wireless/core.c
|
||||
@@ -921,52 +921,3 @@ static void __exit cfg80211_exit(void)
|
||||
destroy_workqueue(cfg80211_wq);
|
||||
}
|
||||
module_exit(cfg80211_exit);
|
||||
-
|
||||
-static int ___wiphy_printk(const char *level, const struct wiphy *wiphy,
|
||||
- struct va_format *vaf)
|
||||
-{
|
||||
- if (!wiphy)
|
||||
- return printk("%s(NULL wiphy *): %pV", level, vaf);
|
||||
-
|
||||
- return printk("%s%s: %pV", level, wiphy_name(wiphy), vaf);
|
||||
-}
|
||||
-
|
||||
-int __wiphy_printk(const char *level, const struct wiphy *wiphy,
|
||||
- const char *fmt, ...)
|
||||
-{
|
||||
- struct va_format vaf;
|
||||
- va_list args;
|
||||
- int r;
|
||||
-
|
||||
- va_start(args, fmt);
|
||||
-
|
||||
- vaf.fmt = fmt;
|
||||
- vaf.va = &args;
|
||||
-
|
||||
- r = ___wiphy_printk(level, wiphy, &vaf);
|
||||
- va_end(args);
|
||||
-
|
||||
- return r;
|
||||
-}
|
||||
-EXPORT_SYMBOL(__wiphy_printk);
|
||||
-
|
||||
-#define define_wiphy_printk_level(func, kern_level) \
|
||||
-int func(const struct wiphy *wiphy, const char *fmt, ...) \
|
||||
-{ \
|
||||
- struct va_format vaf; \
|
||||
- va_list args; \
|
||||
- int r; \
|
||||
- \
|
||||
- va_start(args, fmt); \
|
||||
- \
|
||||
- vaf.fmt = fmt; \
|
||||
- vaf.va = &args; \
|
||||
- \
|
||||
- r = ___wiphy_printk(kern_level, wiphy, &vaf); \
|
||||
- va_end(args); \
|
||||
- \
|
||||
- return r; \
|
||||
-} \
|
||||
-EXPORT_SYMBOL(func);
|
||||
-
|
||||
-define_wiphy_printk_level(wiphy_debug, KERN_DEBUG);
|
||||
@ -1,35 +0,0 @@ |
||||
--- a/include/net/mac80211.h
|
||||
+++ b/include/net/mac80211.h
|
||||
@@ -625,11 +625,14 @@ struct ieee80211_rx_status {
|
||||
* may turn the device off as much as possible. Typically, this flag will
|
||||
* be set when an interface is set UP but not associated or scanning, but
|
||||
* it can also be unset in that case when monitor interfaces are active.
|
||||
+ * @IEEE80211_CONF_OFFCHANNEL: The device is currently not on its main
|
||||
+ * operating channel.
|
||||
*/
|
||||
enum ieee80211_conf_flags {
|
||||
IEEE80211_CONF_MONITOR = (1<<0),
|
||||
IEEE80211_CONF_PS = (1<<1),
|
||||
IEEE80211_CONF_IDLE = (1<<2),
|
||||
+ IEEE80211_CONF_OFFCHANNEL = (1<<3),
|
||||
};
|
||||
|
||||
|
||||
--- a/net/mac80211/main.c
|
||||
+++ b/net/mac80211/main.c
|
||||
@@ -111,12 +111,15 @@ int ieee80211_hw_config(struct ieee80211
|
||||
if (scan_chan) {
|
||||
chan = scan_chan;
|
||||
channel_type = NL80211_CHAN_NO_HT;
|
||||
+ local->hw.conf.flags |= IEEE80211_CONF_OFFCHANNEL;
|
||||
} else if (local->tmp_channel) {
|
||||
chan = scan_chan = local->tmp_channel;
|
||||
channel_type = local->tmp_channel_type;
|
||||
+ local->hw.conf.flags |= IEEE80211_CONF_OFFCHANNEL;
|
||||
} else {
|
||||
chan = local->oper_channel;
|
||||
channel_type = local->_oper_channel_type;
|
||||
+ local->hw.conf.flags &= ~IEEE80211_CONF_OFFCHANNEL;
|
||||
}
|
||||
|
||||
if (chan != local->hw.conf.channel ||
|
||||
@ -1,201 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
@@ -511,13 +511,12 @@ void ath_deinit_leds(struct ath_softc *s
|
||||
#define SC_OP_BEACONS BIT(1)
|
||||
#define SC_OP_RXAGGR BIT(2)
|
||||
#define SC_OP_TXAGGR BIT(3)
|
||||
-#define SC_OP_FULL_RESET BIT(4)
|
||||
#define SC_OP_PREAMBLE_SHORT BIT(5)
|
||||
#define SC_OP_PROTECT_ENABLE BIT(6)
|
||||
#define SC_OP_RXFLUSH BIT(7)
|
||||
#define SC_OP_LED_ASSOCIATED BIT(8)
|
||||
#define SC_OP_LED_ON BIT(9)
|
||||
-#define SC_OP_SCANNING BIT(10)
|
||||
+#define SC_OP_OFFCHANNEL BIT(10)
|
||||
#define SC_OP_TSF_RESET BIT(11)
|
||||
#define SC_OP_BT_PRIORITY_DETECTED BIT(12)
|
||||
#define SC_OP_BT_SCAN BIT(13)
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -155,6 +155,27 @@ void ath9k_ps_restore(struct ath_softc *
|
||||
spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
|
||||
}
|
||||
|
||||
+static void ath_start_ani(struct ath_common *common)
|
||||
+{
|
||||
+ struct ath_hw *ah = common->ah;
|
||||
+ unsigned long timestamp = jiffies_to_msecs(jiffies);
|
||||
+ struct ath_softc *sc = (struct ath_softc *) common->priv;
|
||||
+
|
||||
+ if (!(sc->sc_flags & SC_OP_ANI_RUN))
|
||||
+ return;
|
||||
+
|
||||
+ if (sc->sc_flags & SC_OP_OFFCHANNEL)
|
||||
+ return;
|
||||
+
|
||||
+ common->ani.longcal_timer = timestamp;
|
||||
+ common->ani.shortcal_timer = timestamp;
|
||||
+ common->ani.checkani_timer = timestamp;
|
||||
+
|
||||
+ mod_timer(&common->ani.timer,
|
||||
+ jiffies +
|
||||
+ msecs_to_jiffies((u32)ah->config.ani_poll_interval));
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* Set/change channels. If the channel is really being changed, it's done
|
||||
* by reseting the chip. To accomplish this we must first cleanup any pending
|
||||
@@ -173,6 +194,11 @@ int ath_set_channel(struct ath_softc *sc
|
||||
if (sc->sc_flags & SC_OP_INVALID)
|
||||
return -EIO;
|
||||
|
||||
+ del_timer_sync(&common->ani.timer);
|
||||
+ cancel_work_sync(&sc->paprd_work);
|
||||
+ cancel_work_sync(&sc->hw_check_work);
|
||||
+ cancel_delayed_work_sync(&sc->tx_complete_work);
|
||||
+
|
||||
ath9k_ps_wakeup(sc);
|
||||
|
||||
/*
|
||||
@@ -192,7 +218,7 @@ int ath_set_channel(struct ath_softc *sc
|
||||
* to flush data frames already in queue because of
|
||||
* changing channel. */
|
||||
|
||||
- if (!stopped || (sc->sc_flags & SC_OP_FULL_RESET))
|
||||
+ if (!stopped || !(sc->sc_flags & SC_OP_OFFCHANNEL))
|
||||
fastcc = false;
|
||||
|
||||
ath_print(common, ATH_DBG_CONFIG,
|
||||
@@ -213,8 +239,6 @@ int ath_set_channel(struct ath_softc *sc
|
||||
}
|
||||
spin_unlock_bh(&sc->sc_resetlock);
|
||||
|
||||
- sc->sc_flags &= ~SC_OP_FULL_RESET;
|
||||
-
|
||||
if (ath_startrecv(sc) != 0) {
|
||||
ath_print(common, ATH_DBG_FATAL,
|
||||
"Unable to restart recv logic\n");
|
||||
@@ -226,6 +250,12 @@ int ath_set_channel(struct ath_softc *sc
|
||||
ath_update_txpow(sc);
|
||||
ath9k_hw_set_interrupts(ah, ah->imask);
|
||||
|
||||
+ if (!(sc->sc_flags & SC_OP_OFFCHANNEL)) {
|
||||
+ ath_start_ani(common);
|
||||
+ ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
|
||||
+ ath_beacon_config(sc, NULL);
|
||||
+ }
|
||||
+
|
||||
ps_restore:
|
||||
ath9k_ps_restore(sc);
|
||||
return r;
|
||||
@@ -440,8 +470,7 @@ set_timer:
|
||||
cal_interval = min(cal_interval, (u32)short_cal_interval);
|
||||
|
||||
mod_timer(&common->ani.timer, jiffies + msecs_to_jiffies(cal_interval));
|
||||
- if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) &&
|
||||
- !(sc->sc_flags & SC_OP_SCANNING)) {
|
||||
+ if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) {
|
||||
if (!sc->sc_ah->curchan->paprd_done)
|
||||
ieee80211_queue_work(sc->hw, &sc->paprd_work);
|
||||
else
|
||||
@@ -449,24 +478,6 @@ set_timer:
|
||||
}
|
||||
}
|
||||
|
||||
-static void ath_start_ani(struct ath_common *common)
|
||||
-{
|
||||
- struct ath_hw *ah = common->ah;
|
||||
- unsigned long timestamp = jiffies_to_msecs(jiffies);
|
||||
- struct ath_softc *sc = (struct ath_softc *) common->priv;
|
||||
-
|
||||
- if (!(sc->sc_flags & SC_OP_ANI_RUN))
|
||||
- return;
|
||||
-
|
||||
- common->ani.longcal_timer = timestamp;
|
||||
- common->ani.shortcal_timer = timestamp;
|
||||
- common->ani.checkani_timer = timestamp;
|
||||
-
|
||||
- mod_timer(&common->ani.timer,
|
||||
- jiffies +
|
||||
- msecs_to_jiffies((u32)ah->config.ani_poll_interval));
|
||||
-}
|
||||
-
|
||||
/*
|
||||
* Update tx/rx chainmask. For legacy association,
|
||||
* hard code chainmask to 1x1, for 11n association, use
|
||||
@@ -478,7 +489,7 @@ void ath_update_chainmask(struct ath_sof
|
||||
struct ath_hw *ah = sc->sc_ah;
|
||||
struct ath_common *common = ath9k_hw_common(ah);
|
||||
|
||||
- if ((sc->sc_flags & SC_OP_SCANNING) || is_ht ||
|
||||
+ if ((sc->sc_flags & SC_OP_OFFCHANNEL) || is_ht ||
|
||||
(ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE)) {
|
||||
common->tx_chainmask = ah->caps.tx_chainmask;
|
||||
common->rx_chainmask = ah->caps.rx_chainmask;
|
||||
@@ -1580,6 +1591,10 @@ static int ath9k_config(struct ieee80211
|
||||
|
||||
aphy->chan_idx = pos;
|
||||
aphy->chan_is_ht = conf_is_ht(conf);
|
||||
+ if (hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
|
||||
+ sc->sc_flags |= SC_OP_OFFCHANNEL;
|
||||
+ else
|
||||
+ sc->sc_flags &= ~SC_OP_OFFCHANNEL;
|
||||
|
||||
if (aphy->state == ATH_WIPHY_SCAN ||
|
||||
aphy->state == ATH_WIPHY_ACTIVE)
|
||||
@@ -1991,7 +2006,6 @@ static void ath9k_sw_scan_start(struct i
|
||||
{
|
||||
struct ath_wiphy *aphy = hw->priv;
|
||||
struct ath_softc *sc = aphy->sc;
|
||||
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
||||
|
||||
mutex_lock(&sc->mutex);
|
||||
if (ath9k_wiphy_scanning(sc)) {
|
||||
@@ -2007,11 +2021,6 @@ static void ath9k_sw_scan_start(struct i
|
||||
|
||||
aphy->state = ATH_WIPHY_SCAN;
|
||||
ath9k_wiphy_pause_all_forced(sc, aphy);
|
||||
- sc->sc_flags |= SC_OP_SCANNING;
|
||||
- del_timer_sync(&common->ani.timer);
|
||||
- cancel_work_sync(&sc->paprd_work);
|
||||
- cancel_work_sync(&sc->hw_check_work);
|
||||
- cancel_delayed_work_sync(&sc->tx_complete_work);
|
||||
mutex_unlock(&sc->mutex);
|
||||
}
|
||||
|
||||
@@ -2019,15 +2028,9 @@ static void ath9k_sw_scan_complete(struc
|
||||
{
|
||||
struct ath_wiphy *aphy = hw->priv;
|
||||
struct ath_softc *sc = aphy->sc;
|
||||
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
||||
|
||||
mutex_lock(&sc->mutex);
|
||||
aphy->state = ATH_WIPHY_ACTIVE;
|
||||
- sc->sc_flags &= ~SC_OP_SCANNING;
|
||||
- sc->sc_flags |= SC_OP_FULL_RESET;
|
||||
- ath_start_ani(common);
|
||||
- ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
|
||||
- ath_beacon_config(sc, NULL);
|
||||
mutex_unlock(&sc->mutex);
|
||||
}
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath9k/recv.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/recv.c
|
||||
@@ -292,7 +292,7 @@ static void ath_edma_start_recv(struct a
|
||||
|
||||
ath_opmode_init(sc);
|
||||
|
||||
- ath9k_hw_startpcureceive(sc->sc_ah, (sc->sc_flags & SC_OP_SCANNING));
|
||||
+ ath9k_hw_startpcureceive(sc->sc_ah, (sc->sc_flags & SC_OP_OFFCHANNEL));
|
||||
}
|
||||
|
||||
static void ath_edma_stop_recv(struct ath_softc *sc)
|
||||
@@ -498,7 +498,7 @@ int ath_startrecv(struct ath_softc *sc)
|
||||
start_recv:
|
||||
spin_unlock_bh(&sc->rx.rxbuflock);
|
||||
ath_opmode_init(sc);
|
||||
- ath9k_hw_startpcureceive(ah, (sc->sc_flags & SC_OP_SCANNING));
|
||||
+ ath9k_hw_startpcureceive(ah, (sc->sc_flags & SC_OP_OFFCHANNEL));
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -1,140 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath9k/hw.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.h
|
||||
@@ -354,6 +354,7 @@ struct ath9k_hw_cal_data {
|
||||
int8_t qCoff;
|
||||
int16_t rawNoiseFloor;
|
||||
bool paprd_done;
|
||||
+ bool nfcal_pending;
|
||||
u16 small_signal_gain[AR9300_MAX_CHAINS];
|
||||
u32 pa_table[AR9300_MAX_CHAINS][PAPRD_TABLE_SZ];
|
||||
struct ath9k_nfcal_hist nfCalHist[NUM_NF_READINGS];
|
||||
--- a/drivers/net/wireless/ath/ath9k/calib.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/calib.c
|
||||
@@ -156,6 +156,9 @@ EXPORT_SYMBOL(ath9k_hw_reset_calvalid);
|
||||
|
||||
void ath9k_hw_start_nfcal(struct ath_hw *ah)
|
||||
{
|
||||
+ if (ah->caldata)
|
||||
+ ah->caldata->nfcal_pending = true;
|
||||
+
|
||||
REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,
|
||||
AR_PHY_AGC_CONTROL_ENABLE_NF);
|
||||
REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,
|
||||
@@ -282,8 +285,7 @@ static void ath9k_hw_nf_sanitize(struct
|
||||
}
|
||||
}
|
||||
|
||||
-int16_t ath9k_hw_getnf(struct ath_hw *ah,
|
||||
- struct ath9k_channel *chan)
|
||||
+bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)
|
||||
{
|
||||
struct ath_common *common = ath9k_hw_common(ah);
|
||||
int16_t nf, nfThresh;
|
||||
@@ -293,7 +295,7 @@ int16_t ath9k_hw_getnf(struct ath_hw *ah
|
||||
struct ath9k_hw_cal_data *caldata = ah->caldata;
|
||||
|
||||
if (!caldata)
|
||||
- return ath9k_hw_get_default_nf(ah, chan);
|
||||
+ return false;
|
||||
|
||||
chan->channelFlags &= (~CHANNEL_CW_INT);
|
||||
if (REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF) {
|
||||
@@ -301,7 +303,7 @@ int16_t ath9k_hw_getnf(struct ath_hw *ah
|
||||
"NF did not complete in calibration window\n");
|
||||
nf = 0;
|
||||
caldata->rawNoiseFloor = nf;
|
||||
- return caldata->rawNoiseFloor;
|
||||
+ return false;
|
||||
} else {
|
||||
ath9k_hw_do_getnf(ah, nfarray);
|
||||
ath9k_hw_nf_sanitize(ah, nfarray);
|
||||
@@ -317,11 +319,10 @@ int16_t ath9k_hw_getnf(struct ath_hw *ah
|
||||
}
|
||||
|
||||
h = caldata->nfCalHist;
|
||||
-
|
||||
+ caldata->nfcal_pending = false;
|
||||
ath9k_hw_update_nfcal_hist_buffer(h, nfarray);
|
||||
caldata->rawNoiseFloor = h[0].privNF;
|
||||
-
|
||||
- return ah->caldata->rawNoiseFloor;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,
|
||||
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
|
||||
@@ -687,8 +687,13 @@ static bool ar9002_hw_calibrate(struct a
|
||||
{
|
||||
bool iscaldone = true;
|
||||
struct ath9k_cal_list *currCal = ah->cal_list_curr;
|
||||
+ bool nfcal, nfcal_pending = false;
|
||||
|
||||
- if (currCal &&
|
||||
+ nfcal = !!(REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF);
|
||||
+ if (ah->caldata)
|
||||
+ nfcal_pending = ah->caldata->nfcal_pending;
|
||||
+
|
||||
+ if (currCal && !nfcal &&
|
||||
(currCal->calState == CAL_RUNNING ||
|
||||
currCal->calState == CAL_WAITING)) {
|
||||
iscaldone = ar9002_hw_per_calibration(ah, chan,
|
||||
@@ -704,7 +709,7 @@ static bool ar9002_hw_calibrate(struct a
|
||||
}
|
||||
|
||||
/* Do NF cal only at longer intervals */
|
||||
- if (longcal) {
|
||||
+ if (longcal || nfcal_pending) {
|
||||
/* Do periodic PAOffset Cal */
|
||||
ar9002_hw_pa_cal(ah, false);
|
||||
ar9002_hw_olc_temp_compensation(ah);
|
||||
@@ -713,16 +718,18 @@ static bool ar9002_hw_calibrate(struct a
|
||||
* Get the value from the previous NF cal and update
|
||||
* history buffer.
|
||||
*/
|
||||
- ath9k_hw_getnf(ah, chan);
|
||||
-
|
||||
- /*
|
||||
- * Load the NF from history buffer of the current channel.
|
||||
- * NF is slow time-variant, so it is OK to use a historical
|
||||
- * value.
|
||||
- */
|
||||
- ath9k_hw_loadnf(ah, ah->curchan);
|
||||
+ if (ath9k_hw_getnf(ah, chan)) {
|
||||
+ /*
|
||||
+ * Load the NF from history buffer of the current
|
||||
+ * channel.
|
||||
+ * NF is slow time-variant, so it is OK to use a
|
||||
+ * historical value.
|
||||
+ */
|
||||
+ ath9k_hw_loadnf(ah, ah->curchan);
|
||||
+ }
|
||||
|
||||
- ath9k_hw_start_nfcal(ah);
|
||||
+ if (longcal)
|
||||
+ ath9k_hw_start_nfcal(ah);
|
||||
}
|
||||
|
||||
return iscaldone;
|
||||
@@ -873,6 +880,9 @@ static bool ar9002_hw_init_cal(struct at
|
||||
REG_WRITE(ah, AR_PHY_AGC_CONTROL,
|
||||
REG_READ(ah, AR_PHY_AGC_CONTROL) | AR_PHY_AGC_CONTROL_NF);
|
||||
|
||||
+ if (ah->caldata)
|
||||
+ ah->caldata->nfcal_pending = true;
|
||||
+
|
||||
ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
|
||||
|
||||
/* Enable IQ, ADC Gain and ADC DC offset CALs */
|
||||
--- a/drivers/net/wireless/ath/ath9k/calib.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/calib.h
|
||||
@@ -110,8 +110,7 @@ struct ath9k_pacal_info{
|
||||
bool ath9k_hw_reset_calvalid(struct ath_hw *ah);
|
||||
void ath9k_hw_start_nfcal(struct ath_hw *ah);
|
||||
void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan);
|
||||
-int16_t ath9k_hw_getnf(struct ath_hw *ah,
|
||||
- struct ath9k_channel *chan);
|
||||
+bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan);
|
||||
void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,
|
||||
struct ath9k_channel *chan);
|
||||
s16 ath9k_hw_getchan_noise(struct ath_hw *ah, struct ath9k_channel *chan);
|
||||
Loading…
Reference in new issue