Date: Mon, 6 Jun 2016 22:39:32 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r301530 - projects/vnet/sys/netinet Message-ID: <201606062239.u56MdWwu051962@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606062239.u56MdWwu051962>