From: Emmanuel Grumbach Date: Tue, 25 Nov 2014 05:53:57 +0000 (+0200) Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next X-Git-Tag: v4.14-rc1~6335^2~28^2~17^2~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7331845df48cd7905d0ac4452a9244446583e41;p=platform%2Fkernel%2Flinux-rpi.git Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next Signed-off-by: Emmanuel Grumbach Conflicts: drivers/net/wireless/iwlwifi/iwl-fw.h --- e7331845df48cd7905d0ac4452a9244446583e41 diff --cc drivers/net/wireless/iwlwifi/iwl-fw.h index a94d244,b894a84..959a25a --- a/drivers/net/wireless/iwlwifi/iwl-fw.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw.h @@@ -157,7 -155,7 +157,8 @@@ enum iwl_ucode_tlv_api * @IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT: supports Quiet Period requests * @IWL_UCODE_TLV_CAPA_DQA_SUPPORT: supports dynamic queue allocation (DQA), * which also implies support for the scheduler configuration command + * @IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH: supports TDLS channel switching + * @IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT: supports Hot Spot Command */ enum iwl_ucode_tlv_capa { IWL_UCODE_TLV_CAPA_D0I3_SUPPORT = BIT(0), @@@ -168,7 -164,7 +169,8 @@@ IWL_UCODE_TLV_CAPA_WFA_TPC_REP_IE_SUPPORT = BIT(10), IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT = BIT(11), IWL_UCODE_TLV_CAPA_DQA_SUPPORT = BIT(12), + IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH = BIT(13), + IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT = BIT(18), }; /* The default calibrate table size if not specified by firmware file */