diff options
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/if_ether.c | 4 | ||||
| -rw-r--r-- | sys/netinet/in_proto.c | 15 | ||||
| -rw-r--r-- | sys/netinet/ip_input.c | 4 |
3 files changed, 3 insertions, 20 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 8c92de3..c87b72d 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -161,6 +161,7 @@ arp_rtrequest(req, rt, sa) arpinit_done = 1; LIST_INIT(&llinfo_arp); timeout(arptimer, (caddr_t)0, hz); + register_netisr(NETISR_ARP, arpintr); } if (rt->rt_flags & RTF_GATEWAY) return; @@ -458,9 +459,6 @@ arpintr() } } -NETISR_SET(NETISR_ARP, arpintr); - - #ifdef INET /* * ARP for Internet protocols on 10 Mb/s Ethernet. diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index e3243f8..2fdfddf 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -184,21 +184,6 @@ struct ipprotosw inetsw[] = { &div_usrreqs, }, #endif -#ifdef TPIP -{ SOCK_SEQPACKET,&inetdomain, IPPROTO_TP, PR_CONNREQUIRED|PR_WANTRCVD, - tpip_input, 0, tpip_ctlinput, tp_ctloutput, - tp_usrreq, - tp_init, 0, tp_slowtimo, tp_drain, -}, -#endif -/* EON (ISO CLNL over IP) */ -#ifdef EON -{ SOCK_RAW, &inetdomain, IPPROTO_EON, 0, - eoninput, 0, eonctlinput, 0, - 0, - eonprotoinit, 0, 0, 0, -}, -#endif #ifdef IPXIP { SOCK_RAW, &inetdomain, IPPROTO_IDP, PR_ATOMIC|PR_ADDR, ipxip_input, 0, ipxip_ctlinput, 0, diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index b1eb90d..26cfdc8 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -244,6 +244,8 @@ ip_init() ip_id = time_second & 0xffff; ipintrq.ifq_maxlen = ipqmaxlen; + + register_netisr(NETISR_IP, ipintr); } static struct sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET }; @@ -770,8 +772,6 @@ ipintr(void) } } -NETISR_SET(NETISR_IP, ipintr); - /* * Take incoming datagram fragment and try to reassemble it into * whole datagram. If a chain for reassembly of this datagram already |
