diff options
author | brooks <brooks@FreeBSD.org> | 2004-09-02 05:07:29 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2004-09-02 05:07:29 +0000 |
commit | 9baee722362720c44fff4fcd638e44879a8bfda6 (patch) | |
tree | ba339092884750a1fdba677489127dffd5a65489 | |
parent | 4bb443a24da69733cefdb7ed27ddf2590672703a (diff) | |
download | FreeBSD-src-9baee722362720c44fff4fcd638e44879a8bfda6.zip FreeBSD-src-9baee722362720c44fff4fcd638e44879a8bfda6.tar.gz |
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.
-rw-r--r-- | UPDATING | 8 | ||||
-rw-r--r-- | sys/net/if.c | 1 | ||||
-rw-r--r-- | sys/net/if.h | 1 |
3 files changed, 8 insertions, 2 deletions
@@ -23,6 +23,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 6.x IS SLOW: 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 diff --git a/sys/net/if.c b/sys/net/if.c index 8097cc1..dce37b9 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -387,7 +387,6 @@ if_attach(struct ifnet *ifp) 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); diff --git a/sys/net/if.h b/sys/net/if.h index 95389e6..8b32fd1 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -104,7 +104,6 @@ struct if_data { 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 */ |