From: Sergei Shtylyov <sshtylyov@mvista.com>
To: Florian Fainelli <florian@openwrt.org>
Cc: ralf@linux-mips.org, linux-mips@linux-mips.org
Subject: Re: [PATCH] MIPS: BCM63XX: generate WLAN MAC address after registering ethernet devices.
Date: Thu, 17 Nov 2011 15:56:42 +0400 [thread overview]
Message-ID: <4EC4F67A.2030407@mvista.com> (raw)
In-Reply-To: <1321476598-9450-1-git-send-email-florian@openwrt.org>
Hello.
On 17-11-2011 0:49, Florian Fainelli wrote:
> In case the MAC address pool is not big enough to also register a WLAN device
> prefer registering the Ethernet devices.
> Signed-off-by: Florian Fainelli<florian@openwrt.org>
> ---
> arch/mips/bcm63xx/boards/board_bcm963xx.c | 25 +++++++++++++------------
> 1 files changed, 13 insertions(+), 12 deletions(-)
> diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> index ac948c2..fcd5a8c 100644
> --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> @@ -791,18 +791,6 @@ void __init board_prom_init(void)
> }
>
> bcm_gpio_writel(val, GPIO_MODE_REG);
> -
> - /* Generate MAC address for WLAN and
> - * register our SPROM */
> -#ifdef CONFIG_SSB_PCIHOST
> - if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
> - memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
> - memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
> - if (ssb_arch_register_fallback_sprom(
> - &bcm63xx_get_fallback_sprom)< 0)
> - printk(KERN_ERR PFX "failed to register fallback SPROM\n");
> - }
> -#endif
> }
>
> /*
> @@ -886,6 +874,19 @@ int __init board_register_devices(void)
> if (board.has_dsp)
> bcm63xx_dsp_register(&board.dsp);
>
> + /* Generate MAC address for WLAN and register our SPROM,
> + * do this after registering enet devices
> + */
> +#ifdef CONFIG_SSB_PCIHOST
> + if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
> + memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
> + memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
> + if (ssb_arch_register_fallback_sprom(
> + &bcm63xx_get_fallback_sprom) < 0)
Please keep the old indentation. This one makes the code harder to read.
> + pr_err(PFX "failed to register fallback SPROM\n");
> + }
> +#endif
> +
> /* read base address of boot chip select (0) */
> val = bcm_mpi_readl(MPI_CSBASE_REG(0));
> val&= MPI_CSBASE_BASE_MASK;
WBR, Sergei
next prev parent reply other threads:[~2011-11-17 11:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-16 20:49 [PATCH] MIPS: BCM63XX: generate WLAN MAC address after registering ethernet devices Florian Fainelli
2011-11-17 11:56 ` Sergei Shtylyov [this message]
2011-11-17 14:06 ` Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EC4F67A.2030407@mvista.com \
--to=sshtylyov@mvista.com \
--cc=florian@openwrt.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox