From owner-svn-src-projects@FreeBSD.ORG  Sat Apr 21 04:33:40 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7E8FA106566B;
	Sat, 21 Apr 2012 04:33:40 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6AB1A8FC15;
	Sat, 21 Apr 2012 04:33:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3L4XecB071441;
	Sat, 21 Apr 2012 04:33:40 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3L4XeWj071439;
	Sat, 21 Apr 2012 04:33:40 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <201204210433.q3L4XeWj071439@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Sat, 21 Apr 2012 04:33:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234526 - projects/armv6/sys/arm/ti/cpsw
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Apr 2012 04:33:40 -0000

Author: stas
Date: Sat Apr 21 04:33:39 2012
New Revision: 234526
URL: http://svn.freebsd.org/changeset/base/234526

Log:
  - Do not reinitialize the interface if it is already running.  This
    fixes BOOTP on cpsw(4).

Modified:
  projects/armv6/sys/arm/ti/cpsw/if_cpsw.c

Modified: projects/armv6/sys/arm/ti/cpsw/if_cpsw.c
==============================================================================
--- projects/armv6/sys/arm/ti/cpsw/if_cpsw.c	Sat Apr 21 04:17:30 2012	(r234525)
+++ projects/armv6/sys/arm/ti/cpsw/if_cpsw.c	Sat Apr 21 04:33:39 2012	(r234526)
@@ -975,11 +975,16 @@ int once = 1;
 static void
 cpsw_init_locked(void *arg)
 {
+	struct ifnet *ifp;
 	struct cpsw_softc *sc = arg;
 	uint8_t  broadcast_address[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 	uint32_t next_bdp;
 	uint32_t i;
 
+	ifp = sc->ifp;
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+		return;
+
 	printf("%s: start\n",__func__);
 
 	/* Reset writer */