svn commit: r261650 - in head/sys: net netinet netinet/cc

[Mikolaj Golub]

Author: trociny
Date: Sun Feb  9 08:13:17 2014
New Revision: 261650
URL: http://svnweb.freebsd.org/changeset/base/261650

Log:
  Fixup for r261590 (vnet sysctl handlers cleanup).
  
  Reviewed by:  glebius

Modified:
  head/sys/net/vnet.h
  head/sys/netinet/cc/cc_cdg.c
  head/sys/netinet/sctp_sysctl.c

Modified: head/sys/net/vnet.h
==============================================================================
--- head/sys/net/vnet.h Sun Feb  9 02:39:00 2014        (r261649)
+++ head/sys/net/vnet.h Sun Feb  9 08:13:17 2014        (r261650)
@@ -303,7 +303,7 @@ void         vnet_data_free(void *start_arg, in
            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),                       \

Modified: head/sys/netinet/cc/cc_cdg.c
==============================================================================
--- head/sys/netinet/cc/cc_cdg.c        Sun Feb  9 02:39:00 2014        
(r261649)
+++ head/sys/netinet/cc/cc_cdg.c        Sun Feb  9 08:13:17 2014        
(r261650)
@@ -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_HAN
        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

Modified: head/sys/netinet/sctp_sysctl.c
==============================================================================
--- head/sys/netinet/sctp_sysctl.c      Sun Feb  9 02:39:00 2014        
(r261649)
+++ head/sys/netinet/sctp_sysctl.c      Sun Feb  9 08:13:17 2014        
(r261650)
@@ -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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"