http://www.usr.com/support/gpl/USR9107_release1.1.tar.gz

[bcm963xx.git] / hostTools / scripts / gendefconfig

diff --git a/hostTools/scripts/gendefconfig b/hostTools/scripts/gendefconfig
index b11d7ba..6057a09 100755 (executable)
--- a/hostTools/scripts/gendefconfig
+++ b/hostTools/scripts/gendefconfig
@@ -25,7 +25,7 @@ driver_setup ()
   if [ "$BRCM_DRIVER_VAL" != "" ]; then
      SEDCMD="$SEDCMD -e 's/# $LINUX_CONFIG_NAME is not set/$LINUX_CONFIG_NAME="$BRCM_DRIVER_VAL"/'"
   fi
-  SEDCMD="$SEDCMD -e 's/"$LINUX_IMPL_NAME"/"$LINUX_CONFIG_NAME"_IMPL/'"
+  SEDCMD="$SEDCMD -e 's/# "$LINUX_IMPL_NAME"/"$LINUX_CONFIG_NAME"_IMPL/'"
 }
 
 
@@ -54,7 +54,7 @@ TEMPLATE=$HOSTTOOLS_DIR/scripts/defconfig-bcm.template
 
 SEDCMD="$SEDCMD -e 's/# CONFIG_BCM9"$BRCM_CHIP" is not set/CONFIG_BCM9"$BRCM_CHIP"=y/'"
 SEDCMD="$SEDCMD -e 's/# CONFIG_BCM_BOARD is not set/CONFIG_BCM_BOARD=y/'"
-SEDCMD="$SEDCMD -e 's/CONFIG_BCM9"$BRCM_CHIP"_BOARD_IMPL/CONFIG_BCM_BOARD_IMPL/'"
+SEDCMD="$SEDCMD -e 's/# CONFIG_BCM9"$BRCM_CHIP"_BOARD_IMPL/CONFIG_BCM_BOARD_IMPL/'"
 
 driver_setup "ATM" "ATMAPI"
 
@@ -64,7 +64,7 @@ driver_setup "ATM" "BLAA"
 if [ "$BUILD_DIAGAPP" != "" ]; then
    general_setup CONFIG_BCM_ATMTEST $BRCM_DRIVER_ATM
 fi
-SEDCMD="$SEDCMD -e 's/CONFIG_BCM9"$BRCM_CHIP"_ATMTEST_IMPL/CONFIG_BCM_ATMTEST_IMPL/'"
+SEDCMD="$SEDCMD -e 's/# CONFIG_BCM9"$BRCM_CHIP"_ATMTEST_IMPL/CONFIG_BCM_ATMTEST_IMPL/'"
 
 driver_setup "ADSL" "ADSL"
 
@@ -239,16 +239,6 @@ if [ "$BRCM_KERNEL_NETFILTER" != "" ]; then
       done
    fi
 
-   #Tecom set up netfilter queue
-   if [ "$BRCM_KERNEL_NF_QUEUE" != "" ]; then
-      netfilter_setup "QUEUE" $BRCM_KERNEL_NF_QUEUE
-   fi
-
-   #Tecom set up netfilter traffic
-   if [ "$BRCM_KERNEL_NF_TECOM_TRAFFIC" != "" ]; then
-      netfilter_setup "TECOM_TRAFFIC" $BRCM_KERNEL_NF_TECOM_TRAFFIC
-   fi
-
    # set up packet mangling related modules
    if [ "$BRCM_KERNEL_NF_MANGLE" != "" ]; then
       for mod in $NF_MANGLE_MODULES; do