www.usr.com/support/gpl/USR9108_release1.3.tar.gz

USR910x_3.04L.01_consumer.tar.gz

BRCM_VERSION=3
BRCM_RELEASE=04
BRCM_EXTRAVERSION=01

diff --git a/bcmdrivers/broadcom/atm/impl1/blaa_dd96348R.o_save b/bcmdrivers/broadcom/atm/impl1/blaa_dd96348R.o_save
deleted file mode 100644 (file)
index 9bc670b..0000000
Binary files a/bcmdrivers/broadcom/atm/impl1/blaa_dd96348R.o_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/atm/impl1/blaa_dd96348RB.o_save b/bcmdrivers/broadcom/atm/impl1/blaa_dd96348RB.o_save
deleted file mode 100644 (file)
index 9bc670b..0000000
Binary files a/bcmdrivers/broadcom/atm/impl1/blaa_dd96348RB.o_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348R.bin_save b/bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348R.bin_save
deleted file mode 100644 (file)
index fd4ed81..0000000
Binary files a/bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348R.bin_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348RB.bin_save b/bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348RB.bin_save
deleted file mode 100644 (file)
index fafad10..0000000
Binary files a/bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348RB.bin_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/char/adsl/impl1/adsldd96348R.o_save b/bcmdrivers/broadcom/char/adsl/impl1/adsldd96348R.o_save
deleted file mode 100644 (file)
index 450150a..0000000
Binary files a/bcmdrivers/broadcom/char/adsl/impl1/adsldd96348R.o_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/char/adsl/impl1/adsldd96348RB.o_save b/bcmdrivers/broadcom/char/adsl/impl1/adsldd96348RB.o_save
deleted file mode 100644 (file)
index 54ef0bb..0000000
Binary files a/bcmdrivers/broadcom/char/adsl/impl1/adsldd96348RB.o_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/char/atmapi/impl1/atmapi96348R.o_save b/bcmdrivers/broadcom/char/atmapi/impl1/atmapi96348R.o_save
deleted file mode 100644 (file)
index c225b9e..0000000
Binary files a/bcmdrivers/broadcom/char/atmapi/impl1/atmapi96348R.o_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/char/atmapi/impl1/atmapi96348RB.o_save b/bcmdrivers/broadcom/char/atmapi/impl1/atmapi96348RB.o_save
deleted file mode 100644 (file)
index c225b9e..0000000
Binary files a/bcmdrivers/broadcom/char/atmapi/impl1/atmapi96348RB.o_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/char/bcmprocfs/impl1/bcmprocfs96348R.o_save b/bcmdrivers/broadcom/char/bcmprocfs/impl1/bcmprocfs96348R.o_save
deleted file mode 100644 (file)
index 0ae7d7a..0000000
Binary files a/bcmdrivers/broadcom/char/bcmprocfs/impl1/bcmprocfs96348R.o_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/char/bcmprocfs/impl1/bcmprocfs96348RB.o_save b/bcmdrivers/broadcom/char/bcmprocfs/impl1/bcmprocfs96348RB.o_save
deleted file mode 100644 (file)
index 0ae7d7a..0000000
Binary files a/bcmdrivers/broadcom/char/bcmprocfs/impl1/bcmprocfs96348RB.o_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348R.o_save b/bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348R.o_save
deleted file mode 100644 (file)
index 72d1343..0000000
Binary files a/bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348R.o_save and /dev/null differ

diff --git a/bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348RB.o_save b/bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348RB.o_save
deleted file mode 100644 (file)
index 8ccd134..0000000
Binary files a/bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348RB.o_save and /dev/null differ

diff --git a/bcmdrivers/opensource/include/bcm963xx/bcmTag.h b/bcmdrivers/opensource/include/bcm963xx/bcmTag.h
index f837ed5..c710c6e 100755 (executable)
--- a/bcmdrivers/opensource/include/bcm963xx/bcmTag.h
+++ b/bcmdrivers/opensource/include/bcm963xx/bcmTag.h
@@ -30,7 +30,7 @@
 
 
 #define BCM_SIG_1   "U.S. Robotics"
-#define BCM_SIG_2   "ver. 304L0110"          // was "firmware version 2.0" now it is split 6 char out for chip id.
+#define BCM_SIG_2   "ver. 304L0107"          // was "firmware version 2.0" now it is split 6 char out for chip id.
 
 #define BCM_TAG_VER         "6"
 #define BCM_TAG_VER_LAST    "26"

