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/net/if_var.h | |
| 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/net/if_var.h')
| -rw-r--r-- | sys/net/if_var.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 41ac056..ce8f06a 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -191,9 +191,9 @@ struct ifnet { void *if_unused[2]; void *if_afdata[AF_MAX]; int if_afdata_initialized; + struct rwlock if_afdata_lock; struct task if_linktask; /* task for link change events */ - struct rwlock_padalign if_afdata_lock; - struct rwlock_padalign if_addr_lock; /* lock to protect address lists */ + struct rwlock if_addr_lock; /* lock to protect address lists */ LIST_ENTRY(ifnet) if_clones; /* interfaces of a cloner */ TAILQ_HEAD(, ifg_list) if_groups; /* linked list of groups per if */ @@ -832,7 +832,7 @@ struct ifmultiaddr { #ifdef _KERNEL -extern struct rwlock_padalign ifnet_rwlock; +extern struct rwlock ifnet_rwlock; extern struct sx ifnet_sxlock; #define IFNET_LOCK_INIT() do { \ |
