On 10 October 2014 16:01, Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> wrote: > Michal Kazior <michal.kazior@xxxxxxxxx> writes: > >> This simply changes the source for txpower setup. >> It does not make ath10k use different txpower >> values for different vifs. >> >> This will make it easier to implement chanctx in >> ath10k in the future. >> >> Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx> > > In ath-next-test there was a conflict in ath10k_bss_info_changed(). > Please check my resolution: > > https://github.com/kvalo/ath/commit/86eea6fda33ce16a40f98d41c19ea4b0e157f5ba Looks good, thanks! Michał -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html