From mboxrd@z Thu Jan  1 00:00:00 1970
From: Simon Glass <sjg@chromium.org>
Date: Tue, 27 Jan 2015 19:34:08 -0700
Subject: [U-Boot] [RFC PATCH 2/7] net: Rename helper function to be more
	clear
In-Reply-To: <1422401245-8452-3-git-send-email-joe.hershberger@ni.com>
References: <1422401245-8452-1-git-send-email-joe.hershberger@ni.com>
	<1422401245-8452-3-git-send-email-joe.hershberger@ni.com>
Message-ID: <CAPnjgZ1mcbWq9uStdhd0VPy3scbvLy+=qkA2D0X_jG2N0jwo5w@mail.gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 27 January 2015 at 16:27, Joe Hershberger <joe.hershberger@ni.com> wrote:
> Make it clear that the helper is checking the addr, not setting it.
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> ---
>
>  net/eth.c | 13 ++++---------
>  1 file changed, 4 insertions(+), 9 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

>
> diff --git a/net/eth.c b/net/eth.c
> index eac4f7b..65e8c77 100644
> --- a/net/eth.c
> +++ b/net/eth.c
> @@ -153,11 +153,6 @@ static void eth_current_changed(void)
>                 setenv("ethact", NULL);
>  }
>
> -static int eth_address_set(unsigned char *addr)
> -{
> -       return memcmp(addr, "\0\0\0\0\0\0", 6);
> -}
> -
>  int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
>                    int eth_number)
>  {
> @@ -166,9 +161,9 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
>
>         eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr);
>
> -       if (eth_address_set(env_enetaddr)) {
> -               if (eth_address_set(dev->enetaddr) &&
> -                               memcmp(dev->enetaddr, env_enetaddr, 6)) {
> +       if (!is_zero_ether_addr(env_enetaddr)) {
> +               if (!is_zero_ether_addr(dev->enetaddr) &&
> +                   memcmp(dev->enetaddr, env_enetaddr, 6)) {
>                         printf("\nWarning: %s MAC addresses don't match:\n",
>                                 dev->name);
>                         printf("Address in SROM is         %pM\n",
> @@ -183,7 +178,7 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
>                                              dev->enetaddr);
>                 printf("\nWarning: %s using MAC address from net device\n",
>                         dev->name);
> -       } else if (!(eth_address_set(dev->enetaddr))) {
> +       } else if (is_zero_ether_addr(dev->enetaddr)) {
>                 printf("\nError: %s address not set.\n",
>                        dev->name);
>                 return -EINVAL;
> --
> 1.7.11.5
>