diff options
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/if_ether.c | 4 | ||||
| -rw-r--r-- | sys/netinet/in.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_gre.c | 6 | ||||
| -rw-r--r-- | sys/netinet/ip_input.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_ipip.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ipsec_input.c | 8 | ||||
| -rw-r--r-- | sys/netinet/tcp_subr.c | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 4bd58fa0e4f..74b5a5b5825 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.61 2005/11/29 02:59:42 jolan Exp $ */ +/* $OpenBSD: if_ether.c,v 1.62 2006/03/04 22:40:16 brad Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -464,7 +464,7 @@ arpintr() int s, len; while (arpintrq.ifq_head) { - s = splimp(); + s = splnet(); IF_DEQUEUE(&arpintrq, m); splx(s); if (m == 0 || (m->m_flags & M_PKTHDR) == 0) diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 4e9f456bb86..ed48a712707 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in.c,v 1.42 2006/02/21 15:33:59 claudio Exp $ */ +/* $OpenBSD: in.c,v 1.43 2006/03/04 22:40:16 brad Exp $ */ /* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */ /* @@ -674,7 +674,7 @@ in_ifinit(ifp, ia, sin, scrub) { u_int32_t i = sin->sin_addr.s_addr; struct sockaddr_in oldaddr; - int s = splimp(), flags = RTF_UP, error; + int s = splnet(), flags = RTF_UP, error; oldaddr = ia->ia_addr; ia->ia_addr = *sin; diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index 886964f2070..d6948648d25 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_gre.c,v 1.27 2005/07/31 03:52:19 pascoe Exp $ */ +/* $OpenBSD: ip_gre.c,v 1.28 2006/03/04 22:40:16 brad Exp $ */ /* $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -196,7 +196,7 @@ gre_input2(m , hlen, proto) bpf_mtap_af(sc->sc_if.if_bpf, af, m); #endif - s = splimp(); /* possible */ + s = splnet(); /* possible */ IF_INPUT_ENQUEUE(ifq, m); splx(s); @@ -322,7 +322,7 @@ gre_mobile_input(struct mbuf *m, ...) bpf_mtap_af(sc->sc_if.if_bpf, AF_INET, m); #endif - s = splimp(); /* possible */ + s = splnet(); /* possible */ IF_INPUT_ENQUEUE(ifq, m); splx(s); } diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index d6ca6ad4b5e..e77bee09577 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.136 2006/01/03 14:53:50 mpf Exp $ */ +/* $OpenBSD: ip_input.c,v 1.137 2006/03/04 22:40:16 brad Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -249,7 +249,7 @@ ipintr() * Get next datagram off input queue and get IP header * in first mbuf. */ - s = splimp(); + s = splnet(); IF_DEQUEUE(&ipintrq, m); splx(s); if (m == 0) diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c index e121ece0c3e..9b6fd0c5615 100644 --- a/sys/netinet/ip_ipip.c +++ b/sys/netinet/ip_ipip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipip.c,v 1.33 2005/07/31 03:52:19 pascoe Exp $ */ +/* $OpenBSD: ip_ipip.c,v 1.34 2006/03/04 22:40:16 brad Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -365,7 +365,7 @@ ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp) m); #endif - s = splimp(); /* isn't it already? */ + s = splnet(); /* isn't it already? */ if (IF_QFULL(ifq)) { IF_DROP(ifq); m_freem(m); diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index dae7a979b9e..36fde452909 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.173 2005/10/05 17:32:22 norby Exp $ */ +/* $OpenBSD: ip_output.c,v 1.174 2006/03/04 22:40:16 brad Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -1978,7 +1978,7 @@ in_delayed_cksum(struct mbuf *m) ip = mtod(m, struct ip *); offset = ip->ip_hl << 2; csum = in4_cksum(m, 0, offset, m->m_pkthdr.len - offset); - if (csum == 0 && ip->ip_p == IPPROTO_UDP) + if (csum == 0 && (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) != 0) csum = 0xffff; switch (ip->ip_p) { diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c index aaddbf4a778..84292f88471 100644 --- a/sys/netinet/ipsec_input.c +++ b/sys/netinet/ipsec_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_input.c,v 1.77 2006/01/13 10:11:23 mpf Exp $ */ +/* $OpenBSD: ipsec_input.c,v 1.78 2006/03/04 22:40:16 brad Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -676,7 +676,7 @@ int ah4_input_cb(struct mbuf *m, ...) { struct ifqueue *ifq = &ipintrq; - int s = splimp(); + int s = splnet(); /* * Interface pointer is already in first mbuf; chop off the @@ -731,7 +731,7 @@ int esp4_input_cb(struct mbuf *m, ...) { struct ifqueue *ifq = &ipintrq; - int s = splimp(); + int s = splnet(); /* * Interface pointer is already in first mbuf; chop off the @@ -773,7 +773,7 @@ int ipcomp4_input_cb(struct mbuf *m, ...) { struct ifqueue *ifq = &ipintrq; - int s = splimp(); + int s = splnet(); /* * Interface pointer is already in first mbuf; chop off the diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index bea45d5015b..13dc5c7ec40 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_subr.c,v 1.92 2005/09/28 15:20:12 brad Exp $ */ +/* $OpenBSD: tcp_subr.c,v 1.93 2006/03/04 22:40:16 brad Exp $ */ /* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */ /* @@ -626,7 +626,7 @@ tcp_drain() { struct inpcb *inp; - /* called at splimp() */ + /* called at splnet() */ CIRCLEQ_FOREACH(inp, &tcbtable.inpt_queue, inp_queue) { struct tcpcb *tp = (struct tcpcb *)inp->inp_ppcb; |