Date: Sun, 31 Oct 2010 16:54:50 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r214602 - stable/8/sys/net Message-ID: <201010311654.o9VGsoCQ097007@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Sun Oct 31 16:54:50 2010 New Revision: 214602 URL: http://svn.freebsd.org/changeset/base/214602 Log: Correct a merge issue from r214554, where the field had been deprecated and reserved in HEAD but is still there in 8. Reported by: dhw Modified: stable/8/sys/net/if_debug.c Modified: stable/8/sys/net/if_debug.c ============================================================================== --- stable/8/sys/net/if_debug.c Sun Oct 31 15:07:09 2010 (r214601) +++ stable/8/sys/net/if_debug.c Sun Oct 31 16:54:50 2010 (r214602) @@ -62,7 +62,7 @@ if_show_ifnet(struct ifnet *ifp) IF_DB_PRINTF("%s", if_description); IF_DB_PRINTF("%u", if_index); IF_DB_PRINTF("%u", if_refcount); - IF_DB_PRINTF("%d", if_index_reserved); + IF_DB_PRINTF("%u", if_timer); IF_DB_PRINTF("%p", if_softc); IF_DB_PRINTF("%p", if_l2com); IF_DB_PRINTF("%p", if_vnet);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010311654.o9VGsoCQ097007>