netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Garzik <jeff@garzik.org>
To: Laurent Pinchart <laurentp@cse-semaphore.com>
Cc: netdev@vger.kernel.org, Ben Dooks <ben-linux@fluff.org>
Subject: Re: [PATCH] dm9000: Support MAC address setting through platform data.
Date: Thu, 07 Aug 2008 02:24:34 -0400	[thread overview]
Message-ID: <489A9522.6090108@garzik.org> (raw)
In-Reply-To: <200807231741.53011.laurentp@cse-semaphore.com>

Laurent Pinchart wrote:
> The dm9000 driver reads the chip's MAC address from the attached EEPROM. When
> no EEPROM is present, or when the MAC address is invalid, it falls back to
> reading the address from the chip.
> 
> This patch lets platform code set the desired MAC address through platform
> data.
> 
> Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
> ---
>  drivers/net/dm9000.c   |    3 +++
>  include/linux/dm9000.h |    1 +
>  2 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
> index 864295e..6bc8924 100644
> --- a/drivers/net/dm9000.c
> +++ b/drivers/net/dm9000.c
> @@ -716,6 +716,11 @@ dm9000_probe(struct platform_device *pdev)
>  	for (i = 0; i < 6; i += 2)
>  		dm9000_read_eeprom(db, i / 2, ndev->dev_addr+i);
>  
> +	if (!is_valid_ether_addr(ndev->dev_addr) && pdata != NULL) {
> +		mac_src = "platform data";
> +		memcpy(ndev->dev_addr, pdata->dev_addr, 6);
> +	}
> +
>  	if (!is_valid_ether_addr(ndev->dev_addr)) {
>  		/* try reading from mac */
>  		
> diff --git a/include/linux/dm9000.h b/include/linux/dm9000.h
> index a375046..4fb49a4 100644
> --- a/include/linux/dm9000.h
> +++ b/include/linux/dm9000.h
> @@ -26,6 +26,7 @@
>  
>  struct dm9000_plat_data {
>  	unsigned int	flags;
> +	unsigned char	dev_addr[6];

applied



      parent reply	other threads:[~2008-08-07  6:24 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-23 15:41 [PATCH] dm9000: Support MAC address setting through platform data Laurent Pinchart
2008-07-25  9:05 ` Ben Dooks
2008-07-25  9:23   ` Laurent Pinchart
2008-08-07  6:24 ` Jeff Garzik [this message]

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=489A9522.6090108@garzik.org \
    --to=jeff@garzik.org \
    --cc=ben-linux@fluff.org \
    --cc=laurentp@cse-semaphore.com \
    --cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).