X-Git-Url: http://git.rot13.org/?p=bcm963xx.git;a=blobdiff_plain;f=hostTools%2Fscripts%2Fgendefconfig;fp=hostTools%2Fscripts%2Fgendefconfig;h=2119411bb2e4e921dc26dfbecdfc89b6fec86894;hp=8bb50169d9b1b5d86f0f9c4348b99c3b2d640de5;hb=dcecd92bd978b5c479a292a996b5f1a272621abc;hpb=172f01faf449acfc67d24d7f10b29f66f9760147

diff --git a/hostTools/scripts/gendefconfig b/hostTools/scripts/gendefconfig
index 8bb50169..2119411b 100755
--- a/hostTools/scripts/gendefconfig
+++ b/hostTools/scripts/gendefconfig
@@ -2,15 +2,19 @@
 
 #****************************************************************************
 #
-#  Copyright (c) 2001, 2002, 2003, 2004  Broadcom Corporation
-#  All Rights Reserved
-#  No portions of this material may be reproduced in any form without the
-#  written permission of:
-#          Broadcom Corporation
-#          16251 Laguna Canyon Road
-#          Irvine, California 92618
-#  All information contained in this document is Broadcom Corporation
-#  company private, proprietary, and trade secret.
+# <:copyright-gpl
+# Copyright 2004 Broadcom Corp. All Rights Reserved.
+# This program is free software; you can distribute it and/or modify it
+# under the terms of the GNU General Public License (Version 2) as
+# published by the Free Software Foundation.
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+# :>
 #
 #****************************************************************************
 
@@ -217,9 +221,9 @@ fi
 ############################################################
 # 	Netfilter config generation
 ############################################################
-NETFILTER_MODULES="CONNTRACK FTP TFTP TALK H323 IRC PPTP IPSEC DTX8 WM PT IPTABLES \
+NETFILTER_MODULES="CONNTRACK FTP TFTP TALK H323 SIP IRC PPTP IPSEC DTX8 WM PT IPTABLES \
                   MATCH_STATE MATCH_LIMIT MATCH_MARK RTSP \
-                  FILTER MANGLE NAT NAT_NEEDED NAT_TALK NAT_H323 NAT_SNMP_BASIC NAT_IRC NAT_FTP NAT_TFTP \
+                  FILTER MANGLE NAT NAT_NEEDED NAT_TALK NAT_H323 NAT_SIP NAT_SNMP_BASIC NAT_IRC NAT_FTP NAT_TFTP \
                   TARGET_MASQUERADE TARGET_REDIRECT TARGET_LOG TARGET_TCPMSS TARGET_FTOS TARGET_MARK"
 
 NF_FIREWALL_MODULES="IPTABLES MATCH_STATE MATCH_LIMIT FILTER TARGET_TCPMSS" 
@@ -230,10 +234,11 @@ NF_NAT_MODULES="IPTABLES CONNTRACK NAT NAT_NEEDED TARGET_MASQUERADE TARGET_REDIR
 
 NF_PPPREMOTE_MODULES="IPTABLES CONNTRACK NAT NAT_NEEDED FILTER TARGET_TCPMSS MATCH_LIMIT" 
 
-ALGS="FTP TFTP TALK H323 IRC PPTP IPSEC SNMP DTX8 WM PT RTSP"
+ALGS="FTP TFTP TALK H323 SIP IRC PPTP IPSEC SNMP DTX8 WM PT RTSP"
 FTP_ALG_MODULES="FTP NAT_FTP"
 TFTP_ALG_MODULES="TFTP NAT_TFTP"
 H323_ALG_MODULES="H323 NAT_H323"
+SIP_ALG_MODULES="SIP NAT_SIP"
 IRC_ALG_MODULES="IRC NAT_IRC"
 DTX8_ALG_MODULES="DTX8"
 WM_ALG_MODULES="WM"
@@ -366,18 +371,27 @@ fi
 ############################################################
 # 	Network QoS config generation
 ############################################################
-if [ "$BRCM_KERNEL_NETQOS" != "" ]; then
+if [ "$BRCM_KERNEL_NETQOS" != "" -o "$BRCM_KERNEL_DN_IPQOS" != "" ]; then
+   AS_CONFIG_NET_SCHD="y"
    SEDCMD="$SEDCMD -e 's/# CONFIG_NET_SCHED is not set/CONFIG_NET_SCHED=y/'"
+   SEDCMD="$SEDCMD -e 's/# CONFIG_NET_QOS is not set/CONFIG_NET_QOS=y/'"
    SEDCMD="$SEDCMD -e 's/# CONFIG_NET_SCH_CLK_JIFFIES is not set/CONFIG_NET_SCH_CLK_JIFFIES=y/'"
    SEDCMD="$SEDCMD -e 's/# CONFIG_NET_CLS is not set/CONFIG_NET_CLS=y/'"
    SEDCMD="$SEDCMD -e 's/# CONFIG_NET_CLS_POLICE is not set/CONFIG_NET_CLS_POLICE=y/'"
-   general_setup CONFIG_NET_SCH_CBQ  $BRCM_KERNEL_NETQOS
-   general_setup CONFIG_NET_SCH_HTB  $BRCM_KERNEL_NETQOS
-   general_setup CONFIG_NET_SCH_PRIO $BRCM_KERNEL_NETQOS
-   general_setup CONFIG_NET_SCH_SFQ $BRCM_KERNEL_NETQOS
-   general_setup CONFIG_NET_CLS_FW $BRCM_KERNEL_NETQOS
-   general_setup CONFIG_NET_CLS_U32 $BRCM_KERNEL_NETQOS
-   general_setup CONFIG_NET_CLS_POLICE $BRCM_KERNEL_NETQOS
+   #general_setup CONFIG_NET_SCH_CBQ  $AS_CONFIG_NET_SCHD
+   general_setup CONFIG_NET_SCH_HTB  $AS_CONFIG_NET_SCHD
+   #general_setup CONFIG_NET_SCH_HFSC $AS_CONFIG_NET_SCHD
+   general_setup CONFIG_NET_SCH_PRIO $AS_CONFIG_NET_SCHD
+   #general_setup CONFIG_NET_SCH_SFQ $AS_CONFIG_NET_SCHD
+   general_setup CONFIG_NET_SCH_INGRESS $AS_CONFIG_NET_SCHD
+   general_setup CONFIG_NET_ESTIMATOR $AS_CONFIG_NET_SCHD
+   #general_setup CONFIG_NET_SCH_DSMARK $AS_CONFIG_NET_SCHD
+   general_setup CONFIG_NET_CLS_TCINDEX $AS_CONFIG_NET_SCHD
+   general_setup CONFIG_NET_CLS_FW $AS_CONFIG_NET_SCHD
+   general_setup CONFIG_NET_CLS_U32 $AS_CONFIG_NET_SCHD
+   general_setup CONFIG_NET_CLS_POLICE $AS_CONFIG_NET_SCHD
+   #general_setup CONFIG_NET_CLS_ACT $AS_CONFIG_NET_SCHD
+   #general_setup CONFIG_NET_ACT_POLICE $AS_CONFIG_NET_SCHD
 fi
 
 ############################################################