commit f0320c85346167246c4fd50e5cac453afb06c663 Author: Ryota Ozaki Date: Wed Jul 30 10:20:58 2014 +0900 Call etherinit when ether is required diff --git a/sys/conf/files b/sys/conf/files index 8e23b25..9dc61e9 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1708,7 +1708,7 @@ file net/bridgestp.c bridge file net/if_ecosubr.c eco file net/if_etherip.c etherip needs-flag file net/if_ethersubr.c ether | fddi | netatalk | token | - wlan + wlan needs-flag file net/if_faith.c faith & (inet | inet6) needs-flag file net/if_fddisubr.c fddi needs-flag file net/if_gif.c gif needs-flag diff --git a/sys/net/if.c b/sys/net/if.c index 8af331d..db54600 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -96,6 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.285 2014/07/01 10:16:02 ozaki-r Exp $"); #include "opt_atalk.h" #include "opt_natm.h" +#include "opt_wlan.h" #include #include @@ -139,6 +140,10 @@ __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.285 2014/07/01 10:16:02 ozaki-r Exp $"); #include #endif +#include "ether.h" +#include "fddi.h" +#include "token.h" + #include "carp.h" #if NCARP > 0 #include @@ -261,7 +266,9 @@ ifinit1(void) if_pfil = pfil_head_create(PFIL_TYPE_IFNET, NULL); KASSERT(if_pfil != NULL); +#if NETHER > 0 || NFDDI > 0 || defined(NETATALK) || NTOKEN > 0 || defined(WLAN) etherinit(); +#endif } ifnet_t * diff --git a/sys/rump/net/lib/libnetinet/opt/ether.h b/sys/rump/net/lib/libnetinet/opt/ether.h new file mode 100644 index 0000000..9efaf37 --- /dev/null +++ b/sys/rump/net/lib/libnetinet/opt/ether.h @@ -0,0 +1,3 @@ +/* $NetBSD$ */ + +/* dummy */ diff --git a/sys/rump/net/lib/libnetinet/opt/opt_wlan.h b/sys/rump/net/lib/libnetinet/opt/opt_wlan.h new file mode 100644 index 0000000..9efaf37 --- /dev/null +++ b/sys/rump/net/lib/libnetinet/opt/opt_wlan.h @@ -0,0 +1,3 @@ +/* $NetBSD$ */ + +/* dummy */