diff --git a/hostTools/bcmImageBuilder b/hostTools/bcmImageBuilder
index 2f5a6a2..eb46c5e 100755 (executable)
Binary files a/hostTools/bcmImageBuilder and b/hostTools/bcmImageBuilder differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec.mod96348R.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec.mod96348R.o_save
deleted file mode 100644 (file)
index 2238600..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec.mod96348R.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec.mod96348RB.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec.mod96348RB.o_save
deleted file mode 100644 (file)
index 2238600..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec.mod96348RB.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec96348R.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec96348R.o_save
deleted file mode 100644 (file)
index e8f3557..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec96348R.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec96348RB.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec96348RB.o_save
deleted file mode 100644 (file)
index e8f3557..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_ipsec96348RB.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt.mod96348R.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt.mod96348R.o_save
deleted file mode 100644 (file)
index dd56e9f..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt.mod96348R.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt.mod96348RB.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt.mod96348RB.o_save
deleted file mode 100644 (file)
index dd56e9f..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt.mod96348RB.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt96348R.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt96348R.o_save
deleted file mode 100644 (file)
index d00ad86..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt96348R.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt96348RB.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt96348RB.o_save
deleted file mode 100644 (file)
index d00ad86..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_conntrack_pt96348RB.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec.mod96348R.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec.mod96348R.o_save
deleted file mode 100644 (file)
index 0272952..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec.mod96348R.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec.mod96348RB.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec.mod96348RB.o_save
deleted file mode 100644 (file)
index 0272952..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec.mod96348RB.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec96348R.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec96348R.o_save
deleted file mode 100644 (file)
index 7f3d1ec..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec96348R.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec96348RB.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec96348RB.o_save
deleted file mode 100644 (file)
index 7f3d1ec..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_ipsec96348RB.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt.mod96348R.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt.mod96348R.o_save
deleted file mode 100644 (file)
index a32878d..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt.mod96348R.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt.mod96348RB.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt.mod96348RB.o_save
deleted file mode 100644 (file)
index a32878d..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt.mod96348RB.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt96348R.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt96348R.o_save
deleted file mode 100644 (file)
index 5ff4e06..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt96348R.o_save and /dev/null differ

diff --git a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt96348RB.o_save b/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt96348RB.o_save
deleted file mode 100644 (file)
index 5ff4e06..0000000
Binary files a/kernel/linux/net/ipv4/netfilter/broadcom/ip_nat_pt96348RB.o_save and /dev/null differ

