From owner-svn-src-all@freebsd.org  Mon Sep 21 18:32:44 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4038A057E5;
 Mon, 21 Sep 2015 18:32:44 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C48821922;
 Mon, 21 Sep 2015 18:32:44 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8LIWieX060822;
 Mon, 21 Sep 2015 18:32:44 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8LIWiSA060821;
 Mon, 21 Sep 2015 18:32:44 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201509211832.t8LIWiSA060821@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 21 Sep 2015 18:32:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r288072 - stable/10/sys/net
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Sep 2015 18:32:44 -0000

Author: hrs
Date: Mon Sep 21 18:32:43 2015
New Revision: 288072
URL: https://svnweb.freebsd.org/changeset/base/288072

Log:
  Fix a panic in SIOCSLAGG and SIOCGLAGGOPTS.  This was caused by a
  wrongly-MFC'd patch in r287723.
  
  Pointy hat to:	hrs

Modified:
  stable/10/sys/net/if_lagg.c

Modified: stable/10/sys/net/if_lagg.c
==============================================================================
--- stable/10/sys/net/if_lagg.c	Mon Sep 21 17:31:11 2015	(r288071)
+++ stable/10/sys/net/if_lagg.c	Mon Sep 21 18:32:43 2015	(r288072)
@@ -1063,7 +1063,8 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd
 				sc->sc_detach(sc);
 			else
 				LAGG_WUNLOCK(sc);
-		}
+		} else
+			LAGG_WUNLOCK(sc);
 		proto->ti_attach(sc);
 		LAGG_WLOCK(sc);
 		sc->sc_proto = proto->ti_proto;
@@ -1187,9 +1188,6 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd
 				break;
 			}
 		}
-		proto->ti_attach(sc);
-		LAGG_WLOCK(sc);
-		sc->sc_proto = proto->ti_proto;
 		LAGG_WUNLOCK(sc);
 		break;
 	case SIOCGLAGGFLAGS: