Thu Mar 12 09:34:41 2020 UTC ()

remove unnecessary code because IFM_ACTIVE is setted
in ixl_set_link_status()

OKed by knakahara@n.o


(yamaguchi)

diff -r1.60 -r1.61 src/sys/dev/pci/if_ixl.c

--- src/sys/dev/pci/if_ixl.c 2020/03/03 04:55:46	1.60
+++ src/sys/dev/pci/if_ixl.c 2020/03/12 09:34:41	1.61

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ixl.c,v 1.60 2020/03/03 04:55:46 yamaguchi Exp $	*/
+/*	$NetBSD: if_ixl.c,v 1.61 2020/03/12 09:34:41 yamaguchi Exp $	*/
 /*
  * Copyright (c) 2013-2015, Intel Corporation
  * All rights reserved.
  * 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 notice,
  *     this list of conditions and the following disclaimer.
+ *
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
 @@ -64,27 +64,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.60 2020/03/03 04:55:46 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.61 2020/03/12 09:34:41 yamaguchi Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #include "opt_if_ixl.h"
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/evcnt.h>
 #include <sys/interrupt.h>
 @@ -1678,31 +1678,26 @@ ixl_media_add(struct ixl_softc *sc)
 , NULL);
+			}
+		}
+	}
+}
 static void
 ixl_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)
+{
 	struct ixl_softc *sc = ifp->if_softc;
 	ifmr->ifm_status = sc->sc_media_status;
 	ifmr->ifm_active = sc->sc_media_active;
 	mutex_enter(&sc->sc_cfg_lock);
 	if (ifp->if_link_state == LINK_STATE_UP)
 		SET(ifmr->ifm_status, IFM_ACTIVE);
 	mutex_exit(&sc->sc_cfg_lock);
+}
 static int
 ixl_media_change(struct ifnet *ifp)
+{
 	struct ixl_softc *sc = ifp->if_softc;
 	struct ifmedia *ifm = &sc->sc_media;
 	uint64_t ifm_active = sc->sc_media_active;
 	uint8_t link_speed, abilities;
 	switch (IFM_SUBTYPE(ifm_active)) {
 	case IFM_1000_SGMII:
 	case IFM_1000_KX: