net: Remove BOOTP_VENDOREX support

It has been over a decade since we had a platform that implemented the
bootp vendor extension support hook. Remove this option due to lack of
use.

Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 5fcf37e67b97c7fb6b925177fcca81decd7e9204..9929087a8bb8b525ea43a1d9d35dc49d4223e13a 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1951,10 +1951,6 @@ config BOOTP_BOOTPATH
          Even though the config is called BOOTP_BOOTPATH, it stores the
          path in the variable 'rootpath'.
 
-config BOOTP_VENDOREX
-       bool "Support vendor extensions from BOOTP/DHCP server"
-       depends on CMD_BOOTP
-
 config BOOTP_BOOTFILESIZE
        bool "Request & store 'bootfilesize' from BOOTP/DHCP server"
        depends on CMD_BOOTP

diff --git a/net/bootp.c b/net/bootp.c
index 19e7453daed1125c2251af1d177e08e075a1bdf0..a28d11cb3683985635a27283ee7e4e7b2d78a19e 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -491,9 +491,6 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip,
 #endif
        int clientarch = -1;
 
-#if defined(CONFIG_BOOTP_VENDOREX)
-       u8 *x;
-#endif
 #if defined(CONFIG_BOOTP_SEND_HOSTNAME)
        char *hostname;
 #endif
@@ -584,12 +581,6 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip,
 
        e = add_vci(e);
 
-#if defined(CONFIG_BOOTP_VENDOREX)
-       x = dhcp_vendorex_prep(e);
-       if (x)
-               return x - start;
-#endif
-
        *e++ = 55;              /* Parameter Request List */
         cnt = e++;             /* Pointer to count of requested items */
        *cnt = 0;
@@ -977,10 +968,6 @@ static void dhcp_process_options(uchar *popt, uchar *end)
                        }
                        break;
                default:
-#if defined(CONFIG_BOOTP_VENDOREX)
-                       if (dhcp_vendorex_proc(popt))
-                               break;
-#endif
                        printf("*** Unhandled DHCP Option in OFFER/ACK:"
                               " %d\n", *popt);
                        break;

diff --git a/net/bootp.h b/net/bootp.h
index 47c743479e7309d2369ef82ba827f434e47d6197..14f5af68e1505cbec02a40915c06f066ba6db74e 100644 (file)
--- a/net/bootp.h
+++ b/net/bootp.h
@@ -24,10 +24,6 @@
 #if defined(CONFIG_CMD_DHCP)
 /* Minimum DHCP Options size per RFC2131 - results in 576 byte pkt */
 #define OPT_FIELD_SIZE 312
-#if defined(CONFIG_BOOTP_VENDOREX)
-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
 #else
 #define OPT_FIELD_SIZE 64
 #endif