From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Fri, 29 Jun 2012 10:56:20 +0000 (+0800)
Subject: bge: Don't prevent bge_init if IFF_RUNNING is set
X-Git-Tag: v3.2.0~742
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/8ecafb73b88da18c8ec13f65e754749399978308

bge: Don't prevent bge_init if IFF_RUNNING is set

This probably was old code which intended to guard against if_init()
triggered by SIOCSIFADDR in ether_ioctl().  It no longer makes sense.

Also don't call bge_init() if MTU is changed but device is not running
yet (FreeBSD 213587).
---

diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index 2c09d4a879..2e0510ee88 100644
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -3073,9 +3073,6 @@ bge_init(void *xsc)
 
 	ASSERT_SERIALIZED(ifp->if_serializer);
 
-	if (ifp->if_flags & IFF_RUNNING)
-		return;
-
 	/* Cancel pending I/O and flush buffers. */
 	bge_stop(sc);
 	bge_reset(sc);
@@ -3294,8 +3291,8 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 			error = EINVAL;
 		} else if (ifp->if_mtu != ifr->ifr_mtu) {
 			ifp->if_mtu = ifr->ifr_mtu;
-			ifp->if_flags &= ~IFF_RUNNING;
-			bge_init(sc);
+			if (ifp->if_flags & IFF_RUNNING)
+				bge_init(sc);
 		}
 		break;
 	case SIOCSIFFLAGS:
@@ -3319,9 +3316,8 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 			} else {
 				bge_init(sc);
 			}
-		} else {
-			if (ifp->if_flags & IFF_RUNNING)
-				bge_stop(sc);
+		} else if (ifp->if_flags & IFF_RUNNING) {
+			bge_stop(sc);
 		}
 		sc->bge_if_flags = ifp->if_flags;
 		break;
@@ -3367,7 +3363,6 @@ bge_watchdog(struct ifnet *ifp)
 
 	if_printf(ifp, "watchdog timeout -- resetting\n");
 
-	ifp->if_flags &= ~IFF_RUNNING;
 	bge_init(sc);
 
 	ifp->if_oerrors++;