[PATCH 1/2] drivers/net/au1000_eth.c: Remove misuse of DECLARE_MAC_BUF

[PATCH 1/2] drivers/net/au1000_eth.c: Remove misuse of DECLARE_MAC_BUF

[Joe Perches]

And use a directly declared buffer.

It's used in a call to prom_get_ethernet_addr to
get a 6 byte address, not a formatted output string.

Signed-off-by: Joe Perches <joe@perches.com>

diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 1acf2c1..af271fa 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -1006,7 +1006,7 @@ static int __devinit au1000_probe(struct platform_device *pdev)
 	db_dest_t *pDB, *pDBfree;
 	int irq, i, err = 0;
 	struct resource *base, *macen;
-	DECLARE_MAC_BUF(ethaddr);
+	char ethaddr[ETH_ALEN];
 
 	base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!base) {

[PATCH 2/2] include/linux/if_ether.h: Remove unused defines MAC_BUF_SIZE and DECLARE_MAC_BUF

[Joe Perches]

Signed-off-by: Joe Perches <joe@perches.com>

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 005e152..299b412 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -137,8 +137,6 @@ extern struct ctl_table ether_table[];
 extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);
 
 #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_BUF_SIZE	18
-#define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE]
 
 #endif
 

Re: [PATCH 1/2] drivers/net/au1000_eth.c: Remove misuse of DECLARE_MAC_BUF

[David Miller]

From: Joe Perches <joe@perches.com>
Date: Sun, 06 Dec 2009 12:32:43 -0800

> And use a directly declared buffer.
> 
> It's used in a call to prom_get_ethernet_addr to
> get a 6 byte address, not a formatted output string.
> 
> Signed-off-by: Joe Perches <joe@perches.com>

This DECLARE_MAC_BUF reference is already moved in the tree.

Re: [PATCH 2/2] include/linux/if_ether.h: Remove unused defines MAC_BUF_SIZE and DECLARE_MAC_BUF

[David Miller]

From: Joe Perches <joe@perches.com>
Date: Sun, 06 Dec 2009 12:35:30 -0800

> Signed-off-by: Joe Perches <joe@perches.com>

Applied, thanks Joe.