aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2006-06-02 08:27:15 +0000
committerRobert Watson <rwatson@FreeBSD.org>2006-06-02 08:27:15 +0000
commit4421f50dbcd2f36b743aa399d2b97522e01adfa2 (patch)
tree07550a67293ceee812613e98f1155cd3d4313b45 /sys
parentad3a630f7e5d16965f2c8eaa450d7dde278fa479 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/net/raw_cb.c4
-rw-r--r--sys/net/raw_usrreq.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index f45be72cb766..705db619f7bd 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -113,7 +113,7 @@ raw_detach(rp)
}
/*
- * Disconnect and possibly release resources.
+ * Disconnect raw socket.
*/
void
raw_disconnect(rp)
@@ -125,8 +125,6 @@ raw_disconnect(rp)
m_freem(dtom(rp->rcb_faddr));
rp->rcb_faddr = 0;
#endif
- if (rp->rcb_socket->so_state & SS_NOFDREF)
- raw_detach(rp);
}
#ifdef notdef
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 5a7449a09790..4f2f006757e2 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -146,6 +146,7 @@ raw_uabort(struct socket *so)
KASSERT(rp != NULL, ("raw_uabort: rp == NULL"));
raw_disconnect(rp);
soisdisconnected(so);
+ raw_detach(rp);
}
/* pru_accept is EOPNOTSUPP */