From 3862a09452cd3d4bb2261072c2329019ae37d6f1 Mon Sep 17 00:00:00 2001
From: hwg <hwg@rock-chips.com>
Date: Thu, 21 Mar 2013 17:48:42 +0800
Subject: [PATCH] ethernet: remove mac from wifi

---
 drivers/net/eth_mac/Kconfig   | 18 ------------------
 drivers/net/eth_mac/eth_mac.c | 10 +++++-----
 drivers/net/rk29_vmac.c       |  4 ++--
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/drivers/net/eth_mac/Kconfig b/drivers/net/eth_mac/Kconfig
index 055416421c0d..667aaa10a665 100755
--- a/drivers/net/eth_mac/Kconfig
+++ b/drivers/net/eth_mac/Kconfig
@@ -36,23 +36,5 @@ choice
 
 	  	  If you say N, all options in this submenu will be skipped and disabled.
 
-	config ETH_MAC_FROM_WIFI_MAC
-		bool "Ethernet mac from Wifi mac"
-		---help---
-	  	  Say Y here if you want to set Wifi mac to Ethernet mac,
-	  	  when the Wifi device exsits.
-	  	  This option alone does not add any kernel code.
-
-	  	  If you say N, all options in this submenu will be skipped and disabled.
-
-	config ETH_MAC_FROM_SECURE_CHIP
-		bool "Ethernet mac from Secure chip"
-		---help---
-	  	  Say Y here if you want to set Secure chip mac to Ethernet mac,
-	  	  when the Secure chip exsits and mac has been written in.
-	  	  This option alone does not add any kernel code.
-
-	  	  If you say N, all options in this submenu will be skipped and disabled.
-
 endchoice
 
diff --git a/drivers/net/eth_mac/eth_mac.c b/drivers/net/eth_mac/eth_mac.c
index b2b28075afbd..96f5de4bba72 100755
--- a/drivers/net/eth_mac/eth_mac.c
+++ b/drivers/net/eth_mac/eth_mac.c
@@ -32,7 +32,7 @@
 
 //extern char GetSNSectorInfo(char * pbuf);
 
-char GetSNSectorInfoBeforeNandInit(char * pbuf)
+static char GetSNSectorInfoBeforeNandInit(char * pbuf)
 {
     char * sn_addr = ioremap(0x10501600,0x200);
     memcpy(pbuf,sn_addr,0x200);
@@ -83,7 +83,7 @@ int eth_mac_idb(u8 *eth_mac)
 *大写转小写
 *
 */
-void   to_lower(char   *str) 
+static void   to_lower(char   *str) 
 { 
 	int   i=0; 
 	while(str[i]!=0) 
@@ -100,7 +100,7 @@ void   to_lower(char   *str)
   *
   *
   */
-void  trans( char *src ,int * k) 
+static void  trans( char *src ,int * k) 
 {
     char c;
     int i;
@@ -152,7 +152,7 @@ void  trans( char *src ,int * k)
 
 }
 
-int eth_mac_wifi(u8 *eth_mac){
+/*int eth_mac_wifi(u8 *eth_mac){
 	int i;
 	struct  file *file = NULL;
 	char wifi_mac[32];
@@ -198,7 +198,7 @@ int eth_mac_wifi(u8 *eth_mac){
 	filp_close(file,NULL);
 	return 0;
 	
-}
+}*/
 
 
 
diff --git a/drivers/net/rk29_vmac.c b/drivers/net/rk29_vmac.c
index 42683cfb3673..7c445739d757 100755
--- a/drivers/net/rk29_vmac.c
+++ b/drivers/net/rk29_vmac.c
@@ -1578,7 +1578,7 @@ static int __devinit vmac_probe(struct platform_device *pdev)
 		}
 	#endif
 	
-	#ifdef CONFIG_ETH_MAC_FROM_WIFI_MAC
+	/*#ifdef CONFIG_ETH_MAC_FROM_WIFI_MAC
 		err = eth_mac_wifi(dev->dev_addr);
 		if (err) {
 			printk("read mac from Wifi  fail.\n");
@@ -1589,7 +1589,7 @@ static int __devinit vmac_probe(struct platform_device *pdev)
 							dev->dev_addr[4],dev->dev_addr[5] );
 			}
 		}
-	#endif
+	#endif*/
 	
 	#ifdef CONFIG_ETH_MAC_FROM_RANDOM
 	    random_ether_addr(dev->dev_addr);
-- 
2.34.1