From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:9458 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753677AbbEUJaI (ORCPT ); Thu, 21 May 2015 05:30:08 -0400 Message-ID: <555DA59E.6080305@broadcom.com> (sfid-20150521_113014_451902_AE09A1D5) Date: Thu, 21 May 2015 11:30:06 +0200 From: Arend van Spriel MIME-Version: 1.0 To: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= CC: Kalle Valo , linux-wireless , Hante Meuleman , "linux-mips@linux-mips.org" , Hauke Mehrtens Subject: Re: [PATCH 6/6] brcmfmac: Add support for host platform NVRAM loading. References: <1432123792-4155-1-git-send-email-arend@broadcom.com> <1432123792-4155-7-git-send-email-arend@broadcom.com> <555DA529.6000901@broadcom.com> In-Reply-To: <555DA529.6000901@broadcom.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: On 05/21/15 11:28, Arend van Spriel wrote: > On 05/21/15 10:28, Rafał Miłecki wrote: >> On 20 May 2015 at 16:33, Rafał Miłecki wrote: >>> I think the best way for achieving this is to rework your patch to >>> modify include/linux/bcm47xx_nvram.h. You could modify it the same way >>> you did in your patch for MIPS tree, except for >>> bcm47xx_nvram_get_contents. Don't implement this function for real (in >>> .c file), but instead make in dummy inline in a bcm47xx_nvram.h like: >>> static inline char *bcm47xx_nvram_get_contents(size_t *val_len) >>> { >>> /* TODO: Implement in .c file */ >>> return NULL; >>> } >> >> One more note. >> This of course will lead to conflict at some point, but I believe >> Linus will handle it. > > I prefer to avoid tricks so I will ask to drop this patch and wait for > it to land in the next kernel, ie. 4.2, and resubmit this patch for 4.3. > I am not in a hurry. The 'it' in 'wait for it to land' being the mips patch providing the new api function. I will submit a v2 for that one. Regards, Arend > Regards, > Arend