Browse Source

ath9k: Make ath_chanctx_offchan_switch static

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Sujith Manoharan 11 years ago
parent
commit
344ae6abd0
2 changed files with 13 additions and 15 deletions
  1. 0 2
      drivers/net/wireless/ath/ath9k/ath9k.h
  2. 13 13
      drivers/net/wireless/ath/ath9k/channel.c

+ 0 - 2
drivers/net/wireless/ath/ath9k/ath9k.h

@@ -420,8 +420,6 @@ void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,
 void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx,
 			struct cfg80211_chan_def *chandef);
 void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx);
-void ath_chanctx_offchan_switch(struct ath_softc *sc,
-				struct ieee80211_channel *chan);
 struct ath_chanctx *ath_chanctx_get_oper_chan(struct ath_softc *sc,
 					      bool active);
 void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,

+ 13 - 13
drivers/net/wireless/ath/ath9k/channel.c

@@ -244,19 +244,6 @@ struct ath_chanctx *ath_chanctx_get_oper_chan(struct ath_softc *sc, bool active)
 	return &sc->chanctx[0];
 }
 
-void ath_chanctx_offchan_switch(struct ath_softc *sc,
-				struct ieee80211_channel *chan)
-{
-	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-	struct cfg80211_chan_def chandef;
-
-	cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_NO_HT);
-	ath_dbg(common, CHAN_CTX,
-		"Channel definition created: %d MHz\n", chandef.center_freq1);
-
-	ath_chanctx_switch(sc, &sc->offchannel.chan, &chandef);
-}
-
 static struct ath_chanctx *
 ath_chanctx_get_next(struct ath_softc *sc, struct ath_chanctx *ctx)
 {
@@ -537,6 +524,19 @@ static int ath_scan_channel_duration(struct ath_softc *sc,
 	return (HZ / 16); /* ~60 ms */
 }
 
+static void ath_chanctx_offchan_switch(struct ath_softc *sc,
+				       struct ieee80211_channel *chan)
+{
+	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+	struct cfg80211_chan_def chandef;
+
+	cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_NO_HT);
+	ath_dbg(common, CHAN_CTX,
+		"Channel definition created: %d MHz\n", chandef.center_freq1);
+
+	ath_chanctx_switch(sc, &sc->offchannel.chan, &chandef);
+}
+
 static void
 ath_scan_next_channel(struct ath_softc *sc)
 {