diff options
| author | glebius <glebius@FreeBSD.org> | 2014-03-04 14:05:37 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2014-03-04 14:05:37 +0000 |
| commit | 352d508b164f60d6e5de69dba908cd0b34e56a26 (patch) | |
| tree | 1b60831ee15b733c4ba4cd5b13bc318c0af8b7f9 | |
| parent | 4b9e17c3eff2269c8b3279791879d87a4fcca87e (diff) | |
| download | FreeBSD-src-352d508b164f60d6e5de69dba908cd0b34e56a26.zip FreeBSD-src-352d508b164f60d6e5de69dba908cd0b34e56a26.tar.gz | |
Merge r261590: Fixup for r261590 (vnet sysctl handlers cleanup)
| -rw-r--r-- | sys/net/vnet.h | 2 | ||||
| -rw-r--r-- | sys/netinet/cc/cc_cdg.c | 9 | ||||
| -rw-r--r-- | sys/netinet/sctp_sysctl.c | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/sys/net/vnet.h b/sys/net/vnet.h index b3a2a34..6c7b502 100644 --- a/sys/net/vnet.h +++ b/sys/net/vnet.h @@ -303,7 +303,7 @@ void vnet_data_free(void *start_arg, int size); descr) \ SYSCTL_OID(parent, nbr, name, \ CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr, len, \ - vnet_sysctl_handle_opaque, fmt, descr) + sysctl_handle_opaque, fmt, descr) #define SYSCTL_VNET_STRING(parent, nbr, name, access, arg, len, descr) \ SYSCTL_OID(parent, nbr, name, \ CTLTYPE_STRING|CTLFLAG_VNET|(access), \ diff --git a/sys/netinet/cc/cc_cdg.c b/sys/netinet/cc/cc_cdg.c index 69335db..3ebaacf 100644 --- a/sys/netinet/cc/cc_cdg.c +++ b/sys/netinet/cc/cc_cdg.c @@ -81,11 +81,6 @@ __FBSDID("$FreeBSD$"); #define CAST_PTR_INT(X) (*((int*)(X))) -#ifndef VIMAGE -#define vnet_sysctl_handle_uint(oidp, arg1, arg2, req) \ - sysctl_handle_int(oidp, arg1, arg2, req) -#endif - /* Private delay-gradient induced congestion control signal. */ #define CC_CDG_DELAY 0x01000000 @@ -357,7 +352,7 @@ cdg_beta_handler(SYSCTL_HANDLER_ARGS) (CAST_PTR_INT(req->newptr) == 0 || CAST_PTR_INT(req->newptr) > 100)) return (EINVAL); - return (vnet_sysctl_handle_uint(oidp, arg1, arg2, req)); + return (sysctl_handle_int(oidp, arg1, arg2, req)); } static int @@ -367,7 +362,7 @@ cdg_exp_backoff_scale_handler(SYSCTL_HANDLER_ARGS) if (req->newptr != NULL && CAST_PTR_INT(req->newptr) < 1) return (EINVAL); - return (vnet_sysctl_handle_uint(oidp, arg1, arg2, req)); + return (sysctl_handle_int(oidp, arg1, arg2, req)); } static inline unsigned long diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c index 53e9b04..77e59bd 100644 --- a/sys/netinet/sctp_sysctl.c +++ b/sys/netinet/sctp_sysctl.c @@ -587,11 +587,7 @@ sysctl_sctp_check(SYSCTL_HANDLER_ARGS) { int error; -#ifdef VIMAGE - error = vnet_sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); -#else error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); -#endif if (error == 0) { RANGECHK(SCTP_BASE_SYSCTL(sctp_sendspace), SCTPCTL_MAXDGRAM_MIN, SCTPCTL_MAXDGRAM_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_recvspace), SCTPCTL_RECVSPACE_MIN, SCTPCTL_RECVSPACE_MAX); |
