svn commit: r351244 - head/sys/dev/usb/net

[O. Hartmann]

On Tue, 20 Aug 2019 01:06:43 +0000 (UTC)
"Stephen J. Kiernan" <stevek at FreeBSD.org> wrote:

> Author: stevek
> Date: Tue Aug 20 01:06:43 2019
> New Revision: 351244
> URL: https://svnweb.freebsd.org/changeset/base/351244
>
> Log:
>   usb_ethernet.h includes a number of mii headers, but only does so in
>   order to have struct mii_data available. However, it only really needs
>   a forward declaration of struct mii_data for use in pointer form for
>   the return type of a function prototype.
>
>   Custom kernel configuration that have usb and fdt enabled, but no miibus,
>   end up with compilation failures because miibus_if.h will not get
>   generated.
>
>   Due to the above, the following changes have been made to usb_ethernet.h:
>    * remove the inclusion of mii headers
>    * forward-declare struct mii_data
>    * include net/ifq.h to satify the need for complete struct ifqueue
>
>   Reviewed by:	ian
>   Obtained from:	Juniper Networks, Inc.
>   Differential Revision:	https://reviews.freebsd.org/D21293
>
> Modified:
>   head/sys/dev/usb/net/usb_ethernet.h
>
> Modified: head/sys/dev/usb/net/usb_ethernet.h
> ==============================================================================
> --- head/sys/dev/usb/net/usb_ethernet.h	Tue Aug 20 00:50:17
> 2019	(r351243) +++ head/sys/dev/usb/net/usb_ethernet.h	Tue Aug
> 20 01:06:43 2019	(r351244) @@ -45,14 +45,11 @@
>  #include <net/if_dl.h>
>  #include <net/if_media.h>
>  #include <net/if_types.h>
> +#include <net/ifq.h>
>  #include <net/bpf.h>
>  #include <net/ethernet.h>
>
> -#include "miibus_if.h"
> -
> -#include <dev/mii/mii.h>
> -#include <dev/mii/miivar.h>
> -
> +struct mii_data;
>  struct usb_ether;
>  struct usb_device_request;
>
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"

This breaks buildkernel:

[...]
===> usb/udl (all)
Building
/usr/obj/usr/src/amd64.amd64/sys/WOTAN/modules/usr/src/sys/modules/usb/udl/udl.ko
===> usb/uether (all) Building
/usr/obj/usr/src/amd64.amd64/sys/WOTAN/modules/usr/src/sys/modules/usb/uether/uether.ko
===> usb/aue (all) Building
/usr/obj/usr/src/amd64.amd64/sys/WOTAN/modules/usr/src/sys/modules/usb/aue/if_aue.o
/usr/src/sys/dev/usb/net/if_aue.c:197:8: error: unknown type name
'miibus_readreg_t' static miibus_readreg_t aue_miibus_readreg; ^
/usr/src/sys/dev/usb/net/if_aue.c:198:8: error: unknown type name
'miibus_writereg_t' static miibus_writereg_t aue_miibus_writereg;
       ^
/usr/src/sys/dev/usb/net/if_aue.c:199:8: error: unknown type name
'miibus_statchg_t' static miibus_statchg_t aue_miibus_statchg;
       ^
/usr/src/sys/dev/usb/net/if_aue.c:262:2: error: use of undeclared identifier
'miibus_readreg_desc' DEVMETHOD(miibus_readreg, aue_miibus_readreg),
        ^
/usr/src/sys/sys/bus.h:751:19: note: expanded from macro 'DEVMETHOD'
#define DEVMETHOD       KOBJMETHOD
[...]

Kind regards,
oh