On Wed, Feb 12, 2014 at 9:19 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi John,
>
> After merging the wireless-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/staging/rtl8821ae/rc.c:289:2: error: unknown field 'module' specified in initializer
> .module = NULL,
> ^
>
> Caused by commit cc01f9b55fe7 ("mac80211: remove module handling from
> rate control ops") interacting with commit 3c05bedb5fef ("Staging:
> rtl8812ae: Add Realtek 8821 PCI WIFI driver") which entered Linus' tree
> before v3.14-rc1.
It seems this new driver has multiple issues; I'm seeing this on sparc32
allmodconfig builds.
In file included from drivers/staging/rtl8821ae/btcoexist/halbt_precomp.h:31:0,
from drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.c:14:
drivers/staging/rtl8821ae/btcoexist/../pci.h:290:15: error: expected
'=', ',', ';', 'asm' or '__attribute__' before 'rtl_pci_probe'
make[3]: *** [drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.o] Error 1
make[3]: *** Waiting for unfinished jobs....
It looks like a mangled version check which is allowing it to try and use
__devinit on the rtl_pci_probe function, but of course __devinit is gone.
Ideally all that version check stuff should be gutted.
Paul.
--
>
> I added this merge fix patch and can carry it as necessary (John, if you
> back merge v3.14-rc1, you should include this patch in the merge commit):
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Thu, 13 Feb 2014 13:14:13 +1100
> Subject: [PATCH] Staging: rtl8812ae: remove modules field of rate_control_ops
>
> This has been removed in further work.
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> drivers/staging/rtl8821ae/rc.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/staging/rtl8821ae/rc.c b/drivers/staging/rtl8821ae/rc.c
> index d387f13ea7dc..0cc32c60ddee 100644
> --- a/drivers/staging/rtl8821ae/rc.c
> +++ b/drivers/staging/rtl8821ae/rc.c
> @@ -286,7 +286,6 @@ static void rtl_rate_free_sta(void *rtlpriv,
> }
>
> static struct rate_control_ops rtl_rate_ops = {
> - .module = NULL,
> .name = "rtl_rc",
> .alloc = rtl_rate_alloc,
> .free = rtl_rate_free,
> --
> 1.9.rc1
>
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
