From ad6f6c40284a0b4790621c49bc9509a40dd892cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= Date: Sat, 29 Sep 2012 19:41:04 +0200 Subject: [PATCH] ixgbe: Remove useless locking directives --- sys/dev/netif/ixgbe/ixgbe.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/netif/ixgbe/ixgbe.c b/sys/dev/netif/ixgbe/ixgbe.c index d0e7de8427..a2f675f7ed 100644 --- a/sys/dev/netif/ixgbe/ixgbe.c +++ b/sys/dev/netif/ixgbe/ixgbe.c @@ -1500,17 +1500,16 @@ ixgbe_media_status(struct ifnet * ifp, struct ifmediareq * ifmr) { struct adapter *adapter = ifp->if_softc; + ASSERT_IFNET_SERIALIZED_ALL(ifp); + INIT_DEBUGOUT("ixgbe_media_status: begin"); - IXGBE_CORE_LOCK(adapter); ixgbe_update_link_status(adapter); ifmr->ifm_status = IFM_AVALID; ifmr->ifm_active = IFM_ETHER; - if (!adapter->link_active) { - IXGBE_CORE_UNLOCK(adapter); + if (!adapter->link_active) return; - } ifmr->ifm_status |= IFM_ACTIVE; @@ -1526,8 +1525,6 @@ ixgbe_media_status(struct ifnet * ifp, struct ifmediareq * ifmr) break; } - IXGBE_CORE_UNLOCK(adapter); - return; } -- 2.41.0