From owner-svn-src-projects@freebsd.org  Mon Jun  6 22:39:33 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 55FADB6D169
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon,  6 Jun 2016 22:39:33 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 28A361399;
 Mon,  6 Jun 2016 22:39:33 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u56MdWiY051963;
 Mon, 6 Jun 2016 22:39:32 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u56MdWwu051962;
 Mon, 6 Jun 2016 22:39:32 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201606062239.u56MdWwu051962@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Mon, 6 Jun 2016 22:39:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r301530 - projects/vnet/sys/netinet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jun 2016 22:39:33 -0000

Author: bz
Date: Mon Jun  6 22:39:32 2016
New Revision: 301530
URL: https://svnweb.freebsd.org/changeset/base/301530

Log:
  Fix another SVN mismerge.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/vnet/sys/netinet/igmp.c

Modified: projects/vnet/sys/netinet/igmp.c
==============================================================================
--- projects/vnet/sys/netinet/igmp.c	Mon Jun  6 22:37:04 2016	(r301529)
+++ projects/vnet/sys/netinet/igmp.c	Mon Jun  6 22:39:32 2016	(r301530)
@@ -3621,37 +3621,6 @@ DB_SHOW_COMMAND(igi_list, db_show_igi_li
 	struct igmp_ifsoftc *igi, *tigi;
 	LIST_HEAD(_igi_list, igmp_ifsoftc) *igi_head;
 
-        if (!have_addr) {
-                db_printf("usage: show igi_list <addr>\n");
-                return;
-        }
-        igi_head = (struct _igi_list *)addr;
-
-	LIST_FOREACH_SAFE(igi, igi_head, igi_link, tigi) {
-		db_printf("igmp_ifsoftc %p:\n", igi);
-		db_printf("    ifp %p\n", igi->igi_ifp);
-		db_printf("    version %u\n", igi->igi_version);
-		db_printf("    v1_timer %u\n", igi->igi_v1_timer);
-		db_printf("    v2_timer %u\n", igi->igi_v2_timer);
-		db_printf("    v3_timer %u\n", igi->igi_v3_timer);
-		db_printf("    flags %#x\n", igi->igi_flags);
-		db_printf("    rv %u\n", igi->igi_rv);
-		db_printf("    qi %u\n", igi->igi_qi);
-		db_printf("    qri %u\n", igi->igi_qri);
-		db_printf("    uri %u\n", igi->igi_uri);
-		/* SLIST_HEAD(,in_multi)   igi_relinmhead */
-		/* struct mbufq    igi_gq; */
-		db_printf("\n");
-	}
-}
-#endif
-
-#ifdef DDB
-DB_SHOW_COMMAND(igi_list, db_show_igi_list)
-{
-	struct igmp_ifsoftc *igi, *tigi;
-	LIST_HEAD(_igi_list, igmp_ifsoftc) *igi_head;
-
 	if (!have_addr) {
 		db_printf("usage: show igi_list <addr>\n");
 		return;