diff --git a/targets/96348R/96348R b/targets/96348R/96348R
deleted file mode 100755 (executable)
index f91fd86..0000000
--- a/targets/96348R/96348R
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# Automatically generated by make menuconfig: don't edit
-#
-
-#
-# Chip selection
-#
-# BRCM_6338 is not set
-# BRCM_6345 is not set
-BRCM_6348=y
-BRCM_CHIP=6348
-
-#
-# Board configuration selection
-#
-BRCM_BOARD_ID="96348R-A"
-BRCM_FLASHBLK_SIZE=64
-BRCM_NUM_MAC_ADDRESSES=11
-BRCM_BASE_MAC_ADDRESS="00:C0:49:00:00:00"
-BRCM_DEFAULTCFG=""
-
-#
-# ADSL standard selection
-#
-BRCM_ADSL_ANNEX_A=y
-# BRCM_ADSL_ANNEX_B is not set
-# BRCM_ADSL_ANNEX_C is not set
-# BRCM_ADSL_SADSL is not set
-BRCM_ADSL_STANDARD=ANNEX_A
-
-#
-# Driver selection
-#
-BRCM_DRIVER_ATM=m
-BRCM_DRIVER_ADSL=m
-BRCM_DRIVER_ETHERNET=m
-# BRCM_DRIVER_ETHERNET_CONFIG is not set
-# BRCM_DRIVER_USB is not set
-# BRCM_DRIVER_WIRELESS is not set
-BRCM_DRIVER_PCI=y
-# BRCM_DRIVER_VDSL is not set
-# BRCM_DRIVER_SECURITY is not set
-# BRCM_DRIVER_HPNA is not set
-# BRCM_DRIVER_PHONE is not set
-BRCM_DRIVER_PROCFS=m
-BRCM_DRIVER_SERIAL=y
-LINUX_DRIVER_USB_HOST=y
-# LINUX_DRIVER_CDCETHER is not set
-# BRCM_DRIVER_BCMPROF is not set
-
-#
-# Netfilter and firewall selection
-#
-BRCM_KERNEL_NETFILTER=m
-BRCM_KERNEL_NF_FIREWALL=m
-BRCM_KERNEL_NF_MANGLE=m
-BRCM_KERNEL_NF_NAT=m
-BRCM_KERNEL_NF_NAT_ALG_FTP=m
-BRCM_KERNEL_NF_NAT_ALG_TFTP=m
-BRCM_KERNEL_NF_NAT_ALG_H323=m
-BRCM_KERNEL_NF_NAT_ALG_IRC=m
-# BRCM_KERNEL_NF_NAT_ALG_WM is not set
-BRCM_KERNEL_NF_NAT_ALG_PT=m
-BRCM_KERNEL_NF_NAT_ALG_PPTP=m
-BRCM_KERNEL_NF_NAT_ALG_IPSEC=m
-BRCM_KERNEL_NF_NAT_ALG_RTSP=m
-# BRCM_KERNEL_NF_NAT_ALG_SNMP is not set
-# BRCM_KERNEL_NF_NAT_ALG_TALK is not set
-BRCM_KERNEL_NF_LOG=m
-# BRCM_KERNEL_NF_PPPREMOTE is not set
-
-#
-# Cryptographic selection
-#
-# BRCM_KERNEL_CRYPTO is not set
-# BRCM_KERNEL_CRYPTO_HMAC is not set
-# BRCM_KERNEL_CRYPTO_NULL is not set
-# BRCM_KERNEL_CRYPTO_MD5 is not set
-# BRCM_KERNEL_CRYPTO_SHA1 is not set
-# BRCM_KERNEL_CRYPTO_DES is not set
-# BRCM_KERNEL_CRYPTO_AES is not set
-
-#
-# Root file system selection
-#
-BRCM_ROOTFS_SQUASHFS=y
-# BRCM_ROOTFS_CRAMFS is not set
-# BRCM_ROOTFS_NFS is not set
-BRCM_KERNEL_ROOTFS=squashfs
-
-#
-# Toolchain selection
-#
-BRCM_UCLIBC=y
-# BRCM_PTHREADS is not set
-
-#
-# User application selection
-#
-BUILD_PVC2684CTL=dynamic
-BUILD_BRCTL=dynamic
-BUILD_CFM=dynamic
-# BUILD_CFM_MENU is not set
-BUILD_CFM_CLI=y
-BUILD_CFM_TELNETD=y
-BUILD_CFM_SSHD=y
-# BUILD_SSHD_MIPS_GENKEY is not set
-# WEB_POPUP is not set
-BUILD_IPTABLES=dynamic
-BUILD_EBTABLES=dynamic
-BUILD_TOD=dynamic
-BUILD_PPPD=dynamic
-# BUILD_REAIM is not set
-# BRCM_KERNEL_NETQOS is not set
-BUILD_VCONFIG=dynamic
-# BUILD_ETHWAN is not set
-BUILD_DNSPROBE=dynamic
-BUILD_IGMP=dynamic
-BUILD_UDHCP=dynamic
-BUILD_DHCPR=dynamic
-BUILD_UPNP=dynamic
-BUILD_BUSYBOX=dynamic
-BUILD_FTPD=dynamic
-BUILD_ATMCTL=dynamic
-BUILD_ADSLCTL=dynamic
-BUILD_NETCTL=dynamic
-# BUILD_WLCTL is not set
-# BUILD_NAS is not set
-BUILD_SNTP=dynamic
-# BUILD_EPITTCP is not set
-# BUILD_SES is not set
-# BUILD_NVRAM is not set
-BUILD_DDNSD=dynamic
-# MGMT_SNMP is not set
-# MGMT_TR69C is not set
-# MGMT_TR69C_SSL is not set
-MGMT_none=y
-BUILD_TR69C=
-BUILD_TR69C_SSL=
-# BUILD_VODSL is not set
-BUILD_ZEBRA=dynamic
-BUILD_LIBCREDUCTION=y
-# BUILD_SOAP is not set
-BUILD_IPPD=dynamic
-BUILD_BRCM_VLAN=dynamic
-# BUILD_DIAGAPP is not set
-# BUILD_SIPROXD is not set
-# BUILD_IPSEC_TOOLS is not set
-# BUILD_CERT is not set
-
-#
-# Debug selection
-#
-# BRCM_KERNEL_DEBUG is not set
-# JTAG_KERNEL_DEBUG is not set
-# BUILD_GDBSERVER is not set
-
-#
-# WebUI language selection
-#
-BRCM_LANG_EN=y
-# BRCM_LANG_CN is not set
-# BRCM_LANG_TW is not set
-# BRCM_LANG_KR is not set
-BRCM_WEBUI_LANG=en_US
-
-#
-# Special Feature selection
-#
-PPP_AUTODISCONN=y
-# BRCM_KERNEL_PREEMPT is not set

