diff options
| author | Tom Rini <[email protected]> | 2025-09-25 14:44:13 -0600 |
|---|---|---|
| committer | Jerome Forissier <[email protected]> | 2025-10-22 11:16:09 +0200 |
| commit | 99707a0baaa85736529a172f515b44598e5a8bc8 (patch) | |
| tree | df9cc9b210ae39362d2cf197a2289558e7f72324 | |
| parent | f8220460372b2e2c12afec3faf89921dd4e39b6c (diff) | |
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 <[email protected]>
Acked-by: Jerome Forissier <[email protected]>
| -rw-r--r-- | cmd/Kconfig | 4 | ||||
| -rw-r--r-- | net/bootp.c | 13 | ||||
| -rw-r--r-- | net/bootp.h | 4 |
3 files changed, 0 insertions, 21 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 5fcf37e67b9..9929087a8bb 100644 --- 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 19e7453daed..a28d11cb368 100644 --- 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 47c743479e7..14f5af68e15 100644 --- 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 |