This constifies the ifmedia description tables, both in the kernel
(yes, I did a test compile with option IFMEDIA_DEBUG) and one
straggler in userland.
ok?
diff 3c78bc9451ce7ce927aaecc9f8e5113de7023a9c /usr/src
blob - 0ef67c56edd8be741533ccba974c11f198887b32
file + sbin/ifconfig/ifconfig.c
--- sbin/ifconfig/ifconfig.c
+++ sbin/ifconfig/ifconfig.c
@@ -3062,7 +3062,7 @@ const struct ifmedia_description ifm_type_descriptions
const struct ifmedia_description ifm_subtype_descriptions[] =
IFM_SUBTYPE_DESCRIPTIONS;
-struct ifmedia_description ifm_mode_descriptions[] =
+const struct ifmedia_description ifm_mode_descriptions[] =
IFM_MODE_DESCRIPTIONS;
const struct ifmedia_description ifm_option_descriptions[] =
blob - e71f433cfa6b61350625308c1328bb8e288e9dd5
file + sys/net/if_media.c
--- sys/net/if_media.c
+++ sys/net/if_media.c
@@ -393,7 +393,7 @@ ifmedia_delete_instance(struct ifmedia *ifm, uint64_t
* Compute the interface `baudrate' from the media, for the interface
* metrics (used by routing daemons).
*/
-struct ifmedia_baudrate ifmedia_baudrate_descriptions[] =
+const struct ifmedia_baudrate ifmedia_baudrate_descriptions[] =
IFM_BAUDRATE_DESCRIPTIONS;
uint64_t
@@ -413,13 +413,13 @@ ifmedia_baudrate(uint64_t mword)
#ifdef IFMEDIA_DEBUG
-struct ifmedia_description ifm_type_descriptions[] =
+const struct ifmedia_description ifm_type_descriptions[] =
IFM_TYPE_DESCRIPTIONS;
-struct ifmedia_description ifm_subtype_descriptions[] =
+const struct ifmedia_description ifm_subtype_descriptions[] =
IFM_SUBTYPE_DESCRIPTIONS;
-struct ifmedia_description ifm_option_descriptions[] =
+const struct ifmedia_description ifm_option_descriptions[] =
IFM_OPTION_DESCRIPTIONS;
/*
@@ -428,7 +428,7 @@ struct ifmedia_description ifm_option_descriptions[] =
static void
ifmedia_printword(uint64_t ifmw)
{
- struct ifmedia_description *desc;
+ const struct ifmedia_description *desc;
uint64_t seen_option = 0;
/* Print the top-level interface type. */
--
Christian "naddy" Weisgerber [email protected]
