]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ath9k: Make ath_chanctx_offchan_switch static
authorSujith Manoharan <c_manoha@qca.qualcomm.com>
Sat, 23 Aug 2014 07:59:13 +0000 (13:29 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 28 Aug 2014 18:49:36 +0000 (14:49 -0400)
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/channel.c

index 3b4201caee5b678b15cdc6c171d9c443ea5002b8..a77abe7f712337e8ba7822f5687c5216a78812ae 100644 (file)
@@ -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,
index 8214b3276989d952dd80cc31e58961af0a9aa37c..7c7178781cf83c860902f76b7b0d7f4e66bed74c 100644 (file)
@@ -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)
 {