Thu Dec 5 05:29:28 2019 UTC ()

Fix previous comment change for ifm_media. It was correct.

 The real problem is that some driver misuse ifm_media as the current active
media. struct mii_data has the current active media(mii_media_active). If a
driver use mii(4), it can be use mii->mii_media_active for this purpose.
struct ifmedia has no entry for this purpose. Some drivers have an entry
in their own softc to keep the value, but some other's don't have it and
they mistakenly use ifm_media.

 We might add a new entry to struct ifmedia in future to avoid this confusion
and for simplify.


(msaitoh)

diff -r1.67 -r1.68 src/sys/net/if_media.h

--- src/sys/net/if_media.h 2019/11/28 14:08:22	1.67
+++ src/sys/net/if_media.h 2019/12/05 05:29:27	1.68

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_media.h,v 1.67 2019/11/28 14:08:22 msaitoh Exp $	*/
+/*	$NetBSD: if_media.h,v 1.68 2019/12/05 05:29:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -873,28 +873,35 @@ typedef	void (*ifm_stat_cb_t)(struct ifn
 struct ifmedia_entry {
 	TAILQ_ENTRY(ifmedia_entry) ifm_list;
 	u_int	ifm_media;	/* IFMWD: description of this media */
 	u_int	ifm_data;	/* for driver-specific use */
 	void	*ifm_aux;	/* for driver-specific use */
 };
 /*
  * One of these goes into a network interface's softc structure.
  * It is used to keep general media state.
  */
 struct ifmedia {
 	u_int	ifm_mask;	/* IFMWD: mask of changes we don't care */
-	u_int	ifm_media;	/* IFMWD: current active media word */
+	u_int	ifm_media;	/*
-	struct ifmedia_entry *ifm_cur;	/* current user-selected media */
+				 * IFMWD: current use-set media word.
+				 *
 				 * XXX some drivers misuse this entry as
 				 * current active media word. Don't use this
 				 * entry as this purpose but use driver
 				 * specific entry if you don't use mii(4).
 				 */
 	struct ifmedia_entry *ifm_cur;	/* current user-selected media entry */
 	TAILQ_HEAD(, ifmedia_entry) ifm_list; /* list of all supported media */
 	ifm_change_cb_t	ifm_change;	/* media change driver callback */
 	ifm_stat_cb_t	ifm_status;	/* media status driver callback */
 };
 /* Initialize an interface's struct if_media field. */
 void	ifmedia_init(struct ifmedia *, int, ifm_change_cb_t, ifm_stat_cb_t);
 int	ifmedia_change(struct ifmedia *, struct ifnet *);
 /* Add one supported medium to a struct ifmedia. */
 void	ifmedia_add(struct ifmedia *, int, int, void *);