Just a couple of ath9k cleanups. One is a candidate for stable.
Luis R. Rodriguez (2):
ath9k: downgrade xmit queue full message to xmit debug
ath9k: make few eeprom and calib items static
drivers/net/wireless/ath9k/calib.c | 2 +-
drivers/net/wireless/ath9k/eeprom.c | 8 ++++----
drivers/net/wireless/ath9k/xmit.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
Luis Rodriguez wrote:
> This fixes the sparse complaints:
>
> drivers/net/wireless/ath9k/eeprom.c:1407:5: warning: symbol
> 'ath9k_hw_4k_get_spur_channel' was not declared. Should it be static?
> drivers/net/wireless/ath9k/eeprom.c:1436:19: warning: symbol
> 'eep_4k_ops' was not declared. Should it be static?
> drivers/net/wireless/ath9k/eeprom.c:2808:5: warning: symbol
> 'ath9k_hw_def_get_spur_channel' was not declared. Should it be static?
> drivers/net/wireless/ath9k/eeprom.c:2837:19: warning: symbol
> 'eep_def_ops' was not declared. Should it be static?
> CC [M] drivers/net/wireless/ath9k/eeprom.o
> CHECK drivers/net/wireless/ath9k/mac.c
> CC [M] drivers/net/wireless/ath9k/mac.o
> CHECK drivers/net/wireless/ath9k/calib.c
> drivers/net/wireless/ath9k/calib.c:883:6: warning: symbol 'ar9285_clc'
> was not declared. Should it be static?
Commit 93f726a90d1446c9e5a40fe8f88086542b273e7c in net-next-2.6 fixes a couple
of warnings (in eeprom.c).
Sujith
This fixes the sparse complaints:
drivers/net/wireless/ath9k/eeprom.c:1407:5: warning: symbol
'ath9k_hw_4k_get_spur_channel' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:1436:19: warning: symbol
'eep_4k_ops' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2808:5: warning: symbol
'ath9k_hw_def_get_spur_channel' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2837:19: warning: symbol
'eep_def_ops' was not declared. Should it be static?
CC [M] drivers/net/wireless/ath9k/eeprom.o
CHECK drivers/net/wireless/ath9k/mac.c
CC [M] drivers/net/wireless/ath9k/mac.o
CHECK drivers/net/wireless/ath9k/calib.c
drivers/net/wireless/ath9k/calib.c:883:6: warning: symbol 'ar9285_clc'
was not declared. Should it be static?
Signed-off-by: Luis R. Rodriguez <[email protected]>
---
drivers/net/wireless/ath9k/calib.c | 2 +-
drivers/net/wireless/ath9k/eeprom.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath9k/calib.c b/drivers/net/wireless/ath9k/calib.c
index a652e9b..c9446fb 100644
--- a/drivers/net/wireless/ath9k/calib.c
+++ b/drivers/net/wireless/ath9k/calib.c
@@ -880,7 +880,7 @@ bool ath9k_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,
return true;
}
-bool ar9285_clc(struct ath_hw *ah, struct ath9k_channel *chan)
+static bool ar9285_clc(struct ath_hw *ah, struct ath9k_channel *chan)
{
REG_SET_BIT(ah, AR_PHY_CL_CAL_CTL, AR_PHY_CL_CAL_ENABLE);
if (chan->channelFlags & CHANNEL_HT20) {
diff --git a/drivers/net/wireless/ath9k/eeprom.c b/drivers/net/wireless/ath9k/eeprom.c
index dd280cb..183c949 100644
--- a/drivers/net/wireless/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath9k/eeprom.c
@@ -1404,7 +1404,7 @@ static u8 ath9k_hw_4k_get_num_ant_config(struct ath_hw *ah,
return 1;
}
-u16 ath9k_hw_4k_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)
+static u16 ath9k_hw_4k_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)
{
#define EEP_MAP4K_SPURCHAN \
(ah->eeprom.map4k.modalHeader.spurChans[i].spurChan)
@@ -1433,7 +1433,7 @@ u16 ath9k_hw_4k_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)
#undef EEP_MAP4K_SPURCHAN
}
-struct eeprom_ops eep_4k_ops = {
+static struct eeprom_ops eep_4k_ops = {
.check_eeprom = ath9k_hw_4k_check_eeprom,
.get_eeprom = ath9k_hw_4k_get_eeprom,
.fill_eeprom = ath9k_hw_4k_fill_eeprom,
@@ -2805,7 +2805,7 @@ static u16 ath9k_hw_def_get_eeprom_antenna_cfg(struct ath_hw *ah,
return pModal->antCtrlCommon & 0xFFFF;
}
-u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)
+static u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)
{
#define EEP_DEF_SPURCHAN \
(ah->eeprom.def.modalHeader[is2GHz].spurChans[i].spurChan)
@@ -2834,7 +2834,7 @@ u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)
#undef EEP_DEF_SPURCHAN
}
-struct eeprom_ops eep_def_ops = {
+static struct eeprom_ops eep_def_ops = {
.check_eeprom = ath9k_hw_def_check_eeprom,
.get_eeprom = ath9k_hw_def_get_eeprom,
.fill_eeprom = ath9k_hw_def_fill_eeprom,
--
1.6.0.6
This is not a fatal message, hitting it simply means we're
going to tell the upper layers to slow their horses down but
as we make more descriptors available we let the show continue
by waking up the queues in ath_wake_mac80211_queue().
We downgrade this as otherwise we fill up your kernel log with
messages which can be common under heavy traffic.
Cc: [email protected]
Signed-off-by: Luis R. Rodriguez <[email protected]>
---
Greg, the second patch in this series is not relevant for stable,
just this patch.
drivers/net/wireless/ath9k/xmit.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index a82d2ab..465e5bb 100644
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -891,7 +891,7 @@ struct ath_txq *ath_test_get_txq(struct ath_softc *sc, struct sk_buff *skb)
spin_lock_bh(&txq->axq_lock);
if (txq->axq_depth >= (ATH_TXBUF - 20)) {
- DPRINTF(sc, ATH_DBG_FATAL,
+ DPRINTF(sc, ATH_DBG_XMIT,
"TX queue: %d is full, depth: %d\n",
qnum, txq->axq_depth);
ieee80211_stop_queue(sc->hw, skb_get_queue_mapping(skb));
--
1.6.0.6