diff options
Diffstat (limited to 'sys/netinet/ip_input.c')
| -rw-r--r-- | sys/netinet/ip_input.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 8fd26e4ca861..7c365b2e51b8 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -82,7 +82,6 @@ __FBSDID("$FreeBSD$"); #include <machine/in_cksum.h> #include <netinet/ip_carp.h> #include <netinet/in_rss.h> -#include <netinet/ip_mroute.h> #include <netipsec/ipsec_support.h> @@ -448,7 +447,6 @@ ip_direct_input(struct mbuf *m) void ip_input(struct mbuf *m) { - MROUTER_RLOCK_TRACKER; struct ip *ip = NULL; struct in_ifaddr *ia = NULL; struct ifaddr *ifa; @@ -744,7 +742,6 @@ passin: ia = NULL; } if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) { - MROUTER_RLOCK(); /* * RFC 3927 2.7: Do not forward multicast packets from * IN_LINKLOCAL. @@ -759,7 +756,6 @@ passin: * must be discarded, else it may be accepted below. */ if (ip_mforward && ip_mforward(ip, ifp, m, 0) != 0) { - MROUTER_RUNLOCK(); IPSTAT_INC(ips_cantforward); m_freem(m); return; @@ -771,12 +767,10 @@ passin: * host belongs to their destination groups. */ if (ip->ip_p == IPPROTO_IGMP) { - MROUTER_RUNLOCK(); goto ours; } IPSTAT_INC(ips_forward); } - MROUTER_RUNLOCK(); /* * Assume the packet is for us, to avoid prematurely taking * a lock on the in_multi hash. Protocols must perform |