diff options
| author | trociny <trociny@FreeBSD.org> | 2014-02-09 08:13:17 +0000 |
|---|---|---|
| committer | trociny <trociny@FreeBSD.org> | 2014-02-09 08:13:17 +0000 |
| commit | 42b6b03337b53c91d18ae2545e2874a6cb07f9a1 (patch) | |
| tree | 4ae39b0ccbd3e3d2d7467f443ebd7965e47bb934 /sys/netinet | |
| parent | 0a3cc34ebf8a1addd43696f8b6d67b2cac66f4ef (diff) | |
| download | FreeBSD-src-42b6b03337b53c91d18ae2545e2874a6cb07f9a1.zip FreeBSD-src-42b6b03337b53c91d18ae2545e2874a6cb07f9a1.tar.gz | |
Fixup for r261590 (vnet sysctl handlers cleanup).
Reviewed by: glebius
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/cc/cc_cdg.c | 9 | ||||
| -rw-r--r-- | sys/netinet/sctp_sysctl.c | 4 |
2 files changed, 2 insertions, 11 deletions
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); |
