diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-03-06 13:41:51 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-03-06 13:41:51 +0100 |
| commit | 89916cc90a78fffbc4c3d7cb1f6540fb2e551804 (patch) | |
| tree | 924fc36d17d94cc91d6375f572681640798df529 /drivers/net/wireless/ath/ath9k/channel.c | |
| parent | rtlwifi: rtl8821ae: Convert driver to use common 5G channel table (diff) | |
| parent | ath9k: clear bb filter calibration power threshold (diff) | |
| download | linux-89916cc90a78fffbc4c3d7cb1f6540fb2e551804.tar.xz linux-89916cc90a78fffbc4c3d7cb1f6540fb2e551804.zip | |
Merge ath-next from ath.git
ath.git patches for 4.6. Major changes:
ath10k
* dt: add bindings for ipq4019 wifi block
* start adding support for qca4019 chip
ath9k
* add device ID for Toshiba WLM-20U2/GN-1080
* allow more than one interface on DFS channels
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/channel.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c index 50e614b915f1..319cb5f25f58 100644 --- a/drivers/net/wireless/ath/ath9k/channel.c +++ b/drivers/net/wireless/ath/ath9k/channel.c @@ -226,7 +226,7 @@ static const char *chanctx_state_string(enum ath_chanctx_state state) } } -static const u32 chanctx_event_delta(struct ath_softc *sc) +static u32 chanctx_event_delta(struct ath_softc *sc) { u64 ms; struct timespec ts, *old; @@ -1454,7 +1454,7 @@ static void ath9k_update_p2p_ps(struct ath_softc *sc, struct ieee80211_vif *vif) if (!sc->p2p_ps_timer) return; - if (vif->type != NL80211_IFTYPE_STATION || !vif->p2p) + if (vif->type != NL80211_IFTYPE_STATION) return; sc->p2p_ps_vif = avp; |