From 1dd5262eb950210a77a01d79327d2fbadae65f86 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 26 Jun 2015 11:55:05 +0200
Subject: net: Make set_ethaddr argument const

The set_ethaddr callback should not modify the MAC address passed to it, so
make it const.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/net/altera_tse.c   | 2 +-
 drivers/net/ar231x.c       | 2 +-
 drivers/net/arc_emac.c     | 2 +-
 drivers/net/at91_ether.c   | 2 +-
 drivers/net/cpsw.c         | 2 +-
 drivers/net/cs8900.c       | 2 +-
 drivers/net/davinci_emac.c | 2 +-
 drivers/net/designware.c   | 2 +-
 drivers/net/dm9k.c         | 2 +-
 drivers/net/ep93xx.c       | 2 +-
 drivers/net/ethoc.c        | 2 +-
 drivers/net/fec_imx.c      | 2 +-
 drivers/net/fec_mpc5200.c  | 2 +-
 drivers/net/gianfar.c      | 2 +-
 drivers/net/ks8851_mll.c   | 2 +-
 drivers/net/macb.c         | 2 +-
 drivers/net/mvneta.c       | 2 +-
 drivers/net/netx_eth.c     | 2 +-
 drivers/net/orion-gbe.c    | 2 +-
 drivers/net/rtl8139.c      | 2 +-
 drivers/net/rtl8169.c      | 2 +-
 drivers/net/smc91111.c     | 2 +-
 drivers/net/smc911x.c      | 2 +-
 drivers/net/tap.c          | 2 +-
 drivers/net/usb/asix.c     | 2 +-
 drivers/net/usb/smsc95xx.c | 2 +-
 drivers/net/xgmac.c        | 2 +-
 include/net.h              | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 385a7150ba..a1863655fa 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -231,7 +231,7 @@ static int tse_get_ethaddr(struct eth_device *edev, unsigned char *m)
 	return 0;
 }
 
-static int tse_set_ethaddr(struct eth_device *edev, unsigned char *m)
+static int tse_set_ethaddr(struct eth_device *edev, const unsigned char *m)
 {
 	struct altera_tse_priv *priv = edev->priv;
 	struct alt_tse_mac *mac_dev = priv->tse_regs;
diff --git a/drivers/net/ar231x.c b/drivers/net/ar231x.c
index 48e4b30fd6..7447c4484d 100644
--- a/drivers/net/ar231x.c
+++ b/drivers/net/ar231x.c
@@ -70,7 +70,7 @@ static void ar231x_reset_bit_(struct ar231x_eth_priv *priv,
 		(*priv->reset_bit)(val, state);
 }
 
-static int ar231x_set_ethaddr(struct eth_device *edev, unsigned char *addr);
+static int ar231x_set_ethaddr(struct eth_device *edev, const unsigned char *addr);
 static void ar231x_reset_regs(struct eth_device *edev)
 {
 	struct ar231x_eth_priv *priv = edev->priv;
diff --git a/drivers/net/arc_emac.c b/drivers/net/arc_emac.c
index 84e2c75c5e..3dc54cd22b 100644
--- a/drivers/net/arc_emac.c
+++ b/drivers/net/arc_emac.c
@@ -332,7 +332,7 @@ static int arc_emac_get_ethaddr(struct eth_device *edev, unsigned char *mac)
 	return -1;
 }
 
-static int arc_emac_set_ethaddr(struct eth_device *edev, unsigned char *mac)
+static int arc_emac_set_ethaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct arc_emac_priv *priv = edev->priv;
 	unsigned int addr_low, addr_hi;
diff --git a/drivers/net/at91_ether.c b/drivers/net/at91_ether.c
index 5a74837f65..523e35590b 100644
--- a/drivers/net/at91_ether.c
+++ b/drivers/net/at91_ether.c
@@ -261,7 +261,7 @@ static int at91_ether_get_ethaddr(struct eth_device *eth, unsigned char *adr)
 	return -1;
 }
 
-static int at91_ether_set_ethaddr(struct eth_device *eth, unsigned char *adr)
+static int at91_ether_set_ethaddr(struct eth_device *eth, const unsigned char *adr)
 {
 	int i;
 
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index c0db96bb53..4d6b7b2e78 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -547,7 +547,7 @@ static int cpsw_get_hwaddr(struct eth_device *edev, unsigned char *mac)
 	return -1;
 }
 
-static int cpsw_set_hwaddr(struct eth_device *edev, unsigned char *mac)
+static int cpsw_set_hwaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct cpsw_slave *slave = edev->priv;
 	struct cpsw_priv *priv = slave->cpsw;
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index dccb808f95..a4a5dcaf7f 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -341,7 +341,7 @@ static int cs8900_get_ethaddr(struct eth_device *dev, unsigned char *mac)
 	return 0;
 }
 
