HEADS UP: ifi_epoch backout

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 <brooks_at_FreeBSD.ORG> -----

From: Brooks Davis <brooks_at_FreeBSD.ORG>
Date: Thu,  2 Sep 2004 05:07:37 +0000 (GMT)
To: brooks_at_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 
    sys/net              if.c if.h 
  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.
  
  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
_at__at_ -23,6 +23,14 _at__at_
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+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
_at__at_ -1830,4 +1838,4 _at__at_
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$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
_at__at_ -27,7 +27,7 _at__at_
  * SUCH DAMAGE.
  *
  *	_at_(#)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 $
  */
 
 #include "opt_compat.h"
_at__at_ -387,7 +387,6 _at__at_
 	TAILQ_INIT(&ifp->if_multiaddrs);
 	knlist_init(&ifp->if_klist, NULL);
 	getmicrotime(&ifp->if_lastchange);
-	getmicrotime(&ifp->if_data.ifi_epoch);
 
 #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
_at__at_ -27,7 +27,7 _at__at_
  * SUCH DAMAGE.
  *
  *	_at_(#)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 brooks Exp $
+ * $FreeBSD: /repoman/r/ncvs/src/sys/net/if.h,v 1.91 2004/09/02 05:07:29 brooks Exp $
  */
 
 #ifndef _NET_IF_H_
_at__at_ -104,7 +104,6 _at__at_
 	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 */
 };
 
 #define	IFF_UP		0x1		/* interface is up */

----- End forwarded message -----
-- 
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