diff options
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/if_ether.c | 7 | ||||
-rw-r--r-- | sys/netinet/in_proto.c | 12 | ||||
-rw-r--r-- | sys/netinet/ip_input.c | 7 |
3 files changed, 20 insertions, 6 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 02fa2b8..cc1611f 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $Id: if_ether.c,v 1.14 1995/04/26 18:10:52 pst Exp $ + * $Id: if_ether.c,v 1.15 1995/05/09 13:35:44 davidg Exp $ */ /* @@ -54,6 +54,7 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/route.h> +#include <net/netisr.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -367,7 +368,7 @@ arpresolve(ac, rt, m, dst, desten, rt0) * then the protocol-specific routine is called. */ void -arpintr() +arpintr(void) { register struct mbuf *m; register struct arphdr *ar; @@ -396,6 +397,8 @@ arpintr() } } +NETISR_SET(NETISR_ARP, arpintr); + /* * ARP for Internet protocols on 10 Mb/s Ethernet. * Algorithm is that given in RFC 826. diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 54eb8cd..82fcde2 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -30,11 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)in_proto.c 8.1 (Berkeley) 6/10/93 - * $Id: in_proto.c,v 1.12 1995/02/16 00:55:38 wollman Exp $ + * From: @(#)in_proto.c 8.1 (Berkeley) 6/10/93 + * $Id: in_proto.c,v 1.13 1995/04/09 01:29:20 davidg Exp $ */ #include <sys/param.h> +#include <sys/kernel.h> #include <sys/socket.h> #include <sys/protosw.h> #include <sys/domain.h> @@ -164,6 +165,8 @@ struct domain inetdomain = in_inithead, 32, sizeof(struct sockaddr_in) }; +DOMAIN_SET(inet); + #include "imp.h" #if NIMP > 0 extern struct domain impdomain; @@ -180,6 +183,9 @@ struct protosw impsw[] = { struct domain impdomain = { AF_IMPLINK, "imp", 0, 0, 0, impsw, &impsw[sizeof (impsw)/sizeof(impsw[0])] }; + +DOMAIN_SET(imp); + #endif #if 0 @@ -201,5 +207,7 @@ struct protosw hysw[] = { struct domain hydomain = { AF_HYLINK, "hy", 0, 0, 0, hysw, &hysw[sizeof (hysw)/sizeof(hysw[0])] }; + +DOMAIN_SET(hy); #endif #endif diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 0cccc09..89498b9 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $Id: ip_input.c,v 1.19 1995/03/16 18:22:28 wollman Exp $ + * $Id: ip_input.c,v 1.20 1995/05/09 13:35:45 davidg Exp $ */ #include <sys/param.h> @@ -51,6 +51,7 @@ #include <net/if.h> #include <net/route.h> +#include <net/netisr.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -143,7 +144,7 @@ struct route ipforward_rt; * try to reassemble. Process options. Pass to next level. */ void -ipintr() +ipintr(void) { register struct ip *ip; register struct mbuf *m; @@ -432,6 +433,8 @@ bad: goto next; } +NETISR_SET(NETISR_IP, ipintr); + /* * Take incoming datagram fragment and try to * reassemble it into whole datagram. If a chain for |