diff options
author | ed <ed@FreeBSD.org> | 2011-11-07 15:43:11 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2011-11-07 15:43:11 +0000 |
commit | 0c56cf839d3e773173db46a972d3792e8a36820d (patch) | |
tree | bf1175813c8ae55dc563480a7eadad2ffae50256 /sys/net | |
parent | 599a401646fe914e6aca992bf3d53f0d7b937253 (diff) | |
download | FreeBSD-src-0c56cf839d3e773173db46a972d3792e8a36820d.zip FreeBSD-src-0c56cf839d3e773173db46a972d3792e8a36820d.tar.gz |
Mark all SYSCTL_NODEs static that have no corresponding SYSCTL_DECLs.
The SYSCTL_NODE macro defines a list that stores all child-elements of
that node. If there's no SYSCTL_DECL macro anywhere else, there's no
reason why it shouldn't be static.
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/bpf.c | 2 | ||||
-rw-r--r-- | sys/net/flowtable.c | 3 | ||||
-rw-r--r-- | sys/net/if_bridge.c | 2 | ||||
-rw-r--r-- | sys/net/if_enc.c | 6 | ||||
-rw-r--r-- | sys/net/if_epair.c | 2 | ||||
-rw-r--r-- | sys/net/if_gif.c | 2 | ||||
-rw-r--r-- | sys/net/if_gre.c | 2 | ||||
-rw-r--r-- | sys/net/if_lagg.c | 3 | ||||
-rw-r--r-- | sys/net/if_mib.c | 4 | ||||
-rw-r--r-- | sys/net/if_stf.c | 2 | ||||
-rw-r--r-- | sys/net/if_tap.c | 2 | ||||
-rw-r--r-- | sys/net/if_tun.c | 2 | ||||
-rw-r--r-- | sys/net/if_vlan.c | 6 | ||||
-rw-r--r-- | sys/net/netisr.c | 2 | ||||
-rw-r--r-- | sys/net/raw_cb.c | 3 | ||||
-rw-r--r-- | sys/net/rtsock.c | 4 |
16 files changed, 26 insertions, 21 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 79c77a9..3dd2f93 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -170,7 +170,7 @@ SYSCTL_INT(_net_bpf, OID_AUTO, maxinsns, CTLFLAG_RW, static int bpf_zerocopy_enable = 0; SYSCTL_INT(_net_bpf, OID_AUTO, zerocopy_enable, CTLFLAG_RW, &bpf_zerocopy_enable, 0, "Enable new zero-copy BPF buffer sessions"); -SYSCTL_NODE(_net_bpf, OID_AUTO, stats, CTLFLAG_MPSAFE | CTLFLAG_RW, +static SYSCTL_NODE(_net_bpf, OID_AUTO, stats, CTLFLAG_MPSAFE | CTLFLAG_RW, bpf_stats_sysctl, "bpf statistics portal"); static d_open_t bpfopen; diff --git a/sys/net/flowtable.c b/sys/net/flowtable.c index 198c4c3..7814e3a 100644 --- a/sys/net/flowtable.c +++ b/sys/net/flowtable.c @@ -248,7 +248,8 @@ static VNET_DEFINE(int, flowtable_ready) = 0; #define V_flowtable_nmbflows VNET(flowtable_nmbflows) #define V_flowtable_ready VNET(flowtable_ready) -SYSCTL_NODE(_net_inet, OID_AUTO, flowtable, CTLFLAG_RD, NULL, "flowtable"); +static SYSCTL_NODE(_net_inet, OID_AUTO, flowtable, CTLFLAG_RD, NULL, + "flowtable"); SYSCTL_VNET_INT(_net_inet_flowtable, OID_AUTO, debug, CTLFLAG_RW, &VNET_NAME(flowtable_debug), 0, "print debug info."); SYSCTL_VNET_INT(_net_inet_flowtable, OID_AUTO, enable, CTLFLAG_RW, diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index c251653..3b3a19d 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -344,7 +344,7 @@ static struct bstp_cb_ops bridge_ops = { }; SYSCTL_DECL(_net_link); -SYSCTL_NODE(_net_link, IFT_BRIDGE, bridge, CTLFLAG_RW, 0, "Bridge"); +static SYSCTL_NODE(_net_link, IFT_BRIDGE, bridge, CTLFLAG_RW, 0, "Bridge"); static int pfil_onlyip = 1; /* only pass IP[46] packets when pfil is enabled */ static int pfil_bridge = 1; /* run pfil hooks on the bridge interface */ diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index eee3733..9506172 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -102,9 +102,9 @@ IFC_SIMPLE_DECLARE(enc, 1); * Before and after are relative to when we are stripping the * outer IP header. */ -SYSCTL_NODE(_net, OID_AUTO, enc, CTLFLAG_RW, 0, "enc sysctl"); +static SYSCTL_NODE(_net, OID_AUTO, enc, CTLFLAG_RW, 0, "enc sysctl"); -SYSCTL_NODE(_net_enc, OID_AUTO, in, CTLFLAG_RW, 0, "enc input sysctl"); +static SYSCTL_NODE(_net_enc, OID_AUTO, in, CTLFLAG_RW, 0, "enc input sysctl"); static int ipsec_filter_mask_in = ENC_BEFORE; SYSCTL_INT(_net_enc_in, OID_AUTO, ipsec_filter_mask, CTLFLAG_RW, &ipsec_filter_mask_in, 0, "IPsec input firewall filter mask"); @@ -112,7 +112,7 @@ static int ipsec_bpf_mask_in = ENC_BEFORE; SYSCTL_INT(_net_enc_in, OID_AUTO, ipsec_bpf_mask, CTLFLAG_RW, &ipsec_bpf_mask_in, 0, "IPsec input bpf mask"); -SYSCTL_NODE(_net_enc, OID_AUTO, out, CTLFLAG_RW, 0, "enc output sysctl"); +static SYSCTL_NODE(_net_enc, OID_AUTO, out, CTLFLAG_RW, 0, "enc output sysctl"); static int ipsec_filter_mask_out = ENC_BEFORE; SYSCTL_INT(_net_enc_out, OID_AUTO, ipsec_filter_mask, CTLFLAG_RW, &ipsec_filter_mask_out, 0, "IPsec output firewall filter mask"); diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index dff9efc..fe22ed7 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$"); #define EPAIRNAME "epair" SYSCTL_DECL(_net_link); -SYSCTL_NODE(_net_link, OID_AUTO, epair, CTLFLAG_RW, 0, "epair sysctl"); +static SYSCTL_NODE(_net_link, OID_AUTO, epair, CTLFLAG_RW, 0, "epair sysctl"); #ifdef EPAIR_DEBUG static int epair_debug = 0; diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 2b6b2b4..350611d 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -112,7 +112,7 @@ IFC_SIMPLE_DECLARE(gif, 0); static int gifmodevent(module_t, int, void *); SYSCTL_DECL(_net_link); -SYSCTL_NODE(_net_link, IFT_GIF, gif, CTLFLAG_RW, 0, +static SYSCTL_NODE(_net_link, IFT_GIF, gif, CTLFLAG_RW, 0, "Generic Tunnel Interface"); #ifndef MAX_GIF_NEST /* diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 5f8156b..8b250d7 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -148,7 +148,7 @@ static const struct protosw in_mobile_protosw = { #endif SYSCTL_DECL(_net_link); -SYSCTL_NODE(_net_link, IFT_TUNNEL, gre, CTLFLAG_RW, 0, +static SYSCTL_NODE(_net_link, IFT_TUNNEL, gre, CTLFLAG_RW, 0, "Generic Routing Encapsulation"); #ifndef MAX_GRE_NEST /* diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 6a3eb93..a7022d4 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -165,7 +165,8 @@ static const struct { }; SYSCTL_DECL(_net_link); -SYSCTL_NODE(_net_link, OID_AUTO, lagg, CTLFLAG_RW, 0, "Link Aggregation"); +static SYSCTL_NODE(_net_link, OID_AUTO, lagg, CTLFLAG_RW, 0, + "Link Aggregation"); static int lagg_failover_rx_all = 0; /* Allow input on any failover links */ SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW, diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c index c334ac7..97a2d40 100644 --- a/sys/net/if_mib.c +++ b/sys/net/if_mib.c @@ -63,7 +63,7 @@ */ SYSCTL_DECL(_net_link_generic); -SYSCTL_NODE(_net_link_generic, IFMIB_SYSTEM, system, CTLFLAG_RW, 0, +static SYSCTL_NODE(_net_link_generic, IFMIB_SYSTEM, system, CTLFLAG_RW, 0, "Variables global to all interfaces"); SYSCTL_VNET_INT(_net_link_generic_system, IFMIB_IFCOUNT, ifcount, CTLFLAG_RD, @@ -164,6 +164,6 @@ out: return error; } -SYSCTL_NODE(_net_link_generic, IFMIB_IFDATA, ifdata, CTLFLAG_RW, +static SYSCTL_NODE(_net_link_generic, IFMIB_IFDATA, ifdata, CTLFLAG_RW, sysctl_ifdata, "Interface table"); diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index e32956e..fa8ee64 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -121,7 +121,7 @@ #include <security/mac/mac_framework.h> SYSCTL_DECL(_net_link); -SYSCTL_NODE(_net_link, IFT_STF, stf, CTLFLAG_RW, 0, "6to4 Interface"); +static SYSCTL_NODE(_net_link, IFT_STF, stf, CTLFLAG_RW, 0, "6to4 Interface"); static int stf_route_cache = 1; SYSCTL_INT(_net_link_stf, OID_AUTO, route_cache, CTLFLAG_RW, diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c index 4ae5a3d..034fd27 100644 --- a/sys/net/if_tap.c +++ b/sys/net/if_tap.c @@ -161,7 +161,7 @@ MALLOC_DEFINE(M_TAP, CDEV_NAME, "Ethernet tunnel interface"); SYSCTL_INT(_debug, OID_AUTO, if_tap_debug, CTLFLAG_RW, &tapdebug, 0, ""); SYSCTL_DECL(_net_link); -SYSCTL_NODE(_net_link, OID_AUTO, tap, CTLFLAG_RW, 0, +static SYSCTL_NODE(_net_link, OID_AUTO, tap, CTLFLAG_RW, 0, "Ethernet tunnel software network interface"); SYSCTL_INT(_net_link_tap, OID_AUTO, user_open, CTLFLAG_RW, &tapuopen, 0, "Allow user to open /dev/tap (based on node permissions)"); diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 57a11f9..f8eda08 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -115,7 +115,7 @@ static TAILQ_HEAD(,tun_softc) tunhead = TAILQ_HEAD_INITIALIZER(tunhead); SYSCTL_INT(_debug, OID_AUTO, if_tun_debug, CTLFLAG_RW, &tundebug, 0, ""); SYSCTL_DECL(_net_link); -SYSCTL_NODE(_net_link, OID_AUTO, tun, CTLFLAG_RW, 0, +static SYSCTL_NODE(_net_link, OID_AUTO, tun, CTLFLAG_RW, 0, "IP tunnel software network interface."); SYSCTL_INT(_net_link_tun, OID_AUTO, devfs_cloning, CTLFLAG_RW, &tundclone, 0, "Enable legacy devfs interface creation."); diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 9dd54e2..e2eb38b 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -131,8 +131,10 @@ static struct { }; SYSCTL_DECL(_net_link); -SYSCTL_NODE(_net_link, IFT_L2VLAN, vlan, CTLFLAG_RW, 0, "IEEE 802.1Q VLAN"); -SYSCTL_NODE(_net_link_vlan, PF_LINK, link, CTLFLAG_RW, 0, "for consistency"); +static SYSCTL_NODE(_net_link, IFT_L2VLAN, vlan, CTLFLAG_RW, 0, + "IEEE 802.1Q VLAN"); +static SYSCTL_NODE(_net_link_vlan, PF_LINK, link, CTLFLAG_RW, 0, + "for consistency"); static int soft_pad = 0; SYSCTL_INT(_net_link_vlan, OID_AUTO, soft_pad, CTLFLAG_RW, &soft_pad, 0, diff --git a/sys/net/netisr.c b/sys/net/netisr.c index 127cf67..534d80c 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -124,7 +124,7 @@ static struct rmlock netisr_rmlock; #define NETISR_WUNLOCK() rm_wunlock(&netisr_rmlock) /* #define NETISR_LOCKING */ -SYSCTL_NODE(_net, OID_AUTO, isr, CTLFLAG_RW, 0, "netisr"); +static SYSCTL_NODE(_net, OID_AUTO, isr, CTLFLAG_RW, 0, "netisr"); /*- * Three global direct dispatch policies are supported: diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c index c430d97..c90f537 100644 --- a/sys/net/raw_cb.c +++ b/sys/net/raw_cb.c @@ -59,7 +59,8 @@ struct mtx rawcb_mtx; VNET_DEFINE(struct rawcb_list_head, rawcb_list); -SYSCTL_NODE(_net, OID_AUTO, raw, CTLFLAG_RW, 0, "Raw socket infrastructure"); +static SYSCTL_NODE(_net, OID_AUTO, raw, CTLFLAG_RW, 0, + "Raw socket infrastructure"); static u_long raw_sendspace = RAWSNDQ; SYSCTL_ULONG(_net_raw, OID_AUTO, sendspace, CTLFLAG_RW, &raw_sendspace, 0, diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 48a527e..b2313c0 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -143,7 +143,7 @@ MTX_SYSINIT(rtsock, &rtsock_mtx, "rtsock route_cb lock", MTX_DEF); #define RTSOCK_UNLOCK() mtx_unlock(&rtsock_mtx) #define RTSOCK_LOCK_ASSERT() mtx_assert(&rtsock_mtx, MA_OWNED) -SYSCTL_NODE(_net, OID_AUTO, route, CTLFLAG_RD, 0, ""); +static SYSCTL_NODE(_net, OID_AUTO, route, CTLFLAG_RD, 0, ""); struct walkarg { int w_tmemsize; @@ -1737,7 +1737,7 @@ sysctl_rtsock(SYSCTL_HANDLER_ARGS) return (error); } -SYSCTL_NODE(_net, PF_ROUTE, routetable, CTLFLAG_RD, sysctl_rtsock, ""); +static SYSCTL_NODE(_net, PF_ROUTE, routetable, CTLFLAG_RD, sysctl_rtsock, ""); /* * Definitions of protocols supported in the ROUTE domain. |