diff options
author | Robert Watson <rwatson@FreeBSD.org> | 2004-06-11 04:06:51 +0000 |
---|---|---|
committer | Robert Watson <rwatson@FreeBSD.org> | 2004-06-11 04:06:51 +0000 |
commit | c1d587c8480b57abf7fe4eeca25df30e59fff948 (patch) | |
tree | d9fb99e58198d9453ebefa5ebed1371b151908ab | |
parent | 935becd8ddda9d242601819de5bedfdf3e6a7865 (diff) | |
download | src-c1d587c8480b57abf7fe4eeca25df30e59fff948.tar.gz src-c1d587c8480b57abf7fe4eeca25df30e59fff948.zip |
Remove unneeded Giant acquisition in divert_packet(), which is
left over from debug.mpsafenet affecting only the forwarding
plane. Giant is now acquired in the ithread/netisr or in the
system call code.
Notes
Notes:
svn path=/head/; revision=130337
-rw-r--r-- | sys/netinet/ip_divert.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 1baf68d8f606..ccf0d96093fc 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -219,20 +219,6 @@ divert_packet(struct mbuf *m, int incoming) sizeof(divsrc.sin_zero)); } - /* - * XXX sbappendaddr must be protected by Giant until - * we have locking at the socket layer. When entered - * from below we come in w/o Giant and must take it - * here. Unfortunately we cannot tell whether we're - * entering from above (already holding Giant), - * below (potentially without Giant), or otherwise - * (e.g. from tcp_syncache through a timeout) so we - * have to grab it regardless. This causes a LOR with - * the tcp lock, at least, and possibly others. For - * the moment we're ignoring this. Once sockets are - * locked this cruft can be removed. - */ - mtx_lock(&Giant); /* Put packet on socket queue, if any */ sa = NULL; nport = htons((u_int16_t)divert_info(mtag)); @@ -254,7 +240,6 @@ divert_packet(struct mbuf *m, int incoming) INP_UNLOCK(inp); } INP_INFO_RUNLOCK(&divcbinfo); - mtx_unlock(&Giant); if (sa == NULL) { m_freem(m); ipstat.ips_noproto++; |