summaryrefslogtreecommitdiff
path: root/sys/netinet/ip_mroute.h
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2013-05-02 11:54:11 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2013-05-02 11:54:11 +0000
commit93b471d93a6f50c4aa79db3b83e96c873b138eaa (patch)
treeebe06176f3b1c982aeef776c76ce0ac220e2ab90 /sys/netinet/ip_mroute.h
parentb7b13d5b1178a536bac46e176528707275b5f55a (diff)
tedu broken Resource Reservation Protocol code that was ifdef RSVP_ISI.
ok deraadt@, tedu@ (implicit)
Diffstat (limited to 'sys/netinet/ip_mroute.h')
-rw-r--r--sys/netinet/ip_mroute.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index f55e30199dd..a8ab635c416 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_mroute.h,v 1.15 2009/07/13 19:14:29 michele Exp $ */
+/* $OpenBSD: ip_mroute.h,v 1.16 2013/05/02 11:54:10 mpi Exp $ */
/* $NetBSD: ip_mroute.h,v 1.23 2004/04/21 17:49:46 itojun Exp $ */
#ifndef _NETINET_IP_MROUTE_H_
@@ -231,10 +231,6 @@ struct vif {
u_long v_bytes_out; /* # bytes out on interface */
struct route v_route; /* cached route if this is a tunnel */
struct timeout v_repq_ch; /* for tbf_reprocess_q() */
-#ifdef RSVP_ISI
- int v_rsvp_on; /* # RSVP listening on this vif */
- struct socket *v_rsvpd; /* # RSVPD daemon */
-#endif /* RSVP_ISI */
};
/*
@@ -325,16 +321,6 @@ int ip_mrouter_done(void);
void ip_mrouter_detach(struct ifnet *);
void reset_vif(struct vif *);
void vif_delete(struct ifnet *);
-#ifdef RSVP_ISI
-int ip_mforward(struct mbuf *, struct ifnet *, struct ip_moptions *);
-int legal_vif_num(int);
-int ip_rsvp_vif_init(struct socket *, struct mbuf *);
-int ip_rsvp_vif_done(struct socket *, struct mbuf *);
-void ip_rsvp_force_done(struct socket *);
-void rsvp_input(struct mbuf *, int, int);
-#else
-int ip_mforward(struct mbuf *, struct ifnet *);
-#endif /* RSVP_ISI */
#endif /* _KERNEL */
#endif /* _NETINET_IP_MROUTE_H_ */