diff --git a/targets/96348RB/96348RB b/targets/96348RB/96348RB
deleted file mode 100644 (file)
index 6d2c8ef..0000000
--- a/targets/96348RB/96348RB
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# Automatically generated by make menuconfig: don't edit
-#
-
-#
-# Chip selection
-#
-# BRCM_6338 is not set
-# BRCM_6345 is not set
-BRCM_6348=y
-BRCM_CHIP=6348
-
-#
-# Board configuration selection
-#
-BRCM_BOARD_ID="96348R-B"
-BRCM_FLASHBLK_SIZE=64
-BRCM_NUM_MAC_ADDRESSES=11
-BRCM_BASE_MAC_ADDRESS="00:C0:49:00:00:00"
-BRCM_DEFAULTCFG=""
-
-#
-# ADSL standard selection
-#
-# BRCM_ADSL_ANNEX_A is not set
-BRCM_ADSL_ANNEX_B=y
-# BRCM_ADSL_ANNEX_C is not set
-# BRCM_ADSL_SADSL is not set
-BRCM_ADSL_STANDARD=ANNEX_B
-
-#
-# Driver selection
-#
-BRCM_DRIVER_ATM=m
-BRCM_DRIVER_ADSL=m
-BRCM_DRIVER_ETHERNET=m
-# BRCM_DRIVER_ETHERNET_CONFIG is not set
-# BRCM_DRIVER_USB is not set
-# BRCM_DRIVER_WIRELESS is not set
-BRCM_DRIVER_PCI=y
-# BRCM_DRIVER_VDSL is not set
-# BRCM_DRIVER_SECURITY is not set
-# BRCM_DRIVER_HPNA is not set
-# BRCM_DRIVER_PHONE is not set
-BRCM_DRIVER_PROCFS=m
-BRCM_DRIVER_SERIAL=y
-LINUX_DRIVER_USB_HOST=y
-# LINUX_DRIVER_CDCETHER is not set
-# BRCM_DRIVER_BCMPROF is not set
-
-#
-# Netfilter and firewall selection
-#
-BRCM_KERNEL_NETFILTER=m
-BRCM_KERNEL_NF_FIREWALL=m
-BRCM_KERNEL_NF_MANGLE=m
-BRCM_KERNEL_NF_NAT=m
-BRCM_KERNEL_NF_NAT_ALG_FTP=m
-BRCM_KERNEL_NF_NAT_ALG_TFTP=m
-BRCM_KERNEL_NF_NAT_ALG_H323=m
-BRCM_KERNEL_NF_NAT_ALG_IRC=m
-# BRCM_KERNEL_NF_NAT_ALG_WM is not set
-BRCM_KERNEL_NF_NAT_ALG_PT=m
-BRCM_KERNEL_NF_NAT_ALG_PPTP=m
-BRCM_KERNEL_NF_NAT_ALG_IPSEC=m
-BRCM_KERNEL_NF_NAT_ALG_RTSP=m
-# BRCM_KERNEL_NF_NAT_ALG_SNMP is not set
-# BRCM_KERNEL_NF_NAT_ALG_TALK is not set
-BRCM_KERNEL_NF_LOG=m
-# BRCM_KERNEL_NF_PPPREMOTE is not set
-
-#
-# Cryptographic selection
-#
-# BRCM_KERNEL_CRYPTO is not set
-# BRCM_KERNEL_CRYPTO_HMAC is not set
-# BRCM_KERNEL_CRYPTO_NULL is not set
-# BRCM_KERNEL_CRYPTO_MD5 is not set
-# BRCM_KERNEL_CRYPTO_SHA1 is not set
-# BRCM_KERNEL_CRYPTO_DES is not set
-# BRCM_KERNEL_CRYPTO_AES is not set
-
-#
-# Root file system selection
-#
-BRCM_ROOTFS_SQUASHFS=y
-# BRCM_ROOTFS_CRAMFS is not set
-# BRCM_ROOTFS_NFS is not set
-BRCM_KERNEL_ROOTFS=squashfs
-
-#
-# Toolchain selection
-#
-BRCM_UCLIBC=y
-# BRCM_PTHREADS is not set
-
-#
-# User application selection
-#
-BUILD_PVC2684CTL=dynamic
-BUILD_BRCTL=dynamic
-BUILD_CFM=dynamic
-# BUILD_CFM_MENU is not set
-BUILD_CFM_CLI=y
-BUILD_CFM_TELNETD=y
-BUILD_CFM_SSHD=y
-# BUILD_SSHD_MIPS_GENKEY is not set
-# WEB_POPUP is not set
-BUILD_IPTABLES=dynamic
-BUILD_EBTABLES=dynamic
-BUILD_TOD=dynamic
-BUILD_PPPD=dynamic
-# BUILD_REAIM is not set
-# BRCM_KERNEL_NETQOS is not set
-BUILD_VCONFIG=dynamic
-# BUILD_ETHWAN is not set
-BUILD_DNSPROBE=dynamic
-BUILD_IGMP=dynamic
-BUILD_UDHCP=dynamic
-BUILD_DHCPR=dynamic
-BUILD_UPNP=dynamic
-BUILD_BUSYBOX=dynamic
-BUILD_FTPD=dynamic
-BUILD_ATMCTL=dynamic
-BUILD_ADSLCTL=dynamic
-BUILD_NETCTL=dynamic
-# BUILD_WLCTL is not set
-# BUILD_NAS is not set
-BUILD_SNTP=dynamic
-# BUILD_EPITTCP is not set
-# BUILD_SES is not set
-# BUILD_NVRAM is not set
-BUILD_DDNSD=dynamic
-# MGMT_SNMP is not set
-# MGMT_TR69C is not set
-# MGMT_TR69C_SSL is not set
-MGMT_none=y
-BUILD_TR69C=
-BUILD_TR69C_SSL=
-# BUILD_VODSL is not set
-BUILD_ZEBRA=dynamic
-BUILD_LIBCREDUCTION=y
-# BUILD_SOAP is not set
-BUILD_IPPD=dynamic
-BUILD_BRCM_VLAN=dynamic
-# BUILD_DIAGAPP is not set
-# BUILD_SIPROXD is not set
-# BUILD_IPSEC_TOOLS is not set
-# BUILD_CERT is not set
-
-#
-# Debug selection
-#
-# BRCM_KERNEL_DEBUG is not set
-# JTAG_KERNEL_DEBUG is not set
-# BUILD_GDBSERVER is not set
-
-#
-# WebUI language selection
-#
-BRCM_LANG_EN=y
-# BRCM_LANG_CN is not set
-# BRCM_LANG_TW is not set
-# BRCM_LANG_KR is not set
-BRCM_WEBUI_LANG=en_US
-
-#
-# Special Feature selection
-#
-PPP_AUTODISCONN=y
-# BRCM_KERNEL_PREEMPT is not set

