diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2020-01-15 03:34:21 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2020-01-15 03:34:21 +0000 |
| commit | 3264dcadc9d3e6f05164441e62215d4f9e0bfa78 (patch) | |
| tree | 14ef95185686cb42afd269a626feb2f759b10991 /sys/net/if_var.h | |
| parent | 9cdc43b16e336b941c007dacecb242dd22336115 (diff) | |
| download | src-3264dcadc9d3e6f05164441e62215d4f9e0bfa78.tar.gz src-3264dcadc9d3e6f05164441e62215d4f9e0bfa78.zip | |
- Move global network epoch definition to epoch.h, as more different
subsystems tend to need to know about it, and including if_var.h is
huge header pollution for them. Polluting possible non-network
users with single symbol seems much lesser evil.
- Remove non-preemptible network epoch. Not used yet, and unlikely
to get used in close future.
Notes
Notes:
svn path=/head/; revision=356748
Diffstat (limited to 'sys/net/if_var.h')
| -rw-r--r-- | sys/net/if_var.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 3b869346eb17..e1d22d5b436b 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -107,8 +107,6 @@ VNET_DECLARE(struct hhook_head *, ipsec_hhh_in[HHOOK_IPSEC_COUNT]); VNET_DECLARE(struct hhook_head *, ipsec_hhh_out[HHOOK_IPSEC_COUNT]); #define V_ipsec_hhh_in VNET(ipsec_hhh_in) #define V_ipsec_hhh_out VNET(ipsec_hhh_out) -extern epoch_t net_epoch_preempt; -extern epoch_t net_epoch; #endif /* _KERNEL */ typedef enum { @@ -445,10 +443,6 @@ struct ifnet { #define IF_ADDR_WUNLOCK(if) mtx_unlock(&(if)->if_addr_lock) #define IF_ADDR_LOCK_ASSERT(if) MPASS(in_epoch(net_epoch_preempt) || mtx_owned(&(if)->if_addr_lock)) #define IF_ADDR_WLOCK_ASSERT(if) mtx_assert(&(if)->if_addr_lock, MA_OWNED) -#define NET_EPOCH_ENTER(et) epoch_enter_preempt(net_epoch_preempt, &(et)) -#define NET_EPOCH_EXIT(et) epoch_exit_preempt(net_epoch_preempt, &(et)) -#define NET_EPOCH_WAIT() epoch_wait_preempt(net_epoch_preempt) -#define NET_EPOCH_ASSERT() MPASS(in_epoch(net_epoch_preempt)) #ifdef _KERNEL /* interface link layer address change event */ |