change functions containing 'mac' or 'enet' in its name to 'ethaddr'.

change the parameter name for ethernet devices to 'ethaddr' aswell.

6 files changed, 26 insertions, 26 deletions

diff --git a/drivers/net/at91_ether.c b/drivers/net/at91_ether.c
index 591ae4acf1..6c1404b6f0 100644
--- a/drivers/net/at91_ether.c
+++ b/drivers/net/at91_ether.c
@@ -236,13 +236,13 @@ int at91rm9200_miiphy_initialize(void)
 	return 0;
 }
 
-static int at91rm9200_get_mac_address(struct eth_device *eth, unsigned char *adr)
+static int at91rm9200_get_ethaddr(struct eth_device *eth, unsigned char *adr)
 {
 	/* We have no eeprom */
 	return -1;
 }
 
-static int at91rm9200_set_mac_address(struct eth_device *eth, unsigned char *adr)
+static int at91rm9200_set_ethaddr(struct eth_device *eth, unsigned char *adr)
 {
 	int i;
 
@@ -271,8 +271,8 @@ static int at91rm9200_eth_init (struct device_d *dev)
 	edev->send = at91rm9200_eth_send;
 	edev->recv = at91rm9200_eth_rx;
 	edev->halt = at91rm9200_eth_halt;
-	edev->get_mac_address = at91rm9200_get_mac_address;
-	edev->set_mac_address = at91rm9200_set_mac_address;
+	edev->get_ethaddr = at91rm9200_get_ethaddr;
+	edev->set_ethaddr = at91rm9200_set_ethaddr;
 
 	p_mac = AT91C_BASE_EMAC;
 
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 6db36ad77e..876b77cd5a 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -431,7 +431,7 @@ static u16 read_srom_word(struct dm9000_priv *priv, int offset)
 	return (DM9000_ior(priv, DM9000_EPDRL) + (DM9000_ior(priv, DM9000_EPDRH) << 8));
 }
 
-static int dm9000_get_mac_address(struct eth_device *edev, unsigned char *adr)
+static int dm9000_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 {
 	struct dm9000_priv *priv = (struct dm9000_priv *)edev->priv;
 	int i;
@@ -442,12 +442,12 @@ static int dm9000_get_mac_address(struct eth_device *edev, unsigned char *adr)
         return 0;
 }
 
-static int dm9000_set_mac_address(struct eth_device *edev, unsigned char *adr)
+static int dm9000_set_ethaddr(struct eth_device *edev, unsigned char *adr)
 {
 	struct dm9000_priv *priv = (struct dm9000_priv *)edev->priv;
 	int i, oft;
 
-	debug("dm9000_set_mac_address\n");
+	debug("%s\n", __FUNCTION__);
 
 	for (i = 0, oft = 0x10; i < 6; i++, oft++)
 		DM9000_iow(priv, oft, adr[i]);
@@ -499,8 +499,8 @@ static int dm9000_probe(struct device_d *dev)
 	edev->send = dm9000_eth_send;
 	edev->recv = dm9000_eth_rx;
 	edev->halt = dm9000_eth_halt;
-	edev->get_mac_address = dm9000_get_mac_address;
-	edev->set_mac_address = dm9000_set_mac_address;
+	edev->get_ethaddr = dm9000_get_ethaddr;
+	edev->set_ethaddr = dm9000_set_ethaddr;
 
 	/* RESET device */
 	dm9000_reset(priv);
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index b58cfda423..41c191f812 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -210,13 +210,13 @@ static void mpc5xxx_fec_tbd_scrub(mpc5xxx_fec_priv *fec)
 	}
 }
 
-static int mpc5xxx_fec_get_hwaddr(struct eth_device *dev, unsigned char *mac)
+static int mpc5xxx_fec_get_ethaddr(struct eth_device *dev, unsigned char *mac)
 {
 	/* no eeprom */
 	return -1;
 }
 