diff --git a/targets/fs.src/etc/rsa_host_key b/targets/fs.src/etc/rsa_host_key
index 8595360..de49801 100755 (executable)
Binary files a/targets/fs.src/etc/rsa_host_key and b/targets/fs.src/etc/rsa_host_key differ

diff --git a/targets/fs.src/etc/wlan/bcm4306_map.bin b/targets/fs.src/etc/wlan/bcm4306_map.bin
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/targets/fs.src/etc/wlan/bcm4318_map.bin b/targets/fs.src/etc/wlan/bcm4318_map.bin
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/userapps/broadcom/adslctl/adslctl_96348RB_save b/userapps/broadcom/adslctl/adslctl_96348RB_save
deleted file mode 100755 (executable)
index 68feec8..0000000
Binary files a/userapps/broadcom/adslctl/adslctl_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/adslctl/adslctl_96348R_save b/userapps/broadcom/adslctl/adslctl_96348R_save
deleted file mode 100755 (executable)
index 68feec8..0000000
Binary files a/userapps/broadcom/adslctl/adslctl_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/atmctl/atmctl_96348RB_save b/userapps/broadcom/atmctl/atmctl_96348RB_save
deleted file mode 100755 (executable)
index 9bb1d5f..0000000
Binary files a/userapps/broadcom/atmctl/atmctl_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/atmctl/atmctl_96348R_save b/userapps/broadcom/atmctl/atmctl_96348R_save
deleted file mode 100755 (executable)
index 9bb1d5f..0000000
Binary files a/userapps/broadcom/atmctl/atmctl_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/cfm/cfm_96348RB_save b/userapps/broadcom/cfm/cfm_96348RB_save
deleted file mode 100755 (executable)
index df712c8..0000000
Binary files a/userapps/broadcom/cfm/cfm_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/cfm/cfm_96348R_save b/userapps/broadcom/cfm/cfm_96348R_save
deleted file mode 100755 (executable)
index f2c78a7..0000000
Binary files a/userapps/broadcom/cfm/cfm_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/cfm/html/enblservice.html b/userapps/broadcom/cfm/html/enblservice.html
index e53d3ef..1847893 100755 (executable)
--- a/userapps/broadcom/cfm/html/enblservice.html
+++ b/userapps/broadcom/cfm/html/enblservice.html
@@ -118,7 +118,6 @@ function frmLoad() {
       else
          enblReaim.checked = false;
       serviceName.value = service;
-      setVisibility("idReaim", ("<%ejGetWlJS(wlInterface)%>"=="1"));
    }
 }
 
@@ -136,7 +135,7 @@ function frmLoad() {
        <p><input type='checkbox' name='enblService' id='enblService' checked> <label for="enblService">WAN service</label></p>
        <p><label for="serviceName">Service name:</label> <input type="text" name="serviceName" id="serviceName"></p>
 
-   <div id='idReaim'>
+   <div id='openInPort'>
                <p><input type='checkbox' name='enblReaim' id='enblReaim' checked> <label for="enblReaim">Allow "Reaim" proxy</label></p>
       <p>Clear <b>Allow "Reaim" proxy</b> to disable "Reaim" proxy support for AOL and MSN Instant Messenger.</p>
    </div>

diff --git a/userapps/broadcom/cfm/html/natcfg2.html b/userapps/broadcom/cfm/html/natcfg2.html
index f326547..9ddd21c 100755 (executable)
--- a/userapps/broadcom/cfm/html/natcfg2.html
+++ b/userapps/broadcom/cfm/html/natcfg2.html
@@ -79,7 +79,6 @@ function frmLoad() {
       else
          enblIgmp.checked = false;
       serviceName.value = service;
-      setVisibility("idReaim", ("<%ejGetWlJS(wlInterface)%>" == "1"));
    }
 }
 
@@ -167,16 +166,15 @@ function cbClick(cb) {
 <p>Network Address Translation (NAT) allows you to share one Wide Area Network
 (WAN) IP address for multiple computers on your Local Area Network (LAN).</p>
 
-<p>Clear <b>NAT</b> to enable DHCP relay.</p>
+<p>Clear <b>NAT</b> to enable DHCP relay.
+Clear <b>Allow "Reaim" Proxy</b> to disable "Reaim" proxy support for AOL and MSN Instant Messenger.)</p>
 
 <p><input type='checkbox' name='enblNat' id='enblNat'> <label for="enblNat">NAT</label></p>
 
 <p><input type='checkbox' name='enblFirewall' id='enblFirewall' onClick='cbClick(this)' value='ON'> <label for="enblFirewall">Firewall</label></p>
 
