From patchwork Fri Oct 19 03:55:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 1616351 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by patchwork2.kernel.org (Postfix) with ESMTP id 25F8DDF26F for ; Fri, 19 Oct 2012 03:59:52 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id q9J3xpkk031503 for ; Thu, 18 Oct 2012 22:59:51 -0500 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q9J3xpK1012798 for ; Thu, 18 Oct 2012 22:59:51 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Thu, 18 Oct 2012 22:59:50 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id q9J3xod1014496 for ; Thu, 18 Oct 2012 22:59:50 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id D4FCE80627 for ; Thu, 18 Oct 2012 22:59:50 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 3340080626 for ; Thu, 18 Oct 2012 22:59:40 -0500 (CDT) Received: from white.ext.ti.com (white.ext.ti.com [192.94.93.38]) by dflp52.itg.ti.com (8.13.7/8.13.8) with ESMTP id q9J3xdXq027866 for ; Thu, 18 Oct 2012 22:59:39 -0500 (CDT) Received: from psmtp.com (na3sys009amx164.postini.com [74.125.149.90]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id q9J3xcun021809 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 18 Oct 2012 22:59:39 -0500 Received: from labridge.com ([206.117.179.246]) (using SSLv3) by na3sys009amx164.postini.com ([74.125.148.10]) with SMTP; Thu, 18 Oct 2012 20:59:39 PDT Received: from [173.51.221.202] (account joe@perches.com HELO joe-laptop.perches.com) by labridge.com (CommuniGate Pro SMTP 5.0.14) with ESMTPA id 19746958; Thu, 18 Oct 2012 20:59:38 -0700 From: Joe Perches To: Sekhar Nori , Kevin Hilman , Eric Miao , Russell King , Haojian Zhuang Subject: [PATCH net-next 03/21] arch: Convert is__ether_addr uses to eth_addr_ Date: Thu, 18 Oct 2012 20:55:34 -0700 Message-ID: <58e119fbf38f7559473930089a642ed57d118459.1350618009.git.joe@perches.com> X-Mailer: git-send-email 1.7.8.111.gad25c.dirty In-Reply-To: References: X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-dkim: 0 skipped:not-enabled X-pstn-settings: 2 (0.5000:0.5000) s cv gt3 gt2 gt1 r p m c X-pstn-addresses: from [82/3] CC: , , , Richard Weinberger , Jeff Dike , , Ralf Baechle , , Haavard Skinnemoen , , Hans-Christian Egtvedt X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com Convert the old ether_addr tests to eth_addr_. Adds api consistency. Signed-off-by: Joe Perches --- arch/arm/mach-davinci/board-mityomapl138.c | 2 +- arch/arm/mach-pxa/colibri-pxa3xx.c | 2 +- arch/avr32/boards/atngw100/setup.c | 2 +- arch/avr32/boards/atstk1000/atstk1002.c | 2 +- arch/avr32/boards/favr-32/setup.c | 2 +- arch/avr32/boards/hammerhead/setup.c | 2 +- arch/avr32/boards/merisc/setup.c | 2 +- arch/avr32/boards/mimc200/setup.c | 2 +- arch/mips/alchemy/common/platform.c | 4 ++-- arch/um/drivers/net_kern.c | 6 +++--- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index 43e4a0d..df45c9c 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -138,7 +138,7 @@ static void read_factory_config(struct memory_accessor *a, void *context) } pr_info("MityOMAPL138: Found MAC = %pM\n", factory_config.mac); - if (is_valid_ether_addr(factory_config.mac)) + if (eth_addr_valid(factory_config.mac)) memcpy(soc_info->emac_pdata->mac_addr, factory_config.mac, ETH_ALEN); else diff --git a/arch/arm/mach-pxa/colibri-pxa3xx.c b/arch/arm/mach-pxa/colibri-pxa3xx.c index 8240291..839040c 100644 --- a/arch/arm/mach-pxa/colibri-pxa3xx.c +++ b/arch/arm/mach-pxa/colibri-pxa3xx.c @@ -52,7 +52,7 @@ void __init colibri_pxa3xx_init_eth(struct ax_plat_data *plat_data) serial >>= 8; } - if (is_valid_ether_addr(ether_mac_addr)) { + if (eth_addr_valid(ether_mac_addr)) { plat_data->flags |= AXFLG_MAC_FROMPLATFORM; plat_data->mac_addr = ether_mac_addr; printk(KERN_INFO "%s(): taking MAC from serial boot tag\n", diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c index afeae89..5f7d86d 100644 --- a/arch/avr32/boards/atngw100/setup.c +++ b/arch/avr32/boards/atngw100/setup.c @@ -175,7 +175,7 @@ static void __init set_hw_addr(struct platform_device *pdev) return; addr = hw_addr[pdev->id].addr; - if (!is_valid_ether_addr(addr)) + if (!eth_addr_valid(addr)) return; /* diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index 6c80aba..7334686 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c @@ -189,7 +189,7 @@ static void __init set_hw_addr(struct platform_device *pdev) return; addr = hw_addr[pdev->id].addr; - if (!is_valid_ether_addr(addr)) + if (!eth_addr_valid(addr)) return; /* diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c index 27bd6fb..0b76aa7 100644 --- a/arch/avr32/boards/favr-32/setup.c +++ b/arch/avr32/boards/favr-32/setup.c @@ -196,7 +196,7 @@ static void __init set_hw_addr(struct platform_device *pdev) return; addr = hw_addr[pdev->id].addr; - if (!is_valid_ether_addr(addr)) + if (!eth_addr_valid(addr)) return; /* diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c index 9d1efd1..d64fa9f 100644 --- a/arch/avr32/boards/hammerhead/setup.c +++ b/arch/avr32/boards/hammerhead/setup.c @@ -139,7 +139,7 @@ static void __init set_hw_addr(struct platform_device *pdev) addr = hw_addr[pdev->id].addr; - if (!is_valid_ether_addr(addr)) + if (!eth_addr_valid(addr)) return; /* diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c index ed137e3..817d2d8 100644 --- a/arch/avr32/boards/merisc/setup.c +++ b/arch/avr32/boards/merisc/setup.c @@ -129,7 +129,7 @@ static void __init set_hw_addr(struct platform_device *pdev) return; addr = hw_addr[pdev->id].addr; - if (!is_valid_ether_addr(addr)) + if (!eth_addr_valid(addr)) return; regs = (void __iomem __force *)res->start; diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c index 05358aa..31cd87e 100644 --- a/arch/avr32/boards/mimc200/setup.c +++ b/arch/avr32/boards/mimc200/setup.c @@ -152,7 +152,7 @@ static void __init set_hw_addr(struct platform_device *pdev) return; addr = hw_addr[pdev->id].addr; - if (!is_valid_ether_addr(addr)) + if (!eth_addr_valid(addr)) return; /* diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c index c0f3ce6..5f07da3 100644 --- a/arch/mips/alchemy/common/platform.c +++ b/arch/mips/alchemy/common/platform.c @@ -343,7 +343,7 @@ static void __init alchemy_setup_macs(int ctype) au1xxx_eth0_device.resource = macres; i = prom_get_ethernet_addr(ethaddr); - if (!i && !is_valid_ether_addr(au1xxx_eth0_platform_data.mac)) + if (!i && !eth_addr_valid(au1xxx_eth0_platform_data.mac)) memcpy(au1xxx_eth0_platform_data.mac, ethaddr, 6); ret = platform_device_register(&au1xxx_eth0_device); @@ -364,7 +364,7 @@ static void __init alchemy_setup_macs(int ctype) au1xxx_eth1_device.resource = macres; ethaddr[5] += 1; /* next addr for 2nd MAC */ - if (!i && !is_valid_ether_addr(au1xxx_eth1_platform_data.mac)) + if (!i && !eth_addr_valid(au1xxx_eth1_platform_data.mac)) memcpy(au1xxx_eth1_platform_data.mac, ethaddr, 6); /* Register second MAC if enabled in pinfunc */ diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index b1314eb..47e11e7 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c @@ -312,19 +312,19 @@ static int setup_etheraddr(char *str, unsigned char *addr, char *name) } str = end + 1; } - if (is_multicast_ether_addr(addr)) { + if (eth_addr_multicast(addr)) { printk(KERN_ERR "Attempt to assign a multicast ethernet address to a " "device disallowed\n"); goto random; } - if (!is_valid_ether_addr(addr)) { + if (!eth_addr_valid(addr)) { printk(KERN_ERR "Attempt to assign an invalid ethernet address to a " "device disallowed\n"); goto random; } - if (!is_local_ether_addr(addr)) { + if (!eth_addr_local(addr)) { printk(KERN_WARNING "Warning: Assigning a globally valid ethernet " "address to a device\n");