diff options
| author | andre <andre@FreeBSD.org> | 2013-05-06 16:42:18 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2013-05-06 16:42:18 +0000 |
| commit | cc8c6e4d0185c640c9d03ed2804e3020ff84fed0 (patch) | |
| tree | bc5a2ce870d8be82a3e6edc11f23760b66ef0c33 /sys/netinet/ip_input.c | |
| parent | 1734db112abe08b1a5ac14f46a78473dc350eb64 (diff) | |
| download | FreeBSD-src-cc8c6e4d0185c640c9d03ed2804e3020ff84fed0.zip FreeBSD-src-cc8c6e4d0185c640c9d03ed2804e3020ff84fed0.tar.gz | |
Back out r249318, r249320 and r249327 due to a heisenbug most
likely related to a race condition in the ipi_hash_lock with
the exact cause currently unknown but under investigation.
Diffstat (limited to 'sys/netinet/ip_input.c')
| -rw-r--r-- | sys/netinet/ip_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 17a4e1d..f38c6fa 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -85,7 +85,7 @@ __FBSDID("$FreeBSD$"); CTASSERT(sizeof(struct ip) == 20); #endif -struct rwlock_padalign in_ifaddr_lock; +struct rwlock in_ifaddr_lock; RW_SYSINIT(in_ifaddr_lock, &in_ifaddr_lock, "in_ifaddr_lock"); VNET_DEFINE(int, rsvp_on); @@ -155,7 +155,7 @@ VNET_DEFINE(u_long, in_ifaddrhmask); /* mask for hash table */ static VNET_DEFINE(uma_zone_t, ipq_zone); static VNET_DEFINE(TAILQ_HEAD(ipqhead, ipq), ipq[IPREASS_NHASH]); -static struct mtx_padalign ipqlock; +static struct mtx ipqlock; #define V_ipq_zone VNET(ipq_zone) #define V_ipq VNET(ipq) |
