[PATCH v4 5/6] ath10k: add wmi support for tdls

Kalle Valo kvalo at qca.qualcomm.com
Mon Mar 23 08:53:50 PDT 2015


Marek Puzyniak <marek.puzyniak at tieto.com> writes:

> As a part of tdls implementation introduce
> tdls related wmi data structures, constant
> values and functions.
>
> Signed-off-by: Marek Puzyniak <marek.puzyniak at tieto.com>

This patch had non-trivial conflicts, please check carefully my
resolution in the pending branch.

  CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h
  CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.h
  CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.c
  CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-ops.h

-- 
Kalle Valo



More information about the ath10k mailing list