-static int cs8900_set_ethaddr(struct eth_device *dev, unsigned char *mac)
+static int cs8900_set_ethaddr(struct eth_device *dev, const unsigned char *mac)
 {
 	struct cs8900_priv *priv = (struct cs8900_priv *)dev->priv;
 	int i;
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 056ffe28bc..9f8f0e1fa7 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -178,7 +178,7 @@ static int davinci_emac_get_ethaddr(struct eth_device *edev, unsigned char *adr)
  * This function must be called before emac_open() if you want to override
  * the default mac address.
  */
-static int davinci_emac_set_ethaddr(struct eth_device *edev, unsigned char *addr)
+static int davinci_emac_set_ethaddr(struct eth_device *edev, const unsigned char *addr)
 {
 	struct davinci_emac_priv *priv = edev->priv;
 	int i;
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 213fe41359..800652760a 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -384,7 +384,7 @@ static int dwc_ether_get_ethaddr(struct eth_device *dev, u8 adr[6])
 	return -1;
 }
 
-static int dwc_ether_set_ethaddr(struct eth_device *dev, u8 adr[6])
+static int dwc_ether_set_ethaddr(struct eth_device *dev, const unsigned char *adr)
 {
 	struct dw_eth_dev *priv = dev->priv;
 	struct eth_mac_regs *mac_p = priv->mac_regs_p;
diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c
index c3c2a8052a..1f1938d977 100644
--- a/drivers/net/dm9k.c
+++ b/drivers/net/dm9k.c
@@ -711,7 +711,7 @@ static int dm9k_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 	return 0;
 }
 
-static int dm9k_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int dm9k_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	struct dm9k *priv = (struct dm9k *)edev->priv;
 	int i, oft;
diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c
index 4b73abff37..90c12fce75 100644
--- a/drivers/net/ep93xx.c
+++ b/drivers/net/ep93xx.c
@@ -466,7 +466,7 @@ static int ep93xx_eth_get_ethaddr(struct eth_device *edev,
 }
 
 static int ep93xx_eth_set_ethaddr(struct eth_device *edev,
-				unsigned char *mac_addr)
+				const unsigned char *mac_addr)
 {
 	struct mac_regs *regs = ep93xx_get_regs(edev);
 
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 7c52a09eaa..6bae7d68a6 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -435,7 +435,7 @@ static int ethoc_get_ethaddr(struct eth_device *edev, unsigned char *mac)
 	return 0;
 }
 
-static int ethoc_set_ethaddr(struct eth_device *edev, unsigned char *mac)
+static int ethoc_set_ethaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct ethoc *dev = edev->priv;
 
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 9a10c9f2e4..78ccb85376 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -249,7 +249,7 @@ static int fec_get_hwaddr(struct eth_device *dev, unsigned char *mac)
 	return -1;
 }
 
-static int fec_set_hwaddr(struct eth_device *dev, unsigned char *mac)
+static int fec_set_hwaddr(struct eth_device *dev, const unsigned char *mac)
 {
 	struct fec_priv *fec = (struct fec_priv *)dev->priv;
 
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index f431d79d1d..14ef872927 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -211,7 +211,7 @@ static int mpc5xxx_fec_get_ethaddr(struct eth_device *dev, unsigned char *mac)
 	return -1;
 }
 
-static int mpc5xxx_fec_set_ethaddr(struct eth_device *dev, unsigned char *mac)
+static int mpc5xxx_fec_set_ethaddr(struct eth_device *dev, const unsigned char *mac)
 {
 	mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv;
 	uint8_t currByte;			/* byte for which to compute the CRC */
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 5e47c64e0f..ac698332cf 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -233,7 +233,7 @@ static int gfar_get_ethaddr(struct eth_device *edev, unsigned char *mac)
 	return -ENODEV;
 }
 
-static int gfar_set_ethaddr(struct eth_device *edev, unsigned char *mac)
+static int gfar_set_ethaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct gfar_private *priv = edev->priv;
 	void __iomem *regs = priv->regs;
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index a8974cfcb9..854a666bfc 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -571,7 +571,7 @@ static int ks8851_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 	return 0;
 }
 
-static int ks8851_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int ks8851_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	struct ks_net *priv = (struct ks_net *)edev->priv;
 
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 2ac00f3460..6d4973fa2f 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -493,7 +493,7 @@ static int macb_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 	return -1;
 }
 
-static int macb_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int macb_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	struct macb_device *macb = edev->priv;
 
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 3be2ec531f..aab52c45de 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -486,7 +486,7 @@ recv_err:
 	return ret;
 }
 
-static int mvneta_set_ethaddr(struct eth_device *edev, unsigned char *mac)
+static int mvneta_set_ethaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct mvneta_port *priv = edev->priv;
 	u32 mac_h = (mac[0] << 24) | (mac[1] << 16) | (mac[2] << 8) | mac[3];
diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c
index 96dbc7c5df..64e9886d61 100644
--- a/drivers/net/netx_eth.c
+++ b/drivers/net/netx_eth.c
@@ -210,7 +210,7 @@ static int netx_eth_get_ethaddr(struct eth_device *edev, unsigned char *adr)
         return -1;
 }
 
-static int netx_eth_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int netx_eth_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	struct netx_eth_priv *priv = (struct netx_eth_priv *)edev->priv;
 	int xcno = priv->xcno;
diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c
index 97ffff2b26..e6bd757689 100644
--- a/drivers/net/orion-gbe.c
+++ b/drivers/net/orion-gbe.c
@@ -322,7 +322,7 @@ recv_err:
 	return ret;
 }
 
-static int port_set_ethaddr(struct eth_device *edev, unsigned char *mac)
+static int port_set_ethaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct port_priv *port = edev->priv;
 	u32 mac_h = (mac[0] << 24) | (mac[1] << 16) | (mac[2] << 8) | mac[3];
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index d57c706e52..a9eb865358 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -352,7 +352,7 @@ static int rtl8139_get_ethaddr(struct eth_device *edev, unsigned char *m)
 }
 
 static int rtl8139_set_ethaddr(struct eth_device *edev,
-					unsigned char *mac_addr)
+					const unsigned char *mac_addr)
 {
 	struct rtl8139_priv *priv = edev->priv;
 	int i;
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index d6a761087c..47d5e4a893 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -456,7 +456,7 @@ static int rtl8169_get_ethaddr(struct eth_device *edev, unsigned char *m)
 	return 0;
 }
 
-static int rtl8169_set_ethaddr(struct eth_device *edev, unsigned char *mac_addr)
+static int rtl8169_set_ethaddr(struct eth_device *edev, const unsigned char *mac_addr)
 {
 	struct rtl8169_priv *priv = edev->priv;
 	int i;
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index c0cf42ad82..5ea1bc3259 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -1378,7 +1378,7 @@ static int smc91c111_get_ethaddr(struct eth_device *edev, unsigned char *m)
 }
 
 static int smc91c111_set_ethaddr(struct eth_device *edev,
-					unsigned char *mac_addr)
+					const unsigned char *mac_addr)
 {
 	struct smc91c111_priv *priv = (struct smc91c111_priv *)edev->priv;
 	unsigned address;
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 9977ae3f32..dc46ef13d4 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -182,7 +182,7 @@ static int smc911x_get_ethaddr(struct eth_device *edev, unsigned char *m)
 	return 0;
 }
 
-static int smc911x_set_ethaddr(struct eth_device *edev, unsigned char *m)
+static int smc911x_set_ethaddr(struct eth_device *edev, const unsigned char *m)
 {
 	unsigned long addrh, addrl;
 
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 2458fb52c7..ca53f12d92 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -65,7 +65,7 @@ static int tap_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 	return -1;
 }
 
-static int tap_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int tap_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	return 0;
 }
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 7cce5b929e..4c53a142f1 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -403,7 +403,7 @@ static int asix_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 	return 0;
 }
 
-static int asix_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int asix_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	/* not possible? */
 	return 0;
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 053da1822a..6360e480fe 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -363,7 +363,7 @@ static int smsc95xx_set_csums(struct usbnet *dev)
 	return 0;
 }
 
-static int smsc95xx_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int smsc95xx_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	struct usbnet *udev = container_of(edev, struct usbnet, edev);
 
diff --git a/drivers/net/xgmac.c b/drivers/net/xgmac.c
index 3b2273fd79..7cc4d4888f 100644
--- a/drivers/net/xgmac.c
+++ b/drivers/net/xgmac.c
@@ -674,7 +674,7 @@ static int xgmac_get_ethaddr(struct eth_device *edev, unsigned char *addr)
 	return 0;
 }
 
-static int xgmac_set_ethaddr(struct eth_device *dev, unsigned char *addr)
+static int xgmac_set_ethaddr(struct eth_device *dev, const unsigned char *addr)
 {
 	struct xgmac_priv *priv = dev->priv;
 	u32 data;
diff --git a/include/net.h b/include/net.h
index 364011b20f..29559372a9 100644
--- a/include/net.h
+++ b/include/net.h
@@ -42,7 +42,7 @@ struct eth_device {
 	int  (*recv) (struct eth_device*);
 	void (*halt) (struct eth_device*);
 	int  (*get_ethaddr) (struct eth_device*, u8 adr[6]);
-	int  (*set_ethaddr) (struct eth_device*, u8 adr[6]);
+	int  (*set_ethaddr) (struct eth_device*, const unsigned char *adr);
 
 	struct eth_device *next;
 	void *priv;
-- 
cgit v1.2.3