diff options
| author |   dlg <dlg@openbsd.org> | 2018-02-09 09:35:03 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2018-02-09 09:35:03 +0000 |
| commit | 44e4158c5e744657a4b970c1ac79a9b92288251a (patch) | |
| tree | af41a345f7bcb08dfea031c27e69e60163a9c10e | |
| parent | use struct in_addr to represent an address. (diff) | |
| download | wireguard-openbsd-44e4158c5e744657a4b970c1ac79a9b92288251a.tar.xz wireguard-openbsd-44e4158c5e744657a4b970c1ac79a9b92288251a.zip | |
oh carp - i didnt mean to commit these
| -rw-r--r-- | sys/net/if.c | 10 | ||||
| -rw-r--r-- | sys/net/if_ipe.c | 0 | ||||
| -rw-r--r-- | sys/net/if_ipe.h | 0 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 9 |
4 files changed, 3 insertions, 16 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 89470799f25..1557cae6cca 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.540 2018/02/09 09:30:37 dlg Exp $ */ +/* $OpenBSD: if.c,v 1.541 2018/02/09 09:35:03 dlg Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -2109,14 +2109,6 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p) if ((error = suser(p, 0)) != 0) break; /* FALLTHROUGH */ - case SIOCGETKALIVE: - case SIOCGLIFPHYADDR: - case SIOCGLIFPHYRTABLE: - case SIOCGLIFPHYTTL: - case SIOCGIFMEDIA: - case SIOCGVNETID: - case SIOCGIFPAIR: - case SIOCGIFPARENT: default: NET_LOCK(); error = ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL, diff --git a/sys/net/if_ipe.c b/sys/net/if_ipe.c deleted file mode 100644 index e69de29bb2d..00000000000 --- a/sys/net/if_ipe.c +++ /dev/null diff --git a/sys/net/if_ipe.h b/sys/net/if_ipe.h deleted file mode 100644 index e69de29bb2d..00000000000 --- a/sys/net/if_ipe.h +++ /dev/null diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 360d21ad2ca..d7271ffe326 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.475 2018/02/09 09:30:37 dlg Exp $ */ +/* $OpenBSD: pfvar.h,v 1.476 2018/02/09 09:35:03 dlg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -49,10 +49,6 @@ struct ip; struct ip6_hdr; struct mbuf_list; -/* sub protocol types */ -#define IPPROTO_GRE_V0 0 -#define IPPROTO_GRE_PPTP 1 - #define PF_TCPS_PROXY_SRC ((TCP_NSTATES)+0) #define PF_TCPS_PROXY_DST ((TCP_NSTATES)+1) @@ -589,8 +585,7 @@ struct pf_rule { u_int8_t set_prio[2]; sa_family_t naf; u_int8_t rcvifnot; - u_int8_t subproto; - u_int8_t pad[1]; + u_int8_t pad[2]; struct { struct pf_addr addr; |