On 08/16/2012 02:51 AM, Thomas Pedersen wrote: > This patch reflects changes in the firmware scheduled scan > implementation to behave better in cases with multiple concurrent vifs. > Major changes: > > - scheduled scan filters and state are now programmed per-vif. > - decouple scheduled scan from host sleep. > > To maintain graceful failure with old firmwares, a new firmware > capability bit is introduced: ATH6KL_FW_CAPABILITY_SCHED_SCAN_V2. > ath6kl simply won't advertise scheduled scan to cfg80211 if the > SCHED_SCAN_V2 is not supported. > > Since firmwares from here on out won't support the previous implicit API > for scheduled scan (set WoW filters and host sleep), bump the firmware > API to protect old drivers. Patch looks good but it doesn't apply. Can you rebase and resend, please? > Unfortunately, due to firmware RAM constraints ath6kl still cannot > expect a scan complete event at the end of a scheduled scan results > cycle, so the sched_scan_timer is retained. This is indeed unfortunate. I was so hoping to get rid of the ugly timer. BTW, whenever you can try to avoid using any custom commits when submitting patches upstream, that way it's easier to fix conflicts with 3-way merge: Applying: ath6kl: configure wow filters per-vif fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath6kl/cfg80211.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Kalle -- 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
