summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdf <mdf@FreeBSD.org>2011-01-12 19:53:39 +0000
committermdf <mdf@FreeBSD.org>2011-01-12 19:53:39 +0000
commit5ceb21c0a5e5b2f73b71f732d70a0efb23c643e6 (patch)
treeeb5fd71f36fbc73e111fa356d1af81102593c290
parent0f98344048d2c8f6451da3210aed52f458cb7b03 (diff)
downloadFreeBSD-src-5ceb21c0a5e5b2f73b71f732d70a0efb23c643e6.zip
FreeBSD-src-5ceb21c0a5e5b2f73b71f732d70a0efb23c643e6.tar.gz
sysctl(9) cleanup checkpoint: amd64 GENERIC builds cleanly.
Commit the netgraph piece.
-rw-r--r--sys/netgraph/bluetooth/common/ng_bluetooth.c2
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c10
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c8
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c10
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c4
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_sco.c8
-rw-r--r--sys/netgraph/ng_socket.c4
7 files changed, 23 insertions, 23 deletions
diff --git a/sys/netgraph/bluetooth/common/ng_bluetooth.c b/sys/netgraph/bluetooth/common/ng_bluetooth.c
index fce53c6..6cd587e 100644
--- a/sys/netgraph/bluetooth/common/ng_bluetooth.c
+++ b/sys/netgraph/bluetooth/common/ng_bluetooth.c
@@ -114,7 +114,7 @@ SYSCTL_PROC(_net_bluetooth_hci, OID_AUTO, connection_timeout,
bluetooth_set_hci_connect_timeout_value,
"I", "HCI connect timeout (sec)");
-SYSCTL_INT(_net_bluetooth_hci, OID_AUTO, max_neighbor_age, CTLFLAG_RW,
+SYSCTL_UINT(_net_bluetooth_hci, OID_AUTO, max_neighbor_age, CTLFLAG_RW,
&bluetooth_hci_max_neighbor_age_value, 600,
"Maximal HCI neighbor cache entry age (sec)");
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index 8bde536..d8c32b1 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -125,19 +125,19 @@ static int ng_btsocket_hci_raw_curpps;
SYSCTL_DECL(_net_bluetooth_hci_sockets);
SYSCTL_NODE(_net_bluetooth_hci_sockets, OID_AUTO, raw, CTLFLAG_RW,
0, "Bluetooth raw HCI sockets family");
-SYSCTL_INT(_net_bluetooth_hci_sockets_raw, OID_AUTO, debug_level, CTLFLAG_RW,
+SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, debug_level, CTLFLAG_RW,
&ng_btsocket_hci_raw_debug_level, NG_BTSOCKET_WARN_LEVEL,
"Bluetooth raw HCI sockets debug level");
-SYSCTL_INT(_net_bluetooth_hci_sockets_raw, OID_AUTO, ioctl_timeout, CTLFLAG_RW,
+SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, ioctl_timeout, CTLFLAG_RW,
&ng_btsocket_hci_raw_ioctl_timeout, 5,
"Bluetooth raw HCI sockets ioctl timeout");
-SYSCTL_INT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_len, CTLFLAG_RD,
+SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_len, CTLFLAG_RD,
&ng_btsocket_hci_raw_queue.len, 0,
"Bluetooth raw HCI sockets input queue length");
-SYSCTL_INT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_maxlen, CTLFLAG_RD,
+SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_maxlen, CTLFLAG_RD,
&ng_btsocket_hci_raw_queue.maxlen, 0,
"Bluetooth raw HCI sockets input queue max. length");
-SYSCTL_INT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_drops, CTLFLAG_RD,
+SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_drops, CTLFLAG_RD,
&ng_btsocket_hci_raw_queue.drops, 0,
"Bluetooth raw HCI sockets input queue drops");
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index b7b42fc..0ac24e5 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -110,19 +110,19 @@ static int ng_btsocket_l2cap_curpps;
SYSCTL_DECL(_net_bluetooth_l2cap_sockets);
SYSCTL_NODE(_net_bluetooth_l2cap_sockets, OID_AUTO, seq, CTLFLAG_RW,
0, "Bluetooth SEQPACKET L2CAP sockets family");
-SYSCTL_INT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, debug_level,
+SYSCTL_UINT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, debug_level,
CTLFLAG_RW,
&ng_btsocket_l2cap_debug_level, NG_BTSOCKET_WARN_LEVEL,
"Bluetooth SEQPACKET L2CAP sockets debug level");
-SYSCTL_INT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_len,
+SYSCTL_UINT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_len,
CTLFLAG_RD,
&ng_btsocket_l2cap_queue.len, 0,
"Bluetooth SEQPACKET L2CAP sockets input queue length");
-SYSCTL_INT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_maxlen,
+SYSCTL_UINT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_maxlen,
CTLFLAG_RD,
&ng_btsocket_l2cap_queue.maxlen, 0,
"Bluetooth SEQPACKET L2CAP sockets input queue max. length");
-SYSCTL_INT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_drops,
+SYSCTL_UINT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_drops,
CTLFLAG_RD,
&ng_btsocket_l2cap_queue.drops, 0,
"Bluetooth SEQPACKET L2CAP sockets input queue drops");
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index 7d07dfb..72339f6 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -125,23 +125,23 @@ static int ng_btsocket_l2cap_raw_curpps;
SYSCTL_DECL(_net_bluetooth_l2cap_sockets);
SYSCTL_NODE(_net_bluetooth_l2cap_sockets, OID_AUTO, raw, CTLFLAG_RW,
0, "Bluetooth raw L2CAP sockets family");
-SYSCTL_INT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, debug_level,
+SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, debug_level,
CTLFLAG_RW,
&ng_btsocket_l2cap_raw_debug_level, NG_BTSOCKET_WARN_LEVEL,
"Bluetooth raw L2CAP sockets debug level");
-SYSCTL_INT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, ioctl_timeout,
+SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, ioctl_timeout,
CTLFLAG_RW,
&ng_btsocket_l2cap_raw_ioctl_timeout, 5,
"Bluetooth raw L2CAP sockets ioctl timeout");
-SYSCTL_INT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_len,
+SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_len,
CTLFLAG_RD,
&ng_btsocket_l2cap_raw_queue.len, 0,
"Bluetooth raw L2CAP sockets input queue length");
-SYSCTL_INT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_maxlen,
+SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_maxlen,
CTLFLAG_RD,
&ng_btsocket_l2cap_raw_queue.maxlen, 0,
"Bluetooth raw L2CAP sockets input queue max. length");
-SYSCTL_INT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_drops,
+SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_drops,
CTLFLAG_RD,
&ng_btsocket_l2cap_raw_queue.drops, 0,
"Bluetooth raw L2CAP sockets input queue drops");
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index 4904c19..1fd9eb3 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -202,11 +202,11 @@ static int ng_btsocket_rfcomm_curpps;
SYSCTL_DECL(_net_bluetooth_rfcomm_sockets);
SYSCTL_NODE(_net_bluetooth_rfcomm_sockets, OID_AUTO, stream, CTLFLAG_RW,
0, "Bluetooth STREAM RFCOMM sockets family");
-SYSCTL_INT(_net_bluetooth_rfcomm_sockets_stream, OID_AUTO, debug_level,
+SYSCTL_UINT(_net_bluetooth_rfcomm_sockets_stream, OID_AUTO, debug_level,
CTLFLAG_RW,
&ng_btsocket_rfcomm_debug_level, NG_BTSOCKET_INFO_LEVEL,
"Bluetooth STREAM RFCOMM sockets debug level");
-SYSCTL_INT(_net_bluetooth_rfcomm_sockets_stream, OID_AUTO, timeout,
+SYSCTL_UINT(_net_bluetooth_rfcomm_sockets_stream, OID_AUTO, timeout,
CTLFLAG_RW,
&ng_btsocket_rfcomm_timo, 60,
"Bluetooth STREAM RFCOMM sockets timeout");
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
index 9dae14a..e1bff57 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
@@ -109,19 +109,19 @@ static int ng_btsocket_sco_curpps;
SYSCTL_DECL(_net_bluetooth_sco_sockets);
SYSCTL_NODE(_net_bluetooth_sco_sockets, OID_AUTO, seq, CTLFLAG_RW,
0, "Bluetooth SEQPACKET SCO sockets family");
-SYSCTL_INT(_net_bluetooth_sco_sockets_seq, OID_AUTO, debug_level,
+SYSCTL_UINT(_net_bluetooth_sco_sockets_seq, OID_AUTO, debug_level,
CTLFLAG_RW,
&ng_btsocket_sco_debug_level, NG_BTSOCKET_WARN_LEVEL,
"Bluetooth SEQPACKET SCO sockets debug level");
-SYSCTL_INT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_len,
+SYSCTL_UINT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_len,
CTLFLAG_RD,
&ng_btsocket_sco_queue.len, 0,
"Bluetooth SEQPACKET SCO sockets input queue length");
-SYSCTL_INT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_maxlen,
+SYSCTL_UINT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_maxlen,
CTLFLAG_RD,
&ng_btsocket_sco_queue.maxlen, 0,
"Bluetooth SEQPACKET SCO sockets input queue max. length");
-SYSCTL_INT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_drops,
+SYSCTL_UINT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_drops,
CTLFLAG_RD,
&ng_btsocket_sco_queue.drops, 0,
"Bluetooth SEQPACKET SCO sockets input queue drops");
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index 50b5318..c5d887b 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -150,10 +150,10 @@ NETGRAPH_INIT_ORDERED(socket, &typestruct, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY);
/* Buffer space */
static u_long ngpdg_sendspace = 20 * 1024; /* really max datagram size */
-SYSCTL_INT(_net_graph, OID_AUTO, maxdgram, CTLFLAG_RW,
+SYSCTL_ULONG(_net_graph, OID_AUTO, maxdgram, CTLFLAG_RW,
&ngpdg_sendspace , 0, "Maximum outgoing Netgraph datagram size");
static u_long ngpdg_recvspace = 20 * 1024;
-SYSCTL_INT(_net_graph, OID_AUTO, recvspace, CTLFLAG_RW,
+SYSCTL_ULONG(_net_graph, OID_AUTO, recvspace, CTLFLAG_RW,
&ngpdg_recvspace , 0, "Maximum space for incoming Netgraph datagrams");
/* List of all sockets (for netstat -f netgraph) */
OpenPOWER on IntegriCloud