Return-path: Received: from mail-oa0-f54.google.com ([209.85.219.54]:46812 "EHLO mail-oa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750941AbaFDQLr (ORCPT ); Wed, 4 Jun 2014 12:11:47 -0400 Message-ID: <538F4540.9080002@lwfinger.net> (sfid-20140604_181155_962802_489BF4BC) Date: Wed, 04 Jun 2014 11:11:44 -0500 From: Larry Finger MIME-Version: 1.0 To: Jes Sorensen CC: Ben Hutchings , dwmw2@infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [PATCH] rtlwifi: Add firmware for r8723au References: <1388709729-28496-1-git-send-email-Larry.Finger@lwfinger.net> <1390174519.3651.3.camel@deadeye.wl.decadent.org.uk> <1401833651.2412.35.camel@deadeye.wl.decadent.org.uk> In-Reply-To: <1401833651.2412.35.camel@deadeye.wl.decadent.org.uk> Content-Type: text/plain; charset=UTF-8; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: On 06/03/2014 05:14 PM, Ben Hutchings wrote: > On Sun, 2014-01-19 at 23:35 +0000, Ben Hutchings wrote: >> On Thu, 2014-01-02 at 18:42 -0600, Larry Finger wrote: >>> This firmware is for a driver that will soon be submitted to the kernel. >>> It occurs as data statements in Realtek driver rtl8723A_WiFi_linux_v4.1.3_6044.20121224. >>> >>> Signed-off-by: Larry Finger >>> --- >>> WHENCE | 13 +++++++++++++ >>> rtlwifi/rtl8723aufw_A.bin | Bin 0 -> 22172 bytes >>> rtlwifi/rtl8723aufw_B.bin | Bin 0 -> 24118 bytes >>> rtlwifi/rtl8723aufw_B_NoBT.bin | Bin 0 -> 19200 bytes >>> 4 files changed, 13 insertions(+) >>> create mode 100644 rtlwifi/rtl8723aufw_A.bin >>> create mode 100644 rtlwifi/rtl8723aufw_B.bin >>> create mode 100644 rtlwifi/rtl8723aufw_B_NoBT.bin >> [...] >> >> Applied, thanks. > > I just noticed that the driver in Linux 3.15 seems to ask for > rtlwifi/rtl8723aufw.bin and not rtlwifi/rtl8723aufw_A.bin. You'll need > to change the filename on one side or the other. Jes, As Ben points out, I messed up the firmware names, and one of them needs to be changed. Keeping the name "rtlwifi/rtl8723aufw_A.bin" would retain a certain amount of symmetry, but is may be easier to retain "rtlwifi/rtl8723aufw.bin" in the code. A third option would be to try for one of the names and fall back to the other if it fails. What do you think? In any case, we need additional MODULE_FIRMWARE macros for the other two firmware files. Larry