-<div id="idReaim">
-<p>Clear <b>Allow "Reaim" Proxy</b> to disable "Reaim" proxy support for AOL and MSN Instant Messenger.)</p>
 <p><input type='checkbox' name='enblReaim' id='enblReaim'> <label for="enblReaim">Allow "Reaim" proxy</label></p>
-</div>
+
 
 <h3>IGMP Multicast and WAN Service</h3>
 

diff --git a/userapps/broadcom/cfm/html/qoscls.html b/userapps/broadcom/cfm/html/qoscls.html
index 3044acf..e0163a1 100755 (executable)
--- a/userapps/broadcom/cfm/html/qoscls.html
+++ b/userapps/broadcom/cfm/html/qoscls.html
@@ -222,9 +222,9 @@ function manageTrafficOptions()
       <tr>
          <td><label>ATM transmit priority:</label></td>
          <td><select name='priority' id='priority'>
-               <option value="1">Low</option>
-               <option value="2">Medium</option>
-               <option value="3">High</option>
+               <option value="0">Low</option>
+               <option value="1">Medium</option>
+               <option value="2">High</option>
             </select></td>
       </tr>
       <tr>

diff --git a/userapps/broadcom/cfm/inc/version.h b/userapps/broadcom/cfm/inc/version.h
index 2664faf..3facd00 100644 (file)
--- a/userapps/broadcom/cfm/inc/version.h
+++ b/userapps/broadcom/cfm/inc/version.h
@@ -1,3 +1,3 @@
-#define SOFTWARE_VERSION "0907_032406-3.04L.01."
+#define SOFTWARE_VERSION "1412_032206-3.04L.01."
 #define RELEASE_VERSION "3.04L.01."
 #define PSI_VERSION ""

diff --git a/userapps/broadcom/cfm/util/psi/libpsi_96348R.so b/userapps/broadcom/cfm/util/psi/libpsi_96348R.so
deleted file mode 100755 (executable)
index bac3b09..0000000
Binary files a/userapps/broadcom/cfm/util/psi/libpsi_96348R.so and /dev/null differ

diff --git a/userapps/broadcom/cfm/util/psi/libpsi_96348RB.so b/userapps/broadcom/cfm/util/psi/libpsi_96348RB.so
deleted file mode 100755 (executable)
index bac3b09..0000000
Binary files a/userapps/broadcom/cfm/util/psi/libpsi_96348RB.so and /dev/null differ

diff --git a/userapps/broadcom/cfm/util/psi/libpsixml_96348R.so b/userapps/broadcom/cfm/util/psi/libpsixml_96348R.so
deleted file mode 100755 (executable)
index 9daf190..0000000
Binary files a/userapps/broadcom/cfm/util/psi/libpsixml_96348R.so and /dev/null differ

diff --git a/userapps/broadcom/cfm/util/psi/libpsixml_96348RB.so b/userapps/broadcom/cfm/util/psi/libpsixml_96348RB.so
deleted file mode 100755 (executable)
index 9daf190..0000000
Binary files a/userapps/broadcom/cfm/util/psi/libpsixml_96348RB.so and /dev/null differ

diff --git a/userapps/broadcom/cfm/util/system/syscall.c b/userapps/broadcom/cfm/util/system/syscall.c
index 7b8e82a..49fdf26 100755 (executable)
--- a/userapps/broadcom/cfm/util/system/syscall.c
+++ b/userapps/broadcom/cfm/util/system/syscall.c
@@ -1124,8 +1124,6 @@ void bcmKillAllApps(void) {
       "dnsprobe",
       "dhcpc",
       "igmp",      
-      "cfm",
-      "ippd",
       NULL,
    };
    char cmd[SYS_CMD_LEN], app[SYS_CMD_LEN], buf[SYS_CMD_LEN];
@@ -2059,9 +2057,9 @@ void bcmGetBuildVer(char *swVer, int size) {
         if( swVer[i] != '.' )  // Insert periods into version string   
             swVer[i] = *tagVersion++;  // Start from numeric value
     }
-#if ( 0 )            
+#if 0            
     if( (size - strlen(swVer)) > 12 )
-       strcat(swVer, "-Beta 6");
+       strcat(swVer, "-Beta 1");
 #endif
 }
 

diff --git a/userapps/broadcom/ddnsd/ddnsd_96348RB_save b/userapps/broadcom/ddnsd/ddnsd_96348RB_save
deleted file mode 100755 (executable)
index 6678e61..0000000
Binary files a/userapps/broadcom/ddnsd/ddnsd_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/ddnsd/ddnsd_96348R_save b/userapps/broadcom/ddnsd/ddnsd_96348R_save
deleted file mode 100755 (executable)
index 6678e61..0000000
Binary files a/userapps/broadcom/ddnsd/ddnsd_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/dhcpr/dhcpr_96348RB_save b/userapps/broadcom/dhcpr/dhcpr_96348RB_save
deleted file mode 100755 (executable)
index 39d0ea8..0000000
Binary files a/userapps/broadcom/dhcpr/dhcpr_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/dhcpr/dhcpr_96348R_save b/userapps/broadcom/dhcpr/dhcpr_96348R_save
deleted file mode 100755 (executable)
index 39d0ea8..0000000
Binary files a/userapps/broadcom/dhcpr/dhcpr_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/dnsprobe/dnsprobe_96348RB_save b/userapps/broadcom/dnsprobe/dnsprobe_96348RB_save
deleted file mode 100755 (executable)
index 222f9c2..0000000
Binary files a/userapps/broadcom/dnsprobe/dnsprobe_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/dnsprobe/dnsprobe_96348R_save b/userapps/broadcom/dnsprobe/dnsprobe_96348R_save
deleted file mode 100755 (executable)
index 222f9c2..0000000
Binary files a/userapps/broadcom/dnsprobe/dnsprobe_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/epittcp/Makefile b/userapps/broadcom/epittcp/Makefile
index 97adf98..f59f165 100644 (file)
--- a/userapps/broadcom/epittcp/Makefile
+++ b/userapps/broadcom/epittcp/Makefile
@@ -1,9 +1,12 @@
 all:
