Date: Thu, 12 Nov 2009 10:55:42 -0700 (MST) From: "M. Warner Losh" <imp@bsdimp.com> To: antoine@FreeBSD.org Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, delphij@FreeBSD.org Subject: Re: svn commit: r199201 - in head: contrib/libpcap sbin/ifconfig share/man/man4 sys/kern sys/net sys/sys Message-ID: <20091112.105542.643508160.imp@bsdimp.com> In-Reply-To: <f19c444a0911112248n21e571f6i5aa3c4e1e383087@mail.gmail.com> References: <200911112130.nABLUw9b007768@svn.freebsd.org> <f19c444a0911112248n21e571f6i5aa3c4e1e383087@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In message: <f19c444a0911112248n21e571f6i5aa3c4e1e383087@mail.gmail.com=
>
Antoine Brodin <antoine@FreeBSD.org> writes:
: On Wed, Nov 11, 2009 at 10:30 PM, Xin LI <delphij@freebsd.org> wrote:=
: > Author: delphij
: > Date: Wed Nov 11 21:30:58 2009
: > New Revision: 199201
: > URL: http://svn.freebsd.org/changeset/base/199201
: >
: > Log:
: > =A0Add interface description capability as inspired by OpenBSD.
: >
: > =A0MFC after: =A0 =A03 months
: >
: > Modified:
: > =A0head/contrib/libpcap/inet.c
: > =A0head/sbin/ifconfig/ifconfig.8
: > =A0head/sbin/ifconfig/ifconfig.c
: > =A0head/share/man/man4/netintro.4
: > =A0head/sys/kern/kern_jail.c
: > =A0head/sys/net/if.c
: > =A0head/sys/net/if.h
: > =A0head/sys/net/if_var.h
: > =A0head/sys/sys/param.h
: > =A0head/sys/sys/priv.h
: > =A0head/sys/sys/sockio.h
: ...
: > Modified: head/sys/net/if_var.h
: > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
: > --- head/sys/net/if_var.h =A0 =A0 =A0 Wed Nov 11 21:18:27 2009 =A0 =
=A0 =A0 =A0(r199200)
: > +++ head/sys/net/if_var.h =A0 =A0 =A0 Wed Nov 11 21:30:58 2009 =A0 =
=A0 =A0 =A0(r199201)
: > @@ -198,6 +198,7 @@ struct ifnet {
: > =A0 =A0 =A0 =A0void =A0 =A0*if_pf_kif;
: > =A0 =A0 =A0 =A0void =A0 =A0*if_lagg; =A0 =A0 =A0 =A0 =A0 =A0 =A0 /*=
lagg glue */
: > =A0 =A0 =A0 =A0u_char =A0 if_alloctype; =A0 =A0 =A0 =A0 =A0/* if_ty=
pe at time of allocation */
: > + =A0 =A0 =A0 struct sbuf *if_description; =A0 =A0/* interface desc=
ription */
: >
: > =A0 =A0 =A0 =A0/*
: > =A0 =A0 =A0 =A0 * Spare fields are added so that we can modify sens=
itive data
: > @@ -205,7 +206,7 @@ struct ifnet {
: > =A0 =A0 =A0 =A0 * be used with care where binary compatibility is r=
equired.
: > =A0 =A0 =A0 =A0 */
: > =A0 =A0 =A0 =A0char =A0 =A0 if_cspare[3];
: > - =A0 =A0 =A0 void =A0 =A0*if_pspare[8];
: > + =A0 =A0 =A0 void =A0 =A0*if_pspare[7];
: > =A0 =A0 =A0 =A0int =A0 =A0 if_ispare[4];
: > =A0};
: =
: Hi Delphij,
: =
: Doesn't this break ABI gratuitously? (I think it changes the size of=
: struct ifnet)
In head this is OK (it doean't break the size). In -stable, it should
instead look like:
=A0 =A0 =A0 =A0char =A0 =A0 if_cspare[3];
- =A0 =A0 =A0 void =A0 =A0*if_pspare[8];
+ =A0 =A0 =A0 void =A0 =A0*if_pspare[7];
+ =A0 =A0 =A0 struct sbuf=A0*if_description;
of course, in -head it could look that way too and not force a
recompile of everything that groks ifnets...
Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091112.105542.643508160.imp>