[src/trunk]: src/sys/compat/netbsd32 It seems we cannot depend on kernel conf...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d4e9a86565ad
branches:  trunk
changeset: 808750:d4e9a86565ad
user:      roy <roy%NetBSD.org@localhost>
date:      Sun May 31 22:58:50 2015 +0000

description:
It seems we cannot depend on kernel config in modules, so always compile
in PPP(,oE) support.

diffstat:

 sys/compat/netbsd32/netbsd32_ioctl.c |  23 ++---------------------
 1 files changed, 2 insertions(+), 21 deletions(-)

diffs (105 lines):

diff -r 5aaeb01618e2 -r d4e9a86565ad sys/compat/netbsd32/netbsd32_ioctl.c
--- a/sys/compat/netbsd32/netbsd32_ioctl.c      Sun May 31 22:19:41 2015 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c      Sun May 31 22:58:50 2015 +0000
@@ -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 @@
 #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 @@
        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 @@
        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 @@
        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 @@
 #endif
 }
 
-#if NPPPOE > 0
 static inline void
 netbsd32_from_pppoediscparms(struct pppoediscparms *p,
     struct netbsd32_pppoediscparms *s32p, u_long cmd)
@@ -561,9 +549,7 @@
        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 @@
        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 @@
        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);