Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the assert in the previous commit.

Browse Source
This commit is contained in:
rmind 2014-05-23 00:02:14 +00:00
parent 8086b5d55a
commit 92bd82246b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/netinet/ip_output.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_output.c,v 1.226 2014/05/22 23:42:53 rmind Exp $ */ /* $NetBSD: ip_output.c,v 1.227 2014/05/23 00:02:14 rmind Exp $ */
/* /*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -91,7 +91,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.226 2014/05/22 23:42:53 rmind Exp $"); __KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.227 2014/05/23 00:02:14 rmind Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "opt_ipsec.h" #include "opt_ipsec.h"
@ -191,7 +191,6 @@ ip_output(struct mbuf *m0, ...)
MCLAIM(m, &ip_tx_mowner); MCLAIM(m, &ip_tx_mowner);
KASSERT(solocked(so));
KASSERT((m->m_flags & M_PKTHDR) != 0); KASSERT((m->m_flags & M_PKTHDR) != 0);
KASSERT((m->m_pkthdr.csum_flags & (M_CSUM_TCPv6|M_CSUM_UDPv6)) == 0); KASSERT((m->m_pkthdr.csum_flags & (M_CSUM_TCPv6|M_CSUM_UDPv6)) == 0);
KASSERT((m->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4)) != KASSERT((m->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4)) !=
@ -571,7 +570,10 @@ sendit:
*/ */
if (ntohs(ip->ip_off) & IP_DF) { if (ntohs(ip->ip_off) & IP_DF) {
if (flags & IP_RETURNMTU) { if (flags & IP_RETURNMTU) {
struct inpcb *inp = sotoinpcb(so); struct inpcb *inp;
KASSERT(so && solocked(so));
inp = sotoinpcb(so);
inp->inp_errormtu = mtu; inp->inp_errormtu = mtu;
} }
error = EMSGSIZE; error = EMSGSIZE;