net/: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

diff --git a/net/bootp.c b/net/bootp.c
index ac9455e1ab495ccf1f4193810fc1afb595ad0d5d..80f53bc8863fd8fca4ec9305a896accdcb6b8cb3 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -81,7 +81,7 @@ extern u8 *dhcp_vendorex_prep (u8 *e); /*rtn new e after add own opts. */
 extern u8 *dhcp_vendorex_proc (u8 *e); /*rtn next e if mine,else NULL  */
 #endif
 
-#endif /* CFG_CMD_DHCP */
+#endif
 
 static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len)
 {
@@ -357,7 +357,7 @@ BootpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
 
        TftpStart();
 }
-#endif /* !CFG_CMD_DHCP */
+#endif
 
 /*
  *     Timeout on BOOTP/DHCP request.
@@ -491,7 +491,7 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R
        return e - start;
 }
 
-#else  /* CFG_CMD_DHCP */
+#else
 /*
  *     Warning: no field size check - change CONFIG_BOOTP_* at your own risk!
  */
@@ -513,7 +513,7 @@ static int BootpExtended (u8 * e)
        *e++ = 2;
        *e++ = (576 - 312 + OPT_SIZE) >> 16;
        *e++ = (576 - 312 + OPT_SIZE) & 0xff;
-#endif /* CFG_CMD_DHCP */
+#endif
 
 #if defined(CONFIG_BOOTP_SUBNETMASK)
        *e++ = 1;               /* Subnet mask request */
@@ -561,7 +561,7 @@ static int BootpExtended (u8 * e)
 
        return e - start;
 }
-#endif /* CFG_CMD_DHCP */
+#endif
 
 void
 BootpRequest (void)
@@ -682,7 +682,7 @@ BootpRequest (void)
        ext_len = DhcpExtended((u8 *)bp->bp_vend, DHCP_DISCOVER, 0, 0);
 #else
        ext_len = BootpExtended((u8 *)bp->bp_vend);
-#endif /* CFG_CMD_DHCP */
+#endif
 
        /*
         *      Bootp ID is the lower 4 bytes of our ethernet address
@@ -710,7 +710,7 @@ BootpRequest (void)
        NetSetHandler(DhcpHandler);
 #else
        NetSetHandler(BootpHandler);
-#endif /* CFG_CMD_DHCP */
+#endif
        NetSendPacket(NetTxPacket, pktlen);
 }
 
@@ -975,6 +975,6 @@ void DhcpRequest(void)
 {
        BootpRequest();
 }
-#endif /* CFG_CMD_DHCP */
+#endif
 
-#endif /* CFG_CMD_NET */
+#endif

diff --git a/net/net.c b/net/net.c
index f96eb28b35ea2b90bc0d79b2677c3ccedb9778a6..e9d77576419ff1bdd024fc62cf2655bc6941527b 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -414,7 +414,7 @@ restart:
                        NetServerIP = getenv_IPaddr ("serverip");
                        DhcpRequest();          /* Basically same as BOOTP */
                        break;
-#endif /* CFG_CMD_DHCP */
+#endif
 
                case BOOTP:
                        BootpTry = 0;
@@ -775,7 +775,7 @@ static void PingStart(void)
 
        PingSend();
 }
-#endif /* CFG_CMD_PING */
+#endif
 
 #if defined(CONFIG_CMD_CDP)
 
@@ -1128,7 +1128,7 @@ static void CDPStart(void)
 
        CDPSendTrigger();
 }
-#endif /* CFG_CMD_CDP */
+#endif
 
 
 void
@@ -1693,7 +1693,7 @@ void copy_filename (char *dst, char *src, int size)
        *dst = '\0';
 }
 
-#endif /* CFG_CMD_NET */
+#endif
 
 void ip_to_string (IPaddr_t x, char *s)
 {

diff --git a/net/rarp.c b/net/rarp.c
index 921d0db3f3f06cf68f47972053c85657fadc27fa..21dfa529c9a381934612e12e62da1e9c0ea438f8 100644 (file)
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -119,4 +119,4 @@ RarpRequest (void)
        NetSetHandler(RarpHandler);
 }
 
-#endif /* CFG_CMD_NET */
+#endif

diff --git a/net/tftp.c b/net/tftp.c
index c188243ef5e2647f7acdfb29c649cdd6e5c9eeb5..d56e30b5b5c28a16a50912d864cba18d86492375 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -386,4 +386,4 @@ TftpStart (void)
        TftpSend ();
 }
 
-#endif /* CFG_CMD_NET */
+#endif