CVS commit: src/sys/net

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Mon Oct 23 03:54:40 UTC 2017

Modified Files:
        src/sys/net: if_media.c

Log Message:
 Clear ifm_cur and ifm_media after removing all ifmedia entries(IFM_INST_ANY)
in ifmedia_delete_instance() like if_media.c rev. 1.32.
Now if_media_delete_instance(IFM_INST_ANY) is the same as ifmedia_removeall().


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/net/if_media.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/net/if_media.c
diff -u src/sys/net/if_media.c:1.33 src/sys/net/if_media.c:1.34
--- src/sys/net/if_media.c:1.33	Fri Oct 20 08:04:39 2017
+++ src/sys/net/if_media.c	Mon Oct 23 03:54:40 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_media.c,v 1.33 2017/10/20 08:04:39 msaitoh Exp $	*/
+/*	$NetBSD: if_media.c,v 1.34 2017/10/23 03:54:40 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.33 2017/10/20 08:04:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.34 2017/10/23 03:54:40 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -405,6 +405,10 @@ ifmedia_delete_instance(struct ifmedia *
 			free(ife, M_IFMEDIA);
 		}
 	}
+	if (inst == IFM_INST_ANY) {
+		ifm->ifm_cur = NULL;
+		ifm->ifm_media = IFM_NONE;
+	}
 }
 
 void
@@ -412,8 +416,6 @@ ifmedia_removeall(struct ifmedia *ifm)
 {
 
 	ifmedia_delete_instance(ifm, IFM_INST_ANY);
-	ifm->ifm_cur = NULL;
-	ifm->ifm_media = IFM_NONE;
 }