From 4aeaa6aeac3ec9b75ff9155f5b050a53f32404bb Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 28 Oct 2009 13:39:40 -0700 Subject: [PATCH] --- yaml --- r: 171687 b: refs/heads/master c: 1bdf6c3bece59c96aec3b8b457a9a554f6b2c433 h: refs/heads/master i: 171685: ffa3c5b42b2748b65d8bf6133d2ccde55568bb52 171683: d6f2ffbdc24cd4b4db1a57729e7e6bb429b5ca87 171679: 0f87e47ac80029fd22e285b1fcf711bcda14e5bd v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/virtual.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 90ff5f709569..7648c321446a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 194b7c13b4c516db94db8ee004342f8935922739 +refs/heads/master: 1bdf6c3bece59c96aec3b8b457a9a554f6b2c433 diff --git a/trunk/drivers/net/wireless/ath/ath9k/virtual.c b/trunk/drivers/net/wireless/ath/ath9k/virtual.c index e6a50f3aa472..7678c4a2ca6f 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/virtual.c +++ b/trunk/drivers/net/wireless/ath/ath9k/virtual.c @@ -298,6 +298,7 @@ static void ath9k_wiphy_unpause_channel(struct ath_softc *sc) void ath9k_wiphy_chan_work(struct work_struct *work) { struct ath_softc *sc = container_of(work, struct ath_softc, chan_work); + struct ath_common *common = ath9k_hw_common(sc->sc_ah); struct ath_wiphy *aphy = sc->next_wiphy; if (aphy == NULL) @@ -313,6 +314,10 @@ void ath9k_wiphy_chan_work(struct work_struct *work) /* XXX: remove me eventually */ ath9k_update_ichannel(sc, aphy->hw, &sc->sc_ah->channels[sc->chan_idx]); + + /* sync hw configuration for hw code */ + common->hw = aphy->hw; + ath_update_chainmask(sc, sc->chan_is_ht); if (ath_set_channel(sc, aphy->hw, &sc->sc_ah->channels[sc->chan_idx]) < 0) {