Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert prior change, optionally include PPPOE and SPPP support again.

Browse Source 
Fix compat_netbsd32 module building by enforcing both.
This commit is contained in:
roy 2015-05-31 23:40:19 +00:00
parent eeb5f0236a
commit 643289594b
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/compat/netbsd32/netbsd32_ioctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netbsd32_ioctl.c,v 1.78 2015/05/31 22:58:50 roy Exp $ */
/* $NetBSD: netbsd32_ioctl.c,v 1.79 2015/05/31 23:40:20 roy Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@ -31,7 +31,10 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.78 2015/05/31 22:58:50 roy Exp $");
__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.79 2015/05/31 23:40:20 roy Exp $");
#include "pppoe.h"
#include "sppp.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -65,8 +68,12 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.78 2015/05/31 22:58:50 roy Exp
#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>
@ -162,6 +169,7 @@ netbsd32_to_ifmediareq(struct netbsd32_ifmediareq *s32p, struct ifmediareq *p, u
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)
@ -174,7 +182,9 @@ netbsd32_to_pppoediscparms(struct netbsd32_pppoediscparms *s32p,
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)
@ -194,6 +204,7 @@ netbsd32_to_spppauthcfg(struct netbsd32_spppauthcfg *s32p,
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)
@ -537,6 +548,7 @@ netbsd32_from_ifmediareq(struct ifmediareq *p, struct netbsd32_ifmediareq *s32p,
#endif
}
#if NPPPOE > 0
static inline void
netbsd32_from_pppoediscparms(struct pppoediscparms *p,
struct netbsd32_pppoediscparms *s32p, u_long cmd)
@ -549,7 +561,9 @@ netbsd32_from_pppoediscparms(struct pppoediscparms *p,
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)
@ -569,6 +583,7 @@ netbsd32_from_spppauthcfg(struct spppauthcfg *p,
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)
@ -1109,14 +1124,18 @@ netbsd32_ioctl(struct lwp *l, const struct netbsd32_ioctl_args *uap, register_t
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);

2
sys/modules/compat_netbsd32/pppoe.h Normal file
View File

@ -0,0 +1,2 @@
/* $NetBSD: pppoe.h,v 1.1 2015/05/31 23:40:20 roy Exp $ */
#define NPPPOE 1

2
sys/modules/compat_netbsd32/sppp.h Normal file
View File

@ -0,0 +1,2 @@
/* $NetBSD: sppp.h,v 1.1 2015/05/31 23:40:20 roy Exp $ */
#define NSPPP 1

4
sys/net/files.net
View File

@ -1,4 +1,4 @@
# $NetBSD: files.net,v 1.4 2015/05/31 23:01:04 roy Exp $
# $NetBSD: files.net,v 1.5 2015/05/31 23:40:19 roy Exp $
# XXX CLEANUP
define net
@ -29,7 +29,7 @@ file net/if_ppp.c ppp needs-flag
file net/if_srt.c srt
file net/if_stf.c stf & inet & inet6 needs-flag
file net/if_sl.c sl needs-flag
file net/if_spppsubr.c sppp
file net/if_spppsubr.c sppp needs-flag
file net/if_strip.c strip needs-flag
file net/if_tokensubr.c token needs-flag
file net/if_tap.c tap