ethernet: remove mac from wifi

diff --git a/drivers/net/eth_mac/Kconfig b/drivers/net/eth_mac/Kconfig
index 055416421c0df29f6c4b9d707ef9256f15f0d7c2..667aaa10a665daf323a8bc71da8c6a7d0bdfe05a 100755 (executable)
--- 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 b2b28075afbd3b59d35d5a83a64f40f261895fab..96f5de4bba72ab50e13b37750da1e8fb13c90842 100755 (executable)
--- a/drivers/net/eth_mac/eth_mac.c
+++ b/drivers/net/eth_mac/eth_mac.c
@@ -32,7 +32,7 @@
 \r
 //extern char GetSNSectorInfo(char * pbuf);\r
 \r
-char GetSNSectorInfoBeforeNandInit(char * pbuf)\r
+static char GetSNSectorInfoBeforeNandInit(char * pbuf)\r
 {\r
     char * sn_addr = ioremap(0x10501600,0x200);\r
     memcpy(pbuf,sn_addr,0x200);\r
@@ -83,7 +83,7 @@ int eth_mac_idb(u8 *eth_mac)
 *大写转小写\r
 *\r
 */\r
-void   to_lower(char   *str) \r
+static void   to_lower(char   *str) \r
 { \r
        int   i=0; \r
        while(str[i]!=0) \r
@@ -100,7 +100,7 @@ void   to_lower(char   *str)
   *\r
   *\r
   */\r
-void  trans( char *src ,int * k) \r
+static void  trans( char *src ,int * k) \r
 {\r
     char c;\r
     int i;\r
@@ -152,7 +152,7 @@ void  trans( char *src ,int * k)
 \r
 }\r
 \r
-int eth_mac_wifi(u8 *eth_mac){\r
+/*int eth_mac_wifi(u8 *eth_mac){\r
        int i;\r
        struct  file *file = NULL;\r
        char wifi_mac[32];\r
@@ -198,7 +198,7 @@ int eth_mac_wifi(u8 *eth_mac){
        filp_close(file,NULL);\r
        return 0;\r
        \r
-}\r
+}*/\r
 \r
 \r
 \r

diff --git a/drivers/net/rk29_vmac.c b/drivers/net/rk29_vmac.c
index 42683cfb3673de8aa046bccc086d5b3c63362e5a..7c445739d75752f6cbfe7fa228b4ef5b7d1c0590 100755 (executable)
--- 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)
                }\r
        #endif\r
        \r
-       #ifdef CONFIG_ETH_MAC_FROM_WIFI_MAC\r
+       /*#ifdef CONFIG_ETH_MAC_FROM_WIFI_MAC\r
                err = eth_mac_wifi(dev->dev_addr);\r
                if (err) {\r
                        printk("read mac from Wifi  fail.\n");\r
@@ -1589,7 +1589,7 @@ static int __devinit vmac_probe(struct platform_device *pdev)
                                                        dev->dev_addr[4],dev->dev_addr[5] );\r
                        }\r
                }\r
-       #endif\r
+       #endif*/\r
        \r
        #ifdef CONFIG_ETH_MAC_FROM_RANDOM\r
            random_ether_addr(dev->dev_addr);\r