Module Name: src Committed By: roy Date: Sun May 31 22:58:50 UTC 2015
Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c Log Message: It seems we cannot depend on kernel config in modules, so always compile in PPP(,oE) support. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/compat/netbsd32/netbsd32_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/compat/netbsd32/netbsd32_ioctl.c diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.77 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.78 --- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.77 Sun May 31 22:19:41 2015 +++ src/sys/compat/netbsd32/netbsd32_ioctl.c Sun May 31 22:58:50 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ioctl.c,v 1.77 2015/05/31 22:19:41 roy Exp $ */ +/* $NetBSD: netbsd32_ioctl.c,v 1.78 2015/05/31 22:58:50 roy Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -31,10 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.77 2015/05/31 22:19:41 roy Exp $"); - -#include "pppoe.h" -#include "sppp.h" +__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.78 2015/05/31 22:58:50 roy Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,12 +65,8 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ioc #include <net/if.h> #include <net/route.h> -#if NPPPOE > 0 #include <net/if_pppoe.h> -#endif -#if NSPPP > 0 #include <net/if_sppp.h> -#endif #include <net/bpf.h> #include <netinet/in.h> @@ -169,7 +162,6 @@ netbsd32_to_ifmediareq(struct netbsd32_i p->ifm_ulist = (int *)NETBSD32PTR64(s32p->ifm_ulist); } -#if NPPPOE > 0 static inline void netbsd32_to_pppoediscparms(struct netbsd32_pppoediscparms *s32p, struct pppoediscparms *p, u_long cmd) @@ -182,9 +174,7 @@ netbsd32_to_pppoediscparms(struct netbsd p->service_name = (char *)NETBSD32PTR64(s32p->service_name); p->service_name_len = s32p->service_name_len; } -#endif -#if NSPPP > 0 static inline void netbsd32_to_spppauthcfg(struct netbsd32_spppauthcfg *s32p, struct spppauthcfg *p, u_long cmd) @@ -204,7 +194,6 @@ netbsd32_to_spppauthcfg(struct netbsd32_ p->hisname = (char *)NETBSD32PTR64(s32p->hisname); p->hissecret = (char *)NETBSD32PTR64(s32p->hissecret); } -#endif static inline void netbsd32_to_ifdrv(struct netbsd32_ifdrv *s32p, struct ifdrv *p, u_long cmd) @@ -548,7 +537,6 @@ netbsd32_from_ifmediareq(struct ifmediar #endif } -#if NPPPOE > 0 static inline void netbsd32_from_pppoediscparms(struct pppoediscparms *p, struct netbsd32_pppoediscparms *s32p, u_long cmd) @@ -561,9 +549,7 @@ netbsd32_from_pppoediscparms(struct pppo NETBSD32PTR32(s32p->service_name, p->service_name); s32p->service_name_len = p->service_name_len; } -#endif -#if NSPPP > 0 static inline void netbsd32_from_spppauthcfg(struct spppauthcfg *p, struct netbsd32_spppauthcfg *s32p, u_long cmd) @@ -583,7 +569,6 @@ netbsd32_from_spppauthcfg(struct spppaut NETBSD32PTR32(s32p->hisname, p->hisname); NETBSD32PTR32(s32p->hissecret, p->hissecret); } -#endif static inline void netbsd32_from_ifdrv(struct ifdrv *p, struct netbsd32_ifdrv *s32p, u_long cmd) @@ -1124,18 +1109,14 @@ netbsd32_ioctl(struct lwp *l, const stru case SIOCGIFMEDIA32: IOCTL_STRUCT_CONV_TO(SIOCGIFMEDIA, ifmediareq); -#if NPPPOE > 0 case PPPOESETPARMS32: IOCTL_STRUCT_CONV_TO(PPPOESETPARMS, pppoediscparms); case PPPOEGETPARMS32: IOCTL_STRUCT_CONV_TO(PPPOEGETPARMS, pppoediscparms); -#endif -#if NSPPP > 0 case SPPPGETAUTHCFG32: IOCTL_STRUCT_CONV_TO(SPPPGETAUTHCFG, spppauthcfg); case SPPPSETAUTHCFG32: IOCTL_STRUCT_CONV_TO(SPPPSETAUTHCFG, spppauthcfg); -#endif case SIOCSDRVSPEC32: IOCTL_STRUCT_CONV_TO(SIOCSDRVSPEC, ifdrv);