Skip to contentSkip to conversation

ath9k: Print hw reset failure status as signed int

PATCH New Vasanthakumar Thiagarajan 1 participant 3 messages May 15, 2009 Qualcomm Atheros ATH9K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ath9k: Print hw reset failure status as signed int

---
 drivers/net/wireless/ath/ath9k/main.c |   10 +++++-----
 drivers/net/wireless/ath/ath9k/xmit.c |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +5 -5
index df9b7c1..c161b75 100644
@@ -280,7 +280,7 @@ int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
 	if (r) {
 		DPRINTF(sc, ATH_DBG_FATAL,
 			"Unable to reset channel (%u Mhz) "
-			"reset status %u\n",
+			"reset status %d\n",
 			channel->center_freq, r);
 		spin_unlock_bh(&sc->sc_resetlock);
 		return r;
@@ -1090,7 +1090,7 @@ void ath_radio_enable(struct ath_softc *sc)
 	if (r) {
 		DPRINTF(sc, ATH_DBG_FATAL,
 			"Unable to reset channel %u (%uMhz) ",
-			"reset status %u\n",
+			"reset status %d\n",
 			channel->center_freq, r);
 	}
 	spin_unlock_bh(&sc->sc_resetlock);
@@ -1142,7 +1142,7 @@ void ath_radio_disable(struct ath_softc *sc)
 	if (r) {
 		DPRINTF(sc, ATH_DBG_FATAL,
 			"Unable to reset channel %u (%uMhz) "
-			"reset status %u\n",
+			"reset status %d\n",
 			channel->center_freq, r);
 	}
 	spin_unlock_bh(&sc->sc_resetlock);
@@ -1705,7 +1705,7 @@ int ath_reset(struct ath_softc *sc, bool retry_tx)
 	r = ath9k_hw_reset(ah, sc->sc_ah->curchan, false);
 	if (r)
 		DPRINTF(sc, ATH_DBG_FATAL,
-			"Unable to reset hardware; reset status %u\n", r);
+			"Unable to reset hardware; reset status %d\n", r);
 	spin_unlock_bh(&sc->sc_resetlock);
 
 	if (ath_startrecv(sc) != 0)
@@ -1997,7 +1997,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
 	r = ath9k_hw_reset(sc->sc_ah, init_channel, false);
 	if (r) {
 		DPRINTF(sc, ATH_DBG_FATAL,
-			"Unable to reset hardware; reset status %u "
+			"Unable to reset hardware; reset status %d "
 			"(freq %u MHz)\n", r,
 			curchan->center_freq);
 		spin_unlock_bh(&sc->sc_resetlock);
drivers/net/wireless/ath/ath9k/xmit.c +1 -1
index 41c4282..3f2bd79 100644
@@ -1070,7 +1070,7 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
 		r = ath9k_hw_reset(ah, sc->sc_ah->curchan, true);
 		if (r)
 			DPRINTF(sc, ATH_DBG_FATAL,
-				"Unable to reset hardware; reset status %u\n",
+				"Unable to reset hardware; reset status %d\n",
 				r);
 		spin_unlock_bh(&sc->sc_resetlock);
 	}
Signature · 1 line
1.5.5.1
#1 lore raw

PATCH 1/1 ath9k: Remove unused parameters which are passed to ath_beacon_config_X()

---
 drivers/net/wireless/ath/ath9k/beacon.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath9k/beacon.c +5 -8
index 3a7154b..af5edb8 100644
@@ -507,8 +507,7 @@ void ath_beacon_tasklet(unsigned long data)
  * slot. Slots that are not occupied will generate nothing.
  */
 static void ath_beacon_config_ap(struct ath_softc *sc,
-				 struct ath_beacon_config *conf,
-				 struct ath_vif *avp)
+				 struct ath_beacon_config *conf)
 {
 	u32 nexttbtt, intval;
 
@@ -553,8 +552,7 @@ static void ath_beacon_config_ap(struct ath_softc *sc,
  * we've associated with.
  */
 static void ath_beacon_config_sta(struct ath_softc *sc,
-				  struct ath_beacon_config *conf,
-				  struct ath_vif *avp)
+				  struct ath_beacon_config *conf)
 {
 	struct ath9k_beacon_state bs;
 	int dtimperiod, dtimcount, sleepduration;
@@ -654,7 +652,6 @@ static void ath_beacon_config_sta(struct ath_softc *sc,
 
 static void ath_beacon_config_adhoc(struct ath_softc *sc,
 				    struct ath_beacon_config *conf,
-				    struct ath_vif *avp,
 				    struct ieee80211_vif *vif)
 {
 	u64 tsf;
@@ -720,14 +717,14 @@ void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif)
 
 		switch(avp->av_opmode) {
 		case NL80211_IFTYPE_AP:
-			ath_beacon_config_ap(sc, &conf, avp);
+			ath_beacon_config_ap(sc, &conf);
 			break;
 		case NL80211_IFTYPE_ADHOC:
 		case NL80211_IFTYPE_MESH_POINT:
-			ath_beacon_config_adhoc(sc, &conf, avp, vif);
+			ath_beacon_config_adhoc(sc, &conf, vif);
 			break;
 		case NL80211_IFTYPE_STATION:
-			ath_beacon_config_sta(sc, &conf, avp);
+			ath_beacon_config_sta(sc, &conf);
 			break;
 		default:
 			DPRINTF(sc, ATH_DBG_CONFIG,
Signature · 1 line
1.5.5.1
#2 lore raw

PATCH 1/1 ath9k: cleanup beacon parameters configuration

This patch configures the beacon timers with beacon interval and beacon period passed through vif.bss_conf. Also cache the currecnt beacon configuration which will be used to configure the beacon timers when the driver triggers it after reset.

---
 drivers/net/wireless/ath/ath9k/ath9k.h  |    1 +
 drivers/net/wireless/ath/ath9k/beacon.c |   63 +++++++++++++++++--------------
 2 files changed, 36 insertions(+), 28 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +1 -0
index 82d8b86..aaef870 100644
@@ -604,6 +604,7 @@ struct ath_softc {
 	struct ath9k_debug debug;
 #endif
 	struct ath_bus_ops *bus_ops;
+	struct ath_beacon_config cur_beacon_conf;
 };
 
 struct ath_wiphy {
drivers/net/wireless/ath/ath9k/beacon.c +35 -28

78 lines not on this page · raw message

Signature · 1 line
1.5.5.1