--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -662,7 +662,6 @@ void ath9k_deinit_device(struct ath_soft
+@@ -665,7 +665,6 @@ void ath9k_deinit_device(struct ath_soft
void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);
void ath9k_update_ichannel(struct ath_softc *sc, struct ieee80211_hw *hw,
struct ath9k_channel *ichan);
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -522,32 +522,6 @@ set_timer:
+@@ -538,32 +538,6 @@ set_timer:
}
}
static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
{
struct ath_node *an;
-@@ -1609,8 +1583,6 @@ static int ath9k_config(struct ieee80211
+@@ -1676,8 +1650,6 @@ static int ath9k_config(struct ieee80211
/* XXX: remove me eventualy */
ath9k_update_ichannel(sc, hw, &sc->sc_ah->channels[pos]);
/* update survey stats for the old channel before switching */
spin_lock_irqsave(&common->cc_lock, flags);
ath_update_survey_stats(sc);
-@@ -1842,10 +1814,6 @@ static void ath9k_bss_info_changed(struc
+@@ -1909,10 +1881,6 @@ static void ath9k_bss_info_changed(struc
/* Set aggregation protection mode parameters */
sc->config.ath_aggr_prot = 0;