-static int mpc5xxx_fec_set_hwaddr(struct eth_device *dev, unsigned char *mac)
+static int mpc5xxx_fec_set_ethaddr(struct eth_device *dev, unsigned char *mac)
 {
 	mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv;
 	uint8 currByte;			/* byte for which to compute the CRC */
@@ -682,8 +682,8 @@ int mpc5xxx_fec_probe(struct device_d *dev)
 	edev->send = mpc5xxx_fec_send,
 	edev->recv = mpc5xxx_fec_recv,
 	edev->halt = mpc5xxx_fec_halt,
-	edev->get_mac_address = mpc5xxx_fec_get_hwaddr,
-	edev->set_mac_address = mpc5xxx_fec_set_hwaddr,
+	edev->get_ethaddr = mpc5xxx_fec_ethaddr,
+	edev->set_ethaddr = mpc5xxx_fec_ethaddr,
 
 	fec->eth = (ethernet_regs *)dev->map_base;
 	fec->tbdBase = (FEC_TBD *)FEC_BD_BASE;
diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c
index 5139bdbeec..02fd4d381a 100644
--- a/drivers/net/netx_eth.c
+++ b/drivers/net/netx_eth.c
@@ -202,18 +202,18 @@ static void netx_eth_halt (struct eth_device *edev)
 {
 }
 
-static int netx_eth_get_mac_address(struct eth_device *edev, unsigned char *adr)
+static int netx_eth_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 {
 	/* FIXME: get from crypto flash */
         return -1;
 }
 
-static int netx_eth_set_mac_address(struct eth_device *edev, unsigned char *adr)
+static int netx_eth_set_ethaddr(struct eth_device *edev, unsigned char *adr)
 {
 	struct netx_eth_priv *priv = (struct netx_eth_priv *)edev->priv;
 	int xcno = priv->xcno;
 
-	debug("netx_eth_set_mac_address\n");
+	debug("%s\n", __FUNCTION__);
 
 	/* set MAC address */
 	XMAC_REG(xcno, XMAC_RPU_HOLD_PC) = RPU_HOLD_PC;
@@ -257,8 +257,8 @@ static int netx_eth_probe(struct device_d *dev)
 	edev->send = netx_eth_send;
 	edev->recv = netx_eth_rx;
 	edev->halt = netx_eth_halt;
-	edev->get_mac_address = netx_eth_get_mac_address;
-	edev->set_mac_address = netx_eth_set_mac_address;
+	edev->get_ethaddr = netx_eth_get_ethaddr;
+	edev->set_ethaddr = netx_eth_set_ethaddr;
 
 	priv->miiphy.read = netx_miiphy_read;
 	priv->miiphy.write = netx_miiphy_write;
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index df1b9d7f41..32cb683085 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -424,7 +424,7 @@ static void smc911x_set_mac_csr(struct eth_device *edev, u8 reg, u32 data)
 	smc911x_mac_wait_busy(priv);
 }
 
-static int smc911x_get_mac_address(struct eth_device *edev, unsigned char *m)
+static int smc911x_get_ethaddr(struct eth_device *edev, unsigned char *m)
 {
 	unsigned long addrh, addrl;
 
@@ -445,7 +445,7 @@ static int smc911x_get_mac_address(struct eth_device *edev, unsigned char *m)
 	return 0;
 }
 
-static int smc911x_set_mac_address(struct eth_device *edev, unsigned char *m)
+static int smc911x_set_ethaddr(struct eth_device *edev, unsigned char *m)
 {
 	unsigned long addrh, addrl;
 
@@ -719,8 +719,8 @@ static int smc911x_probe(struct device_d *dev)
 	edev->send = smc911x_eth_send;
 	edev->recv = smc911x_eth_rx;
 	edev->halt = smc911x_eth_halt;
-	edev->get_mac_address = smc911x_get_mac_address;
-	edev->set_mac_address = smc911x_set_mac_address;
+	edev->get_ethaddr = smc911x_get_ethaddr;
+	edev->set_ethaddr = smc911x_set_ethaddr;
 
 	priv->miiphy.read = smc911x_phy_read;
 	priv->miiphy.write = smc911x_phy_write;
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 742122a70c..fa410974e4 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -63,12 +63,12 @@ void tap_eth_halt (struct eth_device *edev)
 	/* nothing to do here */
 }
 
-static int tap_get_mac_address(struct eth_device *edev, unsigned char *adr)
+static int tap_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 {
 	return -1;
 }
 
-static int tap_set_mac_address(struct eth_device *edev, unsigned char *adr)
+static int tap_set_ethaddr(struct eth_device *edev, unsigned char *adr)
 {
 	return 0;
 }
@@ -97,8 +97,8 @@ int tap_probe(struct device_d *dev)
 	edev->send = tap_eth_send;
 	edev->recv = tap_eth_rx;
 	edev->halt = tap_eth_halt;
-	edev->get_mac_address = tap_get_mac_address;
-	edev->set_mac_address = tap_set_mac_address;
+	edev->get_ethaddr = tap_get_ethaddr;
+	edev->set_ethaddr = tap_set_ethaddr;
 
 	eth_register(edev);