+       cp epi_ttcp_$(PROFILE)_save epi_ttcp
 
 install:
+       install -m 755 epi_ttcp $(INSTALL_DIR)/bin
+       $(STRIP) $(INSTALL_DIR)/bin/epi_ttcp
 
-dynamic:
+dynamic: all install
 
 clean:
-
+       rm -f epi_ttcp
 

diff --git a/userapps/broadcom/ethctl/ethctl_96348RB_save b/userapps/broadcom/ethctl/ethctl_96348RB_save
deleted file mode 100755 (executable)
index 7ea07bb..0000000
Binary files a/userapps/broadcom/ethctl/ethctl_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/ethctl/ethctl_96348R_save b/userapps/broadcom/ethctl/ethctl_96348R_save
deleted file mode 100755 (executable)
index 7ea07bb..0000000
Binary files a/userapps/broadcom/ethctl/ethctl_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/hotplug/Makefile b/userapps/broadcom/hotplug/Makefile
index 97adf98..0a666ac 100644 (file)
--- a/userapps/broadcom/hotplug/Makefile
+++ b/userapps/broadcom/hotplug/Makefile
@@ -1,9 +1,17 @@
 all:
+       cp hotplug_$(PROFILE)_save hotplug
 
-install:
+PROGRAM_NAME:= hotplug
 
-dynamic:
+install::
+       install -m 755 $(PROGRAM_NAME) $(INSTALL_DIR)/bin
+       $(STRIP) $(INSTALL_DIR)/bin/$(PROGRAM_NAME)
+       ln -sf ../bin/$(PROGRAM_NAME) $(INSTALL_DIR)/sbin/hotplug
+       
+dynamic: all install
 
-clean:
+dynamic: all install
 
+clean:
+       rm -f hotplug
 

diff --git a/userapps/broadcom/igmp/igmp_96348RB_save b/userapps/broadcom/igmp/igmp_96348RB_save
deleted file mode 100755 (executable)
index b8856aa..0000000
Binary files a/userapps/broadcom/igmp/igmp_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/igmp/igmp_96348R_save b/userapps/broadcom/igmp/igmp_96348R_save
deleted file mode 100755 (executable)
index b8856aa..0000000
Binary files a/userapps/broadcom/igmp/igmp_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/ippd/ippd_96348RB_save b/userapps/broadcom/ippd/ippd_96348RB_save
deleted file mode 100755 (executable)
index e4ba21c..0000000
Binary files a/userapps/broadcom/ippd/ippd_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/ippd/ippd_96348R_save b/userapps/broadcom/ippd/ippd_96348R_save
deleted file mode 100755 (executable)
index e4ba21c..0000000
Binary files a/userapps/broadcom/ippd/ippd_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/nas/Makefile b/userapps/broadcom/nas/Makefile
index 97adf98..2af0e0f 100644 (file)
--- a/userapps/broadcom/nas/Makefile
+++ b/userapps/broadcom/nas/Makefile
@@ -1,9 +1,13 @@
 all:
+       cp nas_$(PROFILE)_save nas
 
 install:
+       install -m 755 nas $(INSTALL_DIR)/bin
+       $(STRIP) $(INSTALL_DIR)/bin/nas
+       ln -sf ../bin/nas $(INSTALL_DIR)/bin/nas4not
 
-dynamic:
+dynamic: all install
 
 clean:
-
+       rm -f nas
 

diff --git a/userapps/broadcom/netctl/netctl_96348RB_save b/userapps/broadcom/netctl/netctl_96348RB_save
deleted file mode 100755 (executable)
index ce0a054..0000000
Binary files a/userapps/broadcom/netctl/netctl_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/netctl/netctl_96348R_save b/userapps/broadcom/netctl/netctl_96348R_save
deleted file mode 100755 (executable)
index ce0a054..0000000
Binary files a/userapps/broadcom/netctl/netctl_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/sntp/sntp_96348RB_save b/userapps/broadcom/sntp/sntp_96348RB_save
deleted file mode 100755 (executable)
index 217fb52..0000000
Binary files a/userapps/broadcom/sntp/sntp_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/sntp/sntp_96348R_save b/userapps/broadcom/sntp/sntp_96348R_save
deleted file mode 100755 (executable)
index 217fb52..0000000
Binary files a/userapps/broadcom/sntp/sntp_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/upnp/igd/linux/upnp_96348RB_save b/userapps/broadcom/upnp/igd/linux/upnp_96348RB_save
deleted file mode 100755 (executable)
index 3be897c..0000000
Binary files a/userapps/broadcom/upnp/igd/linux/upnp_96348RB_save and /dev/null differ

