* [PATCH linux-next 1/1] ath6k: Normalize use of FW_DIR [not found] <1334337448-26270-1-git-send-email-tim.gardner@canonical.com> @ 2012-04-13 17:17 ` Tim Gardner [not found] ` <1334337448-26270-2-git-send-email-tim.gardner-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Tim Gardner @ 2012-04-13 17:17 UTC (permalink / raw) To: kvalo, linux-kernel; +Cc: Tim Gardner, John W. Linville, linux-wireless, netdev Cc: Kalle Valo <kvalo@qca.qualcomm.com> Cc: "John W. Linville" <linville@tuxdriver.com> Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- drivers/net/wireless/ath/ath6kl/core.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h index 9d67964..ba81dc8 100644 --- a/drivers/net/wireless/ath/ath6kl/core.h +++ b/drivers/net/wireless/ath/ath6kl/core.h @@ -126,9 +126,9 @@ struct ath6kl_fw_ie { #define AR6003_HW_2_0_FIRMWARE_FILE "athwlan.bin.z77" #define AR6003_HW_2_0_TCMD_FIRMWARE_FILE "athtcmd_ram.bin" #define AR6003_HW_2_0_PATCH_FILE "data.patch.bin" -#define AR6003_HW_2_0_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.bin" +#define AR6003_HW_2_0_BOARD_DATA_FILE AR6003_HW_2_0_FW_DIR "/bdata.bin" #define AR6003_HW_2_0_DEFAULT_BOARD_DATA_FILE \ - "ath6k/AR6003/hw2.0/bdata.SD31.bin" + AR6003_HW_2_0_FW_DIR "/bdata.SD31.bin" /* AR6003 3.0 definitions */ #define AR6003_HW_2_1_1_VERSION 0x30000582 @@ -139,25 +139,25 @@ struct ath6kl_fw_ie { #define AR6003_HW_2_1_1_UTF_FIRMWARE_FILE "utf.bin" #define AR6003_HW_2_1_1_TESTSCRIPT_FILE "nullTestFlow.bin" #define AR6003_HW_2_1_1_PATCH_FILE "data.patch.bin" -#define AR6003_HW_2_1_1_BOARD_DATA_FILE "ath6k/AR6003/hw2.1.1/bdata.bin" +#define AR6003_HW_2_1_1_BOARD_DATA_FILE AR6003_HW_2_1_1_FW_DIR "/bdata.bin" #define AR6003_HW_2_1_1_DEFAULT_BOARD_DATA_FILE \ - "ath6k/AR6003/hw2.1.1/bdata.SD31.bin" + AR6003_HW_2_1_1_FW_DIR "/bdata.SD31.bin" /* AR6004 1.0 definitions */ #define AR6004_HW_1_0_VERSION 0x30000623 #define AR6004_HW_1_0_FW_DIR "ath6k/AR6004/hw1.0" #define AR6004_HW_1_0_FIRMWARE_FILE "fw.ram.bin" -#define AR6004_HW_1_0_BOARD_DATA_FILE "ath6k/AR6004/hw1.0/bdata.bin" +#define AR6004_HW_1_0_BOARD_DATA_FILE AR6004_HW_1_0_FW_DIR "/bdata.bin" #define AR6004_HW_1_0_DEFAULT_BOARD_DATA_FILE \ - "ath6k/AR6004/hw1.0/bdata.DB132.bin" + AR6004_HW_1_0_FW_DIR "/bdata.DB132.bin" /* AR6004 1.1 definitions */ #define AR6004_HW_1_1_VERSION 0x30000001 #define AR6004_HW_1_1_FW_DIR "ath6k/AR6004/hw1.1" #define AR6004_HW_1_1_FIRMWARE_FILE "fw.ram.bin" -#define AR6004_HW_1_1_BOARD_DATA_FILE "ath6k/AR6004/hw1.1/bdata.bin" +#define AR6004_HW_1_1_BOARD_DATA_FILE AR6004_HW_1_1_FW_DIR "/bdata.bin" #define AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE \ - "ath6k/AR6004/hw1.1/bdata.DB132.bin" + AR6004_HW_1_1_FW_DIR "/bdata.DB132.bin" /* Per STA data, used in AP mode */ #define STA_PS_AWAKE BIT(0) -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 3+ messages in thread
[parent not found: <1334337448-26270-2-git-send-email-tim.gardner-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>]
* Re: [PATCH linux-next 1/1] ath6k: Normalize use of FW_DIR [not found] ` <1334337448-26270-2-git-send-email-tim.gardner-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> @ 2012-04-16 6:39 ` Kalle Valo 2012-04-16 16:42 ` Tim Gardner 0 siblings, 1 reply; 3+ messages in thread From: Kalle Valo @ 2012-04-16 6:39 UTC (permalink / raw) To: Tim Gardner Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, John W. Linville, linux-wireless-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA, ath6kl-devel On 04/13/2012 08:17 PM, Tim Gardner wrote: > Cc: Kalle Valo <kvalo-A+ZNKFmMK5xy9aJCnZT0Uw@public.gmane.org> > Cc: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org> > Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Signed-off-by: Tim Gardner <tim.gardner-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> Thanks, applied to ath6kl.git. But ar6004 hw1.2 supports wasn't in linux-next yet so I changed it as well. If you can, please check my changes: https://github.com/kvalo/ath6kl/commit/2023dbb8310ab39ac1119a32ef52405f7a73f51f Kalle -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH linux-next 1/1] ath6k: Normalize use of FW_DIR 2012-04-16 6:39 ` Kalle Valo @ 2012-04-16 16:42 ` Tim Gardner 0 siblings, 0 replies; 3+ messages in thread From: Tim Gardner @ 2012-04-16 16:42 UTC (permalink / raw) To: Kalle Valo Cc: linux-kernel, John W. Linville, linux-wireless, netdev, ath6kl-devel On 04/16/2012 12:39 AM, Kalle Valo wrote: > On 04/13/2012 08:17 PM, Tim Gardner wrote: >> Cc: Kalle Valo <kvalo@qca.qualcomm.com> >> Cc: "John W. Linville" <linville@tuxdriver.com> >> Cc: linux-wireless@vger.kernel.org >> Cc: netdev@vger.kernel.org >> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > > Thanks, applied to ath6kl.git. But ar6004 hw1.2 supports wasn't in > linux-next yet so I changed it as well. If you can, please check my changes: > > https://github.com/kvalo/ath6kl/commit/2023dbb8310ab39ac1119a32ef52405f7a73f51f > > Kalle Looks good to me. rtg -- Tim Gardner tim.gardner@canonical.com ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-16 16:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1334337448-26270-1-git-send-email-tim.gardner@canonical.com>
2012-04-13 17:17 ` [PATCH linux-next 1/1] ath6k: Normalize use of FW_DIR Tim Gardner
[not found] ` <1334337448-26270-2-git-send-email-tim.gardner-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2012-04-16 6:39 ` Kalle Valo
2012-04-16 16:42 ` Tim Gardner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).