diff options
author | dim <dim@FreeBSD.org> | 2010-11-22 19:32:54 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2010-11-22 19:32:54 +0000 |
commit | fb307d7d1de2e083e767df27714dca5352792ac3 (patch) | |
tree | ddc86814ee8f35466e619bb63b8f15b41185074e /sys/netinet/if_ether.c | |
parent | b040c9742c99e20eb9926995bea03ad4f3e849c8 (diff) | |
download | FreeBSD-src-fb307d7d1de2e083e767df27714dca5352792ac3.zip FreeBSD-src-fb307d7d1de2e083e767df27714dca5352792ac3.tar.gz |
After some off-list discussion, revert a number of changes to the
DPCPU_DEFINE and VNET_DEFINE macros, as these cause problems for various
people working on the affected files. A better long-term solution is
still being considered. This reversal may give some modules empty
set_pcpu or set_vnet sections, but these are harmless.
Changes reverted:
------------------------------------------------------------------------
r215318 | dim | 2010-11-14 21:40:55 +0100 (Sun, 14 Nov 2010) | 4 lines
Instead of unconditionally emitting .globl's for the __start_set_xxx and
__stop_set_xxx symbols, only emit them when the set_vnet or set_pcpu
sections are actually defined.
------------------------------------------------------------------------
r215317 | dim | 2010-11-14 21:38:11 +0100 (Sun, 14 Nov 2010) | 3 lines
Apply the STATIC_VNET_DEFINE and STATIC_DPCPU_DEFINE macros throughout
the tree.
------------------------------------------------------------------------
r215316 | dim | 2010-11-14 21:23:02 +0100 (Sun, 14 Nov 2010) | 2 lines
Add macros to define static instances of VNET_DEFINE and DPCPU_DEFINE.
Diffstat (limited to 'sys/netinet/if_ether.c')
-rw-r--r-- | sys/netinet/if_ether.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index e8a03ef..ee5d8e0 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -81,17 +81,17 @@ SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, ""); SYSCTL_NODE(_net_link_ether, PF_ARP, arp, CTLFLAG_RW, 0, ""); /* timer values */ -STATIC_VNET_DEFINE(int, arpt_keep) = (20*60); /* once resolved, good for 20 +static VNET_DEFINE(int, arpt_keep) = (20*60); /* once resolved, good for 20 * minutes */ -STATIC_VNET_DEFINE(int, arp_maxtries) = 5; +static VNET_DEFINE(int, arp_maxtries) = 5; VNET_DEFINE(int, useloopback) = 1; /* use loopback interface for * local traffic */ -STATIC_VNET_DEFINE(int, arp_proxyall) = 0; -STATIC_VNET_DEFINE(int, arpt_down) = 20; /* keep incomplete entries for +static VNET_DEFINE(int, arp_proxyall) = 0; +static VNET_DEFINE(int, arpt_down) = 20; /* keep incomplete entries for * 20 seconds */ VNET_DEFINE(struct arpstat, arpstat); /* ARP statistics, see if_arp.h */ -STATIC_VNET_DEFINE(int, arp_maxhold) = 1; +static VNET_DEFINE(int, arp_maxhold) = 1; #define V_arpt_keep VNET(arpt_keep) #define V_arpt_down VNET(arpt_down) |