Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Back out prior
details: https://anonhg.NetBSD.org/src/rev/a806e2ae8769
branches: trunk
changeset: 338611:a806e2ae8769
user: roy <roy%NetBSD.org@localhost>
date: Mon Jun 01 00:15:07 2015 +0000
description:
Back out prior
gimpy1@ we don't #include driver .h in netbsd32
diffstat:
sys/compat/netbsd32/netbsd32_ioctl.c | 23 ++---------------------
sys/modules/compat_netbsd32/pppoe.h | 2 --
sys/modules/compat_netbsd32/sppp.h | 2 --
sys/net/files.net | 4 ++--
4 files changed, 4 insertions(+), 27 deletions(-)
diffs (135 lines):
diff -r 54b1f3429c40 -r a806e2ae8769 sys/compat/netbsd32/netbsd32_ioctl.c
--- a/sys/compat/netbsd32/netbsd32_ioctl.c Sun May 31 23:40:19 2015 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c Mon Jun 01 00:15:07 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.79 2015/05/31 23:40:20 roy Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.80 2015/06/01 00:15:08 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.79 2015/05/31 23:40:20 roy Exp $");
-
-#include "pppoe.h"
-#include "sppp.h"
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.80 2015/06/01 00:15:08 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);
diff -r 54b1f3429c40 -r a806e2ae8769 sys/modules/compat_netbsd32/pppoe.h
--- a/sys/modules/compat_netbsd32/pppoe.h Sun May 31 23:40:19 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-/* $NetBSD: pppoe.h,v 1.1 2015/05/31 23:40:20 roy Exp $ */
-#define NPPPOE 1
diff -r 54b1f3429c40 -r a806e2ae8769 sys/modules/compat_netbsd32/sppp.h
--- a/sys/modules/compat_netbsd32/sppp.h Sun May 31 23:40:19 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-/* $NetBSD: sppp.h,v 1.1 2015/05/31 23:40:20 roy Exp $ */
-#define NSPPP 1
diff -r 54b1f3429c40 -r a806e2ae8769 sys/net/files.net
--- a/sys/net/files.net Sun May 31 23:40:19 2015 +0000
+++ b/sys/net/files.net Mon Jun 01 00:15:07 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.net,v 1.5 2015/05/31 23:40:19 roy Exp $
+# $NetBSD: files.net,v 1.6 2015/06/01 00:15:07 roy Exp $
# XXX CLEANUP
define net
@@ -29,7 +29,7 @@
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 needs-flag
+file net/if_spppsubr.c sppp
file net/if_strip.c strip needs-flag
file net/if_tokensubr.c token needs-flag
file net/if_tap.c tap
Home |
Main Index |
Thread Index |
Old Index