From owner-p4-projects@FreeBSD.ORG Fri Sep 19 18:28:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A504A1065676; Fri, 19 Sep 2008 18:28: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 6953A1065674 for ; Fri, 19 Sep 2008 18:28:21 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A9E58FC18 for ; Fri, 19 Sep 2008 18:28:21 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8JISLtt035328 for ; Fri, 19 Sep 2008 18:28:21 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8JISLW5035326 for perforce@freebsd.org; Fri, 19 Sep 2008 18:28:21 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 19 Sep 2008 18:28:21 GMT Message-Id: <200809191828.m8JISLW5035326@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150131 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Sep 2008 18:28:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=150131 Change 150131 by zec@zec_tpx32 on 2008/09/19 18:27:48 Move multi-fib constant #defines from net/route.c to net/route.h so that net/vnet.h can include instead of shadow them. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/route.c#11 edit .. //depot/projects/vimage-commit2/src/sys/net/route.h#4 edit .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#2 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/route.c#11 (text+ko) ==== @@ -63,26 +63,6 @@ #include -#ifndef ROUTETABLES - #define RT_NUMFIBS 1 - #define RT_MAXFIBS 1 -#else - /* while we use 4 bits in the mbuf flags, - * we are limited to 16 - */ - #define RT_MAXFIBS 16 - #if ROUTETABLES > RT_MAXFIBS - #define RT_NUMFIBS RT_MAXFIBS - #error "ROUTETABLES defined too big" - #else - #if ROUTETABLES == 0 - #define RT_NUMFIBS 1 - #else - #define RT_NUMFIBS ROUTETABLES - #endif - #endif -#endif - u_int rt_numfibs = RT_NUMFIBS; SYSCTL_INT(_net, OID_AUTO, fibs, CTLFLAG_RD, &rt_numfibs, 0, ""); /* ==== //depot/projects/vimage-commit2/src/sys/net/route.h#4 (text+ko) ==== @@ -82,6 +82,24 @@ #define RTM_RTTUNIT 1000000 /* units for rtt, rttvar, as units per sec */ #define RTTTOPRHZ(r) ((r) / (RTM_RTTUNIT / PR_SLOWHZ)) +#ifndef ROUTETABLES + #define RT_NUMFIBS 1 + #define RT_MAXFIBS 1 +#else + /* while we use 4 bits in the mbuf flags, we are limited to 16 */ + #define RT_MAXFIBS 16 + #if ROUTETABLES > RT_MAXFIBS + #define RT_NUMFIBS RT_MAXFIBS + #error "ROUTETABLES defined too big" + #else + #if ROUTETABLES == 0 + #define RT_NUMFIBS 1 + #else + #define RT_NUMFIBS ROUTETABLES + #endif + #endif +#endif + extern u_int rt_numfibs; /* number fo usable routing tables */ extern u_int tunnel_fib; /* tunnels use these */ extern u_int fwd_fib; /* packets being forwarded use these routes */ ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#2 (text+ko) ==== @@ -31,7 +31,6 @@ #ifndef _NET_VNET_H_ #define _NET_VNET_H_ - #ifdef VIMAGE #include "opt_route.h" @@ -44,14 +43,6 @@ #include #include - -/* calculate this the same as in route.c */ -#ifndef ROUTETABLES - #define RT_MAXFIBS 1 -#else - #define RT_MAXFIBS 16 -#endif - struct vnet_net { int _if_index; struct ifindex_entry *_ifindex_table;