From owner-freebsd-current@FreeBSD.ORG Thu Sep 2 19:55:45 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F04B16A4CF for ; Thu, 2 Sep 2004 19:55:45 +0000 (GMT) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC87143D66 for ; Thu, 2 Sep 2004 19:55:44 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id i82JuJxW012669 for ; Thu, 2 Sep 2004 12:56:19 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id i82JuJ9c012668 for current@freebsd.org; Thu, 2 Sep 2004 12:56:19 -0700 Date: Thu, 2 Sep 2004 12:56:19 -0700 From: Brooks Davis To: current@freebsd.org Message-ID: <20040902195619.GC10756@odin.ac.hmc.edu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="hOcCNbCCxyk/YU74" Content-Disposition: inline User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu Subject: HEADS UP: ifi_epoch backout X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Sep 2004 19:55:45 -0000 --hOcCNbCCxyk/YU74 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I've backed out the addition of ifi_epoch to struct if_data. The ABI breakage was causing too much trouble this close to 5-STABLE. If you updated your system with source from between Aug 30 06:29:26 2004 UTC and Sep 2 05:07:29 2004 UTC, you have an ifconfig that will not work with a kernel outside those dates. See the updating entry for 20040830 for more details. -- Brooks ----- Forwarded message from Brooks Davis ----- From: Brooks Davis Date: Thu, 2 Sep 2004 05:07:37 +0000 (GMT) To: brooks@FreeBSD.ORG X-Virus-Status: No Subject: [src] cvs commit: src UPDATING src/sys/net if.c if.h brooks 2004-09-02 05:07:29 UTC FreeBSD src repository Modified files: . UPDATING=20 sys/net if.c if.h=20 Log: Back out ifi_epoch. The ABI breakage is too disruptive this close to 5-STABLE. ifi_epoch will shortly be reintroduced with less precistion using the space currently allocated to ifi_unused. =20 Revision Changes Path 1.354 +8 -0 src/UPDATING 1.204 +0 -1 src/sys/net/if.c 1.91 +0 -1 src/sys/net/if.h Index: src/UPDATING diff -u src/UPDATING:1.353 src/UPDATING:1.354 --- src/UPDATING:1.353 Wed Sep 1 15:14:13 2004 +++ src/UPDATING Thu Sep 2 05:07:29 2004 @@ -23,6 +23,14 @@ developers choose to disable these features on build machines to maximize performance. =20 +20040902: + The ifi_epoch change has been reverted because the ABI breakage + was too extensive. If you are running with a kernel/userland + containing the initial change (20040830), you should heed the + warning about ifconfig incompatibility when upgrading again. + With this change, 5.3 and 6.0 ifconfigs and kernels are once + again interoperable. + 20040830: A new variable, ifi_epoch, has been added to struct if_data which is part if struct ifnet. This means all network drivers @@ -1830,4 +1838,4 @@ Contact Warner Losh if you have any questions about your use of this document. =20 -$FreeBSD: /repoman/r/ncvs/src/UPDATING,v 1.353 2004/09/01 15:14:13 brooks = Exp $ +$FreeBSD: /repoman/r/ncvs/src/UPDATING,v 1.354 2004/09/02 05:07:29 brooks = Exp $ Index: src/sys/net/if.c diff -u src/sys/net/if.c:1.203 src/sys/net/if.c:1.204 --- src/sys/net/if.c:1.203 Wed Sep 1 19:56:47 2004 +++ src/sys/net/if.c Thu Sep 2 05:07:29 2004 @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: /repoman/r/ncvs/src/sys/net/if.c,v 1.203 2004/09/01 19:56:47 = mlaier Exp $ + * $FreeBSD: /repoman/r/ncvs/src/sys/net/if.c,v 1.204 2004/09/02 05:07:29 = brooks Exp $ */ =20 #include "opt_compat.h" @@ -387,7 +387,6 @@ TAILQ_INIT(&ifp->if_multiaddrs); knlist_init(&ifp->if_klist, NULL); getmicrotime(&ifp->if_lastchange); - getmicrotime(&ifp->if_data.ifi_epoch); =20 #ifdef MAC mac_init_ifnet(ifp); Index: src/sys/net/if.h diff -u src/sys/net/if.h:1.90 src/sys/net/if.h:1.91 --- src/sys/net/if.h:1.90 Wed Sep 1 18:22:14 2004 +++ src/sys/net/if.h Thu Sep 2 05:07:29 2004 @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: /repoman/r/ncvs/src/sys/net/if.h,v 1.90 2004/09/01 18:22:14 b= rooks Exp $ + * $FreeBSD: /repoman/r/ncvs/src/sys/net/if.h,v 1.91 2004/09/02 05:07:29 b= rooks Exp $ */ =20 #ifndef _NET_IF_H_ @@ -104,7 +104,6 @@ u_long ifi_hwassist; /* HW offload capabilities */ u_long ifi_unused; /* XXX was ifi_xmittiming */ struct timeval ifi_lastchange; /* time of last administrative change */ - struct timeval ifi_epoch; /* time of creation or stat reset */ }; =20 #define IFF_UP 0x1 /* interface is up */ ----- End forwarded message ----- --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --hOcCNbCCxyk/YU74 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFBN3riXY6L6fI4GtQRAlHrAKDLfGO7C/NuNYzc0hTDuorJ1W2GdQCfS3r+ j7ztZFY1ZkUabH1cwfmmf+k= =1YIW -----END PGP SIGNATURE----- --hOcCNbCCxyk/YU74--