Merge upstream main into CPU VLAN fix

test/env_tables.c

@@ -57,19 +57,11 @@ const uint8_t hex_chars[] = "0123456789abcdef";
 uint8_t *hex = (uint8_t *)hex_chars;
 
 /* ---- a 9-port RTL8373 whose logical ports map to themselves ---- */
-#ifndef RTLP_TEST_MAX_PORT
-#define RTLP_TEST_MAX_PORT 8
-#endif
-#ifndef RTLP_TEST_MIN_PORT
-#define RTLP_TEST_MIN_PORT 0
-#endif
 #ifndef RTLP_TEST_IS8373
 #define RTLP_TEST_IS8373 1
 #endif
 const struct machine machine = {
 	.machine_name = "HOSTTEST",
-	.min_port = RTLP_TEST_MIN_PORT,
-	.max_port = RTLP_TEST_MAX_PORT,
 	.n_sfp = 0,
 	.log_to_phys_port = { 1, 2, 3, 4, 5, 6, 7, 8, 9 },
 	.phys_to_log_port = { 0, 1, 2, 3, 4, 5, 6, 7, 8 },