From owner-p4-projects@FreeBSD.ORG Sat Aug 14 21:18:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CC581065672; Sat, 14 Aug 2010 21:18:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 364DA10656C3 for ; Sat, 14 Aug 2010 21:18:21 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2238B8FC15 for ; Sat, 14 Aug 2010 21:18:21 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7ELIL8S000770 for ; Sat, 14 Aug 2010 21:18:21 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7ELIKFi000767 for perforce@freebsd.org; Sat, 14 Aug 2010 21:18:20 GMT (envelope-from kibab@FreeBSD.org) Date: Sat, 14 Aug 2010 21:18:20 GMT Message-Id: <201008142118.o7ELIKFi000767@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182407 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Aug 2010 21:18:21 -0000 http://p4web.freebsd.org/@@182407?ac=10 Change 182407 by kibab@kibab_kibab-nb on 2010/08/14 21:17:55 Features related to network protocols, ALTQ and Netgraph. Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_cbq.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_cdnr.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_hfsc.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_priq.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_red.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_rio.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_pmc.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_mchain.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_stack.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/net/if.c#4 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netatalk/aarp.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netgraph/ng_base.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/libalias/alias.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/sctp_sysctl.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netipsec/ipsec.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netipx/ipx.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netncp/ncp_ncp.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netsmb/smb_smb.c#2 edit Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_cbq.c#2 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,8 @@ #include #endif +FEATURE(altq_cbq, "ALTQ Class Based Queueing discipline"); + #ifdef ALTQ3_COMPAT /* * Local Data structures. ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_cdnr.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -73,6 +74,8 @@ /* traffic conditioner is enabled by ALTQ_CDNR option in opt_altq.h */ #ifdef ALTQ_CDNR +FEATURE(altq_cdnr, "ALTQ traffic Conditioner"); + /* cdnr_list keeps all cdnr's allocated. */ static LIST_HEAD(, top_cdnr) tcb_list; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_hfsc.c#2 (text+ko) ==== @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #if 1 /* ALTQ3_COMPAT */ @@ -77,6 +78,8 @@ #include #endif +FEATURE(altq_hfsc, "ALTQ Hierarchical Packet Scheduler discipline"); + /* * function prototypes */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_priq.c#2 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -62,6 +63,8 @@ #endif #include +FEATURE(altq_priq, "ALTQ Priority Queueing discipline"); + /* * function prototypes */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_red.c#2 (text+ko) ==== @@ -76,6 +76,7 @@ #include #include #include +#include #include #if 1 /* ALTQ3_COMPAT */ #include @@ -106,6 +107,7 @@ #endif #endif +FEATURE(altq_red, "ALTQ Random Early Detection extension"); /* * ALTQ/RED (Random Early Detection) implementation using 32-bit * fixed-point calculation. ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/altq/altq/altq_rio.c#2 (text+ko) ==== @@ -75,6 +75,7 @@ #include #include #include +#include #include #if 1 /* ALTQ3_COMPAT */ #include @@ -100,6 +101,7 @@ #include #endif +FEATURE(altq_rio, "ALTQ Random Early Drop for input and output"); /* * RIO: RED with IN/OUT bit * described in ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_pmc.c#2 (text+ko) ==== @@ -37,8 +37,10 @@ #include #include #include +#include #ifdef HWPMC_HOOKS +FEATURE(hwpmc_hooks, "Kernel support for HW PMC"); #define PMC_KERNEL_VERSION PMC_VERSION #else #define PMC_KERNEL_VERSION 0 ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_mchain.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -40,6 +41,8 @@ #include +FEATURE(libmchain, "mchain library"); + MODULE_VERSION(libmchain, 1); #define MBERROR(format, ...) printf("%s(%d): "format, __func__ , \ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_stack.c#2 (text+ko) ==== @@ -39,6 +39,9 @@ #include #include #include +#include + +FEATURE(stack, "Support for capturing kernel stack"); static MALLOC_DEFINE(M_STACK, "stack", "Stack Traces"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/net/if.c#4 (text+ko) ==== @@ -97,6 +97,10 @@ #include +#ifdef ALTQ +FEATURE(altq, "ALTQ basic hooks"); +#endif + struct ifindex_entry { struct ifnet *ife_ifnet; }; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netatalk/aarp.c#2 (text+ko) ==== @@ -54,6 +54,7 @@ #include #include +#include #include #include #include @@ -74,6 +75,8 @@ #include +FEATURE(netatalk, "AppleTalk communication protocols"); + static void aarptfree(struct aarptab *aat); static void at_aarpinput(struct ifnet *ifp, struct mbuf *m); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netgraph/ng_base.c#3 (text+ko) ==== @@ -73,6 +73,8 @@ #include #include +FEATURE(netgraph, "Netgraph framework support"); + MODULE_VERSION(netgraph, NG_ABI_VERSION); /* Mutex to protect topology events. */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/libalias/alias.c#2 (text+ko) ==== @@ -116,6 +116,7 @@ #include #include #include +FEATURE(libalias, "libalias library"); #else #include #include ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/sctp_sysctl.c#3 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include +FEATURE(sctp, "SCTP protocol support"); /* * sysctl tunable variables */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netipsec/ipsec.c#2 (text+ko) ==== @@ -97,6 +97,8 @@ #include +FEATURE(ipsec, "IPsec support"); + #ifdef IPSEC_DEBUG VNET_DEFINE(int, ipsec_debug) = 1; #else ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netipx/ipx.c#2 (text+ko) ==== @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -81,6 +82,8 @@ #include #include +FEATURE(ipx, "IPX/SPX communication protocols support"); + /* * The IPX-layer address list is protected by ipx_ifaddr_rw. */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netncp/ncp_ncp.c#2 (text+ko) ==== @@ -51,6 +51,8 @@ #include #include +FEATURE(ncp, "NetWare Core Protocol support"); + #ifdef NCP_DATA_DEBUG static void m_dumpm(struct mbuf *m) { ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netsmb/smb_smb.c#2 (text+ko) ==== @@ -51,6 +51,8 @@ #include "opt_netsmb.h" +FEATURE(netsmb, "SMB/CIFS requester"); + struct smb_dialect { int d_id; const char * d_name;