diff --git a/userapps/broadcom/upnp/igd/linux/upnp_96348R_save b/userapps/broadcom/upnp/igd/linux/upnp_96348R_save
deleted file mode 100755 (executable)
index 3be897c..0000000
Binary files a/userapps/broadcom/upnp/igd/linux/upnp_96348R_save and /dev/null differ

diff --git a/userapps/broadcom/wlctl/Makefile b/userapps/broadcom/wlctl/Makefile
index 97adf98..9ca1266 100644 (file)
--- a/userapps/broadcom/wlctl/Makefile
+++ b/userapps/broadcom/wlctl/Makefile
@@ -1,9 +1,15 @@
 all:
+       cp wlctl_$(PROFILE)_save wlctl
 
-install:
+PROGRAM_NAME:= wlctl
 
-dynamic:
+install::
+       install -m 755 $(PROGRAM_NAME) $(INSTALL_DIR)/bin
+       $(STRIP) $(INSTALL_DIR)/bin/$(PROGRAM_NAME)
+       mkdir -p $(INSTALL_DIR)/sbin
 
-clean:
+dynamic: all install
 
+clean:
+       rm -f wlctl
 

diff --git a/userapps/opensource/busybox/include/config.h b/userapps/opensource/busybox/include/config.h
index f0b85e8..58730c4 100644 (file)
--- a/userapps/opensource/busybox/include/config.h
+++ b/userapps/opensource/busybox/include/config.h
@@ -6,7 +6,7 @@
 
 /* Version Number */
 #define BB_VER "1.00"
-#define BB_BT "2006.03.24-15:13+0000"
+#define BB_BT "2006.03.22-20:20+0000"
 
 #define HAVE_DOT_CONFIG 1
 

diff --git a/userapps/opensource/libcreduction/uclibc/libpsi.so b/userapps/opensource/libcreduction/uclibc/libpsi.so
index 7542522..83d7931 100644 (file)
Binary files a/userapps/opensource/libcreduction/uclibc/libpsi.so and b/userapps/opensource/libcreduction/uclibc/libpsi.so differ

diff --git a/userapps/opensource/ppp/pppoe/auth.c b/userapps/opensource/ppp/pppoe/auth.c
index 9e8d2b7..4f9ae04 100755 (executable)
--- a/userapps/opensource/ppp/pppoe/auth.c
+++ b/userapps/opensource/ppp/pppoe/auth.c
@@ -720,7 +720,6 @@ np_up(unit, proto)
         */
        status = EXIT_OK;
        unsuccess = 0;
-        holdoff = 10;
        new_phase(PHASE_RUNNING);
 
        if (idle_time_hook != 0)

diff --git a/userapps/opensource/ppp/pppoe/main.c b/userapps/opensource/ppp/pppoe/main.c
index acf6f7d..3804393 100755 (executable)
--- a/userapps/opensource/ppp/pppoe/main.c
+++ b/userapps/opensource/ppp/pppoe/main.c
@@ -609,10 +609,8 @@ main(argc,argv)
        }
 
 
-       if (!persist)
+       if (!persist || (maxfail > 0 && unsuccess >= maxfail))
            break;
-        if (maxfail > 0 && unsuccess >= maxfail)
-            holdoff = 900;     // USR9108 Do not exit, just wait 15 min.
        
        /*
        // brcm

diff --git a/userapps/opensource/siproxd/src/.buildno b/userapps/opensource/siproxd/src/.buildno
index af7b0ba..178feb4 100755 (executable)
--- a/userapps/opensource/siproxd/src/.buildno
+++ b/userapps/opensource/siproxd/src/.buildno
@@ -1 +1 @@
-2970
+2972

diff --git a/userapps/opensource/sshd/svr-authpasswd.c b/userapps/opensource/sshd/svr-authpasswd.c
index e349097..9779691 100755 (executable)
--- a/userapps/opensource/sshd/svr-authpasswd.c
+++ b/userapps/opensource/sshd/svr-authpasswd.c
@@ -100,14 +100,8 @@ void svr_auth_password() {
 
        m_burn(password, passwordlen);
        m_free(password);
-   // USR9108 No "user" access.
-        if (strcmp(ses.authstate.username, "user") == 0) {
-               dropbear_log(LOG_WARNING,
-                               "Unauthorized attempt for '%s' from %s",
-                               ses.authstate.printableuser,
-                               svr_ses.addrstring);
-               send_msg_userauth_failure(0, 1);
-        } else if (strcmp(testcrypt, passwdcrypt) == 0) {
+
+       if (strcmp(testcrypt, passwdcrypt) == 0) {
                /* successful authentication */
    // brcm commented next msg
                //dropbear_log(LOG_NOTICE,