Wed Jan 25 07:19:24 2017 UTC ()

ifmedia_removeall(): Clear ifm_cur and ifm_media after removing all ifmedia
entries.


(msaitoh)

diff -r1.31 -r1.32 src/sys/net/if_media.c

--- src/sys/net/if_media.c 2017/01/25 07:17:19	1.31
+++ src/sys/net/if_media.c 2017/01/25 07:19:24	1.32

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_media.c,v 1.31 2017/01/25 07:17:19 msaitoh Exp $	*/
+/*	$NetBSD: if_media.c,v 1.32 2017/01/25 07:19:24 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1998 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
 @@ -66,27 +66,27 @@
 /*
  * BSD/OS-compatible network interface media selection.
+ *
  * Where it is safe to do so, this code strays slightly from the BSD/OS
  * design.  Software which uses the API (device drivers, basically)
  * shouldn't notice any difference.
+ *
  * Many thanks to Matt Thomas for providing the information necessary
  * to implement this interface.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.31 2017/01/25 07:17:19 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.32 2017/01/25 07:19:24 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/netisr.h>
 /*
 @@ -409,26 +409,28 @@ ifmedia_delete_instance(struct ifmedia *
+	}
+}
 void
 ifmedia_removeall(struct ifmedia *ifm)
+{
 	struct ifmedia_entry *ife, *nife;
 	for (ife = TAILQ_FIRST(&ifm->ifm_list); ife != NULL; ife = nife) {
 		nife = TAILQ_NEXT(ife, ifm_list);
 		TAILQ_REMOVE(&ifm->ifm_list, ife, ifm_list);
 		free(ife, M_IFMEDIA);
+	}
 	ifm->ifm_cur = NULL;
 	ifm->ifm_media = IFM_NONE;
+}
 /*
  * Compute the interface `baudrate' from the media, for the interface
  * metrics (used by routing daemons).
  */
 static const struct ifmedia_baudrate ifmedia_baudrate_descriptions[] =
     IFM_BAUDRATE_DESCRIPTIONS;
 uint64_t
 ifmedia_baudrate(int mword)
+{