From 29ce14550837c2b3ce706f8b5ca79f76f022d806 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@web.de>
Date: Wed, 3 Jun 2009 22:24:48 +0200
Subject: [PATCH] --- yaml --- r: 150703 b: refs/heads/master c:
 2489e4ea6cfd1c0f3fe839f90363abccbbdb7745 h: refs/heads/master i:   150701:
 1ac29e282bea0a810e1ba6ceaf07daaa46c92587   150699:
 082fad6323f589f0448997656e7d1f894b9621f9   150695:
 bac1063c0b09fa77d2eac93cc44363ac86b0669f   150687:
 b086af87bd4fb35d1a070ed245bdafebf3ea9fc6 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/wireless/ath/ar9170/ar9170.h | 1 -
 trunk/drivers/net/wireless/ath/ar9170/main.c   | 7 -------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 6a3af91b7af9..732ded7c828f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c18bd87b65fa5f39abb0ab1b82bca416c23cb6dd
+refs/heads/master: 2489e4ea6cfd1c0f3fe839f90363abccbbdb7745
diff --git a/trunk/drivers/net/wireless/ath/ar9170/ar9170.h b/trunk/drivers/net/wireless/ath/ar9170/ar9170.h
index 4c4b08fc0f7d..c7cba66b63cb 100644
--- a/trunk/drivers/net/wireless/ath/ar9170/ar9170.h
+++ b/trunk/drivers/net/wireless/ath/ar9170/ar9170.h
@@ -102,7 +102,6 @@ enum ar9170_device_state {
 	AR9170_STOPPED,
 	AR9170_IDLE,
 	AR9170_STARTED,
-	AR9170_ASSOCIATED,
 };
 
 struct ar9170_rxstream_mpdu_merge {
diff --git a/trunk/drivers/net/wireless/ath/ar9170/main.c b/trunk/drivers/net/wireless/ath/ar9170/main.c
index b889fda10b9a..b104d7efd676 100644
--- a/trunk/drivers/net/wireless/ath/ar9170/main.c
+++ b/trunk/drivers/net/wireless/ath/ar9170/main.c
@@ -1303,11 +1303,6 @@ static int ar9170_op_config(struct ieee80211_hw *hw, u32 changed)
 
 	mutex_lock(&ar->mutex);
 
-	if (changed & IEEE80211_CONF_CHANGE_RADIO_ENABLED) {
-		/* TODO */
-		err = 0;
-	}
-
 	if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {
 		/* TODO */
 		err = 0;
@@ -1490,8 +1485,6 @@ static void ar9170_op_bss_info_changed(struct ieee80211_hw *hw,
 	}
 
 	if (changed & BSS_CHANGED_ASSOC) {
-		ar->state = bss_conf->assoc ? AR9170_ASSOCIATED : ar->state;
-
 #ifndef CONFIG_AR9170_LEDS
 		/* enable assoc LED. */
 		err = ar9170_set_leds_state(ar, bss_conf->assoc ? 2 : 0);