mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-25 00:18:40 +03:00
upgrade to Linux 2.6.16, yay
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3422 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
041e639e08
commit
237a39ca53
@ -9,6 +9,7 @@ menu "Target Root Filesystem"
|
|||||||
config BR2_TARGET_ROOTFS_SQUASHFS_LZMA
|
config BR2_TARGET_ROOTFS_SQUASHFS_LZMA
|
||||||
bool "squashfs-lzma"
|
bool "squashfs-lzma"
|
||||||
default y
|
default y
|
||||||
|
depends !BR2_LINUX_2_6_ARUBA
|
||||||
help
|
help
|
||||||
Build a squashfs-lzma root filesystem
|
Build a squashfs-lzma root filesystem
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.15.6
|
LINUX_VERSION:=2.6.16
|
||||||
LINUX_RELEASE:=1
|
LINUX_RELEASE:=1
|
||||||
LINUX_KERNEL_MD5SUM:=2ea7c865d6c09a02cbe6ce5fddcd02ca
|
LINUX_KERNEL_MD5SUM:=9a91b2719949ff0856b40bc467fd47be
|
||||||
|
|
||||||
include ../rules.mk
|
include ../rules.mk
|
||||||
include ./config
|
include ./config
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated make config: don't edit
|
# Automatically generated make config: don't edit
|
||||||
# Linux kernel version: 2.6.15.1
|
# Linux kernel version: 2.6.16
|
||||||
# Mon Jan 30 02:08:31 2006
|
# Mon Mar 20 14:06:58 2006
|
||||||
#
|
#
|
||||||
CONFIG_MIPS=y
|
CONFIG_MIPS=y
|
||||||
|
|
||||||
@ -71,7 +71,6 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
|
|||||||
CONFIG_CPU_BIG_ENDIAN=y
|
CONFIG_CPU_BIG_ENDIAN=y
|
||||||
# CONFIG_CPU_LITTLE_ENDIAN is not set
|
# CONFIG_CPU_LITTLE_ENDIAN is not set
|
||||||
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
|
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
|
||||||
CONFIG_IRQ_CPU=y
|
|
||||||
CONFIG_SWAP_IO_SPACE=y
|
CONFIG_SWAP_IO_SPACE=y
|
||||||
CONFIG_MIPS_L1_CACHE_SHIFT=5
|
CONFIG_MIPS_L1_CACHE_SHIFT=5
|
||||||
|
|
||||||
@ -117,11 +116,11 @@ CONFIG_CPU_HAS_PREFETCH=y
|
|||||||
# CONFIG_64BIT_PHYS_ADDR is not set
|
# CONFIG_64BIT_PHYS_ADDR is not set
|
||||||
CONFIG_CPU_ADVANCED=y
|
CONFIG_CPU_ADVANCED=y
|
||||||
CONFIG_CPU_HAS_LLSC=y
|
CONFIG_CPU_HAS_LLSC=y
|
||||||
# CONFIG_CPU_HAS_LLDSCD is not set
|
|
||||||
# CONFIG_CPU_HAS_WB is not set
|
# CONFIG_CPU_HAS_WB is not set
|
||||||
CONFIG_CPU_HAS_SYNC=y
|
CONFIG_CPU_HAS_SYNC=y
|
||||||
CONFIG_GENERIC_HARDIRQS=y
|
CONFIG_GENERIC_HARDIRQS=y
|
||||||
CONFIG_GENERIC_IRQ_PROBE=y
|
CONFIG_GENERIC_IRQ_PROBE=y
|
||||||
|
CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
||||||
CONFIG_ARCH_FLATMEM_ENABLE=y
|
CONFIG_ARCH_FLATMEM_ENABLE=y
|
||||||
CONFIG_SELECT_MEMORY_MODEL=y
|
CONFIG_SELECT_MEMORY_MODEL=y
|
||||||
CONFIG_FLATMEM_MANUAL=y
|
CONFIG_FLATMEM_MANUAL=y
|
||||||
@ -139,7 +138,6 @@ CONFIG_PREEMPT_NONE=y
|
|||||||
# Code maturity level options
|
# Code maturity level options
|
||||||
#
|
#
|
||||||
CONFIG_EXPERIMENTAL=y
|
CONFIG_EXPERIMENTAL=y
|
||||||
CONFIG_CLEAN_COMPILE=y
|
|
||||||
CONFIG_BROKEN_ON_SMP=y
|
CONFIG_BROKEN_ON_SMP=y
|
||||||
CONFIG_INIT_ENV_ARG_LIMIT=32
|
CONFIG_INIT_ENV_ARG_LIMIT=32
|
||||||
|
|
||||||
@ -154,15 +152,15 @@ CONFIG_SYSVIPC=y
|
|||||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||||
CONFIG_SYSCTL=y
|
CONFIG_SYSCTL=y
|
||||||
# CONFIG_AUDIT is not set
|
# CONFIG_AUDIT is not set
|
||||||
CONFIG_HOTPLUG=y
|
|
||||||
CONFIG_KOBJECT_UEVENT=y
|
|
||||||
# CONFIG_IKCONFIG is not set
|
# CONFIG_IKCONFIG is not set
|
||||||
CONFIG_INITRAMFS_SOURCE=""
|
CONFIG_INITRAMFS_SOURCE=""
|
||||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||||
CONFIG_EMBEDDED=y
|
CONFIG_EMBEDDED=y
|
||||||
# CONFIG_KALLSYMS is not set
|
# CONFIG_KALLSYMS is not set
|
||||||
|
CONFIG_HOTPLUG=y
|
||||||
CONFIG_PRINTK=y
|
CONFIG_PRINTK=y
|
||||||
CONFIG_BUG=y
|
CONFIG_BUG=y
|
||||||
|
# CONFIG_ELF_CORE is not set
|
||||||
CONFIG_BASE_FULL=y
|
CONFIG_BASE_FULL=y
|
||||||
CONFIG_FUTEX=y
|
CONFIG_FUTEX=y
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -171,8 +169,11 @@ CONFIG_CC_ALIGN_FUNCTIONS=0
|
|||||||
CONFIG_CC_ALIGN_LABELS=0
|
CONFIG_CC_ALIGN_LABELS=0
|
||||||
CONFIG_CC_ALIGN_LOOPS=0
|
CONFIG_CC_ALIGN_LOOPS=0
|
||||||
CONFIG_CC_ALIGN_JUMPS=0
|
CONFIG_CC_ALIGN_JUMPS=0
|
||||||
|
# CONFIG_SLAB is not set
|
||||||
# CONFIG_TINY_SHMEM is not set
|
# CONFIG_TINY_SHMEM is not set
|
||||||
CONFIG_BASE_SMALL=0
|
CONFIG_BASE_SMALL=0
|
||||||
|
CONFIG_SLOB=y
|
||||||
|
CONFIG_OBSOLETE_INTERMODULE=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Loadable module support
|
# Loadable module support
|
||||||
@ -236,6 +237,7 @@ CONFIG_NET=y
|
|||||||
#
|
#
|
||||||
# Networking options
|
# Networking options
|
||||||
#
|
#
|
||||||
|
# CONFIG_NETDEBUG is not set
|
||||||
CONFIG_PACKET=y
|
CONFIG_PACKET=y
|
||||||
CONFIG_PACKET_MMAP=y
|
CONFIG_PACKET_MMAP=y
|
||||||
CONFIG_UNIX=y
|
CONFIG_UNIX=y
|
||||||
@ -277,6 +279,25 @@ CONFIG_NETFILTER=y
|
|||||||
# Core Netfilter Configuration
|
# Core Netfilter Configuration
|
||||||
#
|
#
|
||||||
# CONFIG_NETFILTER_NETLINK is not set
|
# CONFIG_NETFILTER_NETLINK is not set
|
||||||
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_MARK=m
|
||||||
|
# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_HELPER=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_MAC=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_MARK=m
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_REALM is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_STATE=y
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_STRING is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# IP: Netfilter Configuration
|
# IP: Netfilter Configuration
|
||||||
@ -294,13 +315,9 @@ CONFIG_IP_NF_AMANDA=m
|
|||||||
# CONFIG_IP_NF_PPTP is not set
|
# CONFIG_IP_NF_PPTP is not set
|
||||||
CONFIG_IP_NF_QUEUE=y
|
CONFIG_IP_NF_QUEUE=y
|
||||||
CONFIG_IP_NF_IPTABLES=y
|
CONFIG_IP_NF_IPTABLES=y
|
||||||
CONFIG_IP_NF_MATCH_LIMIT=m
|
|
||||||
CONFIG_IP_NF_MATCH_IPRANGE=m
|
CONFIG_IP_NF_MATCH_IPRANGE=m
|
||||||
CONFIG_IP_NF_MATCH_MAC=m
|
|
||||||
CONFIG_IP_NF_MATCH_LAYER7=m
|
CONFIG_IP_NF_MATCH_LAYER7=m
|
||||||
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
|
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
|
||||||
# CONFIG_IP_NF_MATCH_PKTTYPE is not set
|
|
||||||
CONFIG_IP_NF_MATCH_MARK=m
|
|
||||||
CONFIG_IP_NF_MATCH_MULTIPORT=m
|
CONFIG_IP_NF_MATCH_MULTIPORT=m
|
||||||
CONFIG_IP_NF_MATCH_TOS=m
|
CONFIG_IP_NF_MATCH_TOS=m
|
||||||
CONFIG_IP_NF_MATCH_TIME=m
|
CONFIG_IP_NF_MATCH_TIME=m
|
||||||
@ -308,28 +325,16 @@ CONFIG_IP_NF_MATCH_RECENT=m
|
|||||||
CONFIG_IP_NF_MATCH_ECN=m
|
CONFIG_IP_NF_MATCH_ECN=m
|
||||||
CONFIG_IP_NF_MATCH_DSCP=m
|
CONFIG_IP_NF_MATCH_DSCP=m
|
||||||
CONFIG_IP_NF_MATCH_AH_ESP=m
|
CONFIG_IP_NF_MATCH_AH_ESP=m
|
||||||
CONFIG_IP_NF_MATCH_LENGTH=m
|
|
||||||
CONFIG_IP_NF_MATCH_TTL=m
|
CONFIG_IP_NF_MATCH_TTL=m
|
||||||
CONFIG_IP_NF_MATCH_TCPMSS=y
|
|
||||||
CONFIG_IP_NF_MATCH_HELPER=m
|
|
||||||
CONFIG_IP_NF_MATCH_STATE=y
|
|
||||||
CONFIG_IP_NF_MATCH_CONNTRACK=m
|
|
||||||
CONFIG_IP_NF_MATCH_OWNER=m
|
CONFIG_IP_NF_MATCH_OWNER=m
|
||||||
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
|
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
|
||||||
# CONFIG_IP_NF_MATCH_REALM is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_SCTP is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_DCCP is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_COMMENT is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_CONNBYTES is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
|
# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
|
||||||
# CONFIG_IP_NF_MATCH_STRING is not set
|
|
||||||
CONFIG_IP_NF_FILTER=y
|
CONFIG_IP_NF_FILTER=y
|
||||||
CONFIG_IP_NF_TARGET_REJECT=y
|
CONFIG_IP_NF_TARGET_REJECT=y
|
||||||
CONFIG_IP_NF_TARGET_IMQ=m
|
CONFIG_IP_NF_TARGET_IMQ=m
|
||||||
# CONFIG_IP_NF_TARGET_LOG is not set
|
# CONFIG_IP_NF_TARGET_LOG is not set
|
||||||
CONFIG_IP_NF_TARGET_ULOG=m
|
CONFIG_IP_NF_TARGET_ULOG=m
|
||||||
CONFIG_IP_NF_TARGET_TCPMSS=y
|
CONFIG_IP_NF_TARGET_TCPMSS=y
|
||||||
# CONFIG_IP_NF_TARGET_NFQUEUE is not set
|
|
||||||
CONFIG_IP_NF_NAT=y
|
CONFIG_IP_NF_NAT=y
|
||||||
CONFIG_IP_NF_NAT_NEEDED=y
|
CONFIG_IP_NF_NAT_NEEDED=y
|
||||||
CONFIG_IP_NF_TARGET_MASQUERADE=y
|
CONFIG_IP_NF_TARGET_MASQUERADE=y
|
||||||
@ -345,9 +350,7 @@ CONFIG_IP_NF_MANGLE=y
|
|||||||
CONFIG_IP_NF_TARGET_TOS=m
|
CONFIG_IP_NF_TARGET_TOS=m
|
||||||
CONFIG_IP_NF_TARGET_ECN=m
|
CONFIG_IP_NF_TARGET_ECN=m
|
||||||
CONFIG_IP_NF_TARGET_DSCP=m
|
CONFIG_IP_NF_TARGET_DSCP=m
|
||||||
CONFIG_IP_NF_TARGET_MARK=y
|
CONFIG_IP_NF_TARGET_TTL=m
|
||||||
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
|
|
||||||
# CONFIG_IP_NF_TARGET_TTL is not set
|
|
||||||
# CONFIG_IP_NF_RAW is not set
|
# CONFIG_IP_NF_RAW is not set
|
||||||
# CONFIG_IP_NF_ARPTABLES is not set
|
# CONFIG_IP_NF_ARPTABLES is not set
|
||||||
CONFIG_IP_NF_SET=m
|
CONFIG_IP_NF_SET=m
|
||||||
@ -382,6 +385,11 @@ CONFIG_IP_NF_TARGET_SET=m
|
|||||||
# SCTP Configuration (EXPERIMENTAL)
|
# SCTP Configuration (EXPERIMENTAL)
|
||||||
#
|
#
|
||||||
# CONFIG_IP_SCTP is not set
|
# CONFIG_IP_SCTP is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# TIPC Configuration (EXPERIMENTAL)
|
||||||
|
#
|
||||||
|
# CONFIG_TIPC is not set
|
||||||
# CONFIG_ATM is not set
|
# CONFIG_ATM is not set
|
||||||
CONFIG_BRIDGE=y
|
CONFIG_BRIDGE=y
|
||||||
CONFIG_VLAN_8021Q=y
|
CONFIG_VLAN_8021Q=y
|
||||||
@ -548,6 +556,7 @@ CONFIG_MTD_CFI_UTIL=y
|
|||||||
# CONFIG_MTD_RAM is not set
|
# CONFIG_MTD_RAM is not set
|
||||||
# CONFIG_MTD_ROM is not set
|
# CONFIG_MTD_ROM is not set
|
||||||
# CONFIG_MTD_ABSENT is not set
|
# CONFIG_MTD_ABSENT is not set
|
||||||
|
# CONFIG_MTD_OBSOLETE_CHIPS is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Mapping drivers for chip access
|
# Mapping drivers for chip access
|
||||||
@ -676,13 +685,7 @@ CONFIG_BLK_DEV_SD=m
|
|||||||
# CONFIG_SCSI_IPR is not set
|
# CONFIG_SCSI_IPR is not set
|
||||||
# CONFIG_SCSI_QLOGIC_FC is not set
|
# CONFIG_SCSI_QLOGIC_FC is not set
|
||||||
# CONFIG_SCSI_QLOGIC_1280 is not set
|
# CONFIG_SCSI_QLOGIC_1280 is not set
|
||||||
CONFIG_SCSI_QLA2XXX=m
|
# CONFIG_SCSI_QLA_FC is not set
|
||||||
# CONFIG_SCSI_QLA21XX is not set
|
|
||||||
# CONFIG_SCSI_QLA22XX is not set
|
|
||||||
# CONFIG_SCSI_QLA2300 is not set
|
|
||||||
# CONFIG_SCSI_QLA2322 is not set
|
|
||||||
# CONFIG_SCSI_QLA6312 is not set
|
|
||||||
# CONFIG_SCSI_QLA24XX is not set
|
|
||||||
# CONFIG_SCSI_LPFC is not set
|
# CONFIG_SCSI_LPFC is not set
|
||||||
# CONFIG_SCSI_DC395x is not set
|
# CONFIG_SCSI_DC395x is not set
|
||||||
# CONFIG_SCSI_DC390T is not set
|
# CONFIG_SCSI_DC390T is not set
|
||||||
@ -716,6 +719,7 @@ CONFIG_SCSI_QLA2XXX=m
|
|||||||
# Network device support
|
# Network device support
|
||||||
#
|
#
|
||||||
CONFIG_NETDEVICES=y
|
CONFIG_NETDEVICES=y
|
||||||
|
# CONFIG_IFB is not set
|
||||||
# CONFIG_DUMMY is not set
|
# CONFIG_DUMMY is not set
|
||||||
# CONFIG_BONDING is not set
|
# CONFIG_BONDING is not set
|
||||||
# CONFIG_EQUALIZER is not set
|
# CONFIG_EQUALIZER is not set
|
||||||
@ -748,6 +752,7 @@ CONFIG_IDT_RC32434_ETH=y
|
|||||||
# CONFIG_SUNGEM is not set
|
# CONFIG_SUNGEM is not set
|
||||||
# CONFIG_CASSINI is not set
|
# CONFIG_CASSINI is not set
|
||||||
# CONFIG_NET_VENDOR_3COM is not set
|
# CONFIG_NET_VENDOR_3COM is not set
|
||||||
|
# CONFIG_DM9000 is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Tulip family network device support
|
# Tulip family network device support
|
||||||
@ -787,6 +792,7 @@ CONFIG_NATSEMI=y
|
|||||||
# CONFIG_R8169 is not set
|
# CONFIG_R8169 is not set
|
||||||
# CONFIG_SIS190 is not set
|
# CONFIG_SIS190 is not set
|
||||||
# CONFIG_SKGE is not set
|
# CONFIG_SKGE is not set
|
||||||
|
# CONFIG_SKY2 is not set
|
||||||
# CONFIG_SK98LIN is not set
|
# CONFIG_SK98LIN is not set
|
||||||
# CONFIG_VIA_VELOCITY is not set
|
# CONFIG_VIA_VELOCITY is not set
|
||||||
# CONFIG_TIGON3 is not set
|
# CONFIG_TIGON3 is not set
|
||||||
@ -900,6 +906,7 @@ CONFIG_INPUT=m
|
|||||||
CONFIG_SERIAL_8250=y
|
CONFIG_SERIAL_8250=y
|
||||||
CONFIG_SERIAL_8250_CONSOLE=y
|
CONFIG_SERIAL_8250_CONSOLE=y
|
||||||
CONFIG_SERIAL_8250_NR_UARTS=2
|
CONFIG_SERIAL_8250_NR_UARTS=2
|
||||||
|
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
|
||||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -960,6 +967,12 @@ CONFIG_WATCHDOG=y
|
|||||||
#
|
#
|
||||||
# CONFIG_I2C is not set
|
# CONFIG_I2C is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# SPI support
|
||||||
|
#
|
||||||
|
# CONFIG_SPI is not set
|
||||||
|
# CONFIG_SPI_MASTER is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Dallas's 1-wire bus
|
# Dallas's 1-wire bus
|
||||||
#
|
#
|
||||||
@ -991,6 +1004,7 @@ CONFIG_VIDEO_DEV=m
|
|||||||
#
|
#
|
||||||
# Video Adapters
|
# Video Adapters
|
||||||
#
|
#
|
||||||
|
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||||
# CONFIG_VIDEO_CPIA is not set
|
# CONFIG_VIDEO_CPIA is not set
|
||||||
# CONFIG_VIDEO_STRADIS is not set
|
# CONFIG_VIDEO_STRADIS is not set
|
||||||
# CONFIG_VIDEO_MXB is not set
|
# CONFIG_VIDEO_MXB is not set
|
||||||
@ -1031,6 +1045,8 @@ CONFIG_SND_RAWMIDI=m
|
|||||||
# CONFIG_SND_SEQUENCER is not set
|
# CONFIG_SND_SEQUENCER is not set
|
||||||
# CONFIG_SND_MIXER_OSS is not set
|
# CONFIG_SND_MIXER_OSS is not set
|
||||||
# CONFIG_SND_PCM_OSS is not set
|
# CONFIG_SND_PCM_OSS is not set
|
||||||
|
# CONFIG_SND_DYNAMIC_MINORS is not set
|
||||||
|
# CONFIG_SND_SUPPORT_OLD_API is not set
|
||||||
# CONFIG_SND_VERBOSE_PRINTK is not set
|
# CONFIG_SND_VERBOSE_PRINTK is not set
|
||||||
# CONFIG_SND_DEBUG is not set
|
# CONFIG_SND_DEBUG is not set
|
||||||
|
|
||||||
@ -1045,6 +1061,7 @@ CONFIG_SND_RAWMIDI=m
|
|||||||
#
|
#
|
||||||
# PCI devices
|
# PCI devices
|
||||||
#
|
#
|
||||||
|
# CONFIG_SND_AD1889 is not set
|
||||||
# CONFIG_SND_ALI5451 is not set
|
# CONFIG_SND_ALI5451 is not set
|
||||||
# CONFIG_SND_ATIIXP is not set
|
# CONFIG_SND_ATIIXP is not set
|
||||||
# CONFIG_SND_ATIIXP_MODEM is not set
|
# CONFIG_SND_ATIIXP_MODEM is not set
|
||||||
@ -1053,38 +1070,38 @@ CONFIG_SND_RAWMIDI=m
|
|||||||
# CONFIG_SND_AU8830 is not set
|
# CONFIG_SND_AU8830 is not set
|
||||||
# CONFIG_SND_AZT3328 is not set
|
# CONFIG_SND_AZT3328 is not set
|
||||||
# CONFIG_SND_BT87X is not set
|
# CONFIG_SND_BT87X is not set
|
||||||
# CONFIG_SND_CS46XX is not set
|
# CONFIG_SND_CA0106 is not set
|
||||||
|
# CONFIG_SND_CMIPCI is not set
|
||||||
# CONFIG_SND_CS4281 is not set
|
# CONFIG_SND_CS4281 is not set
|
||||||
|
# CONFIG_SND_CS46XX is not set
|
||||||
# CONFIG_SND_EMU10K1 is not set
|
# CONFIG_SND_EMU10K1 is not set
|
||||||
# CONFIG_SND_EMU10K1X is not set
|
# CONFIG_SND_EMU10K1X is not set
|
||||||
# CONFIG_SND_CA0106 is not set
|
|
||||||
# CONFIG_SND_KORG1212 is not set
|
|
||||||
# CONFIG_SND_MIXART is not set
|
|
||||||
# CONFIG_SND_NM256 is not set
|
|
||||||
# CONFIG_SND_RME32 is not set
|
|
||||||
# CONFIG_SND_RME96 is not set
|
|
||||||
# CONFIG_SND_RME9652 is not set
|
|
||||||
# CONFIG_SND_HDSP is not set
|
|
||||||
# CONFIG_SND_HDSPM is not set
|
|
||||||
# CONFIG_SND_TRIDENT is not set
|
|
||||||
# CONFIG_SND_YMFPCI is not set
|
|
||||||
# CONFIG_SND_AD1889 is not set
|
|
||||||
# CONFIG_SND_CMIPCI is not set
|
|
||||||
# CONFIG_SND_ENS1370 is not set
|
# CONFIG_SND_ENS1370 is not set
|
||||||
# CONFIG_SND_ENS1371 is not set
|
# CONFIG_SND_ENS1371 is not set
|
||||||
# CONFIG_SND_ES1938 is not set
|
# CONFIG_SND_ES1938 is not set
|
||||||
# CONFIG_SND_ES1968 is not set
|
# CONFIG_SND_ES1968 is not set
|
||||||
# CONFIG_SND_MAESTRO3 is not set
|
|
||||||
# CONFIG_SND_FM801 is not set
|
# CONFIG_SND_FM801 is not set
|
||||||
|
# CONFIG_SND_HDA_INTEL is not set
|
||||||
|
# CONFIG_SND_HDSP is not set
|
||||||
|
# CONFIG_SND_HDSPM is not set
|
||||||
# CONFIG_SND_ICE1712 is not set
|
# CONFIG_SND_ICE1712 is not set
|
||||||
# CONFIG_SND_ICE1724 is not set
|
# CONFIG_SND_ICE1724 is not set
|
||||||
# CONFIG_SND_INTEL8X0 is not set
|
# CONFIG_SND_INTEL8X0 is not set
|
||||||
# CONFIG_SND_INTEL8X0M is not set
|
# CONFIG_SND_INTEL8X0M is not set
|
||||||
|
# CONFIG_SND_KORG1212 is not set
|
||||||
|
# CONFIG_SND_MAESTRO3 is not set
|
||||||
|
# CONFIG_SND_MIXART is not set
|
||||||
|
# CONFIG_SND_NM256 is not set
|
||||||
|
# CONFIG_SND_PCXHR is not set
|
||||||
|
# CONFIG_SND_RME32 is not set
|
||||||
|
# CONFIG_SND_RME96 is not set
|
||||||
|
# CONFIG_SND_RME9652 is not set
|
||||||
# CONFIG_SND_SONICVIBES is not set
|
# CONFIG_SND_SONICVIBES is not set
|
||||||
|
# CONFIG_SND_TRIDENT is not set
|
||||||
# CONFIG_SND_VIA82XX is not set
|
# CONFIG_SND_VIA82XX is not set
|
||||||
# CONFIG_SND_VIA82XX_MODEM is not set
|
# CONFIG_SND_VIA82XX_MODEM is not set
|
||||||
# CONFIG_SND_VX222 is not set
|
# CONFIG_SND_VX222 is not set
|
||||||
# CONFIG_SND_HDA_INTEL is not set
|
# CONFIG_SND_YMFPCI is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# ALSA MIPS devices
|
# ALSA MIPS devices
|
||||||
@ -1152,6 +1169,8 @@ CONFIG_USB_STORAGE=m
|
|||||||
# CONFIG_USB_STORAGE_SDDR09 is not set
|
# CONFIG_USB_STORAGE_SDDR09 is not set
|
||||||
# CONFIG_USB_STORAGE_SDDR55 is not set
|
# CONFIG_USB_STORAGE_SDDR55 is not set
|
||||||
# CONFIG_USB_STORAGE_JUMPSHOT is not set
|
# CONFIG_USB_STORAGE_JUMPSHOT is not set
|
||||||
|
# CONFIG_USB_STORAGE_ALAUDA is not set
|
||||||
|
# CONFIG_USB_LIBUSUAL is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# USB Input Devices
|
# USB Input Devices
|
||||||
@ -1174,6 +1193,7 @@ CONFIG_USB_STORAGE=m
|
|||||||
# CONFIG_USB_YEALINK is not set
|
# CONFIG_USB_YEALINK is not set
|
||||||
# CONFIG_USB_XPAD is not set
|
# CONFIG_USB_XPAD is not set
|
||||||
# CONFIG_USB_ATI_REMOTE is not set
|
# CONFIG_USB_ATI_REMOTE is not set
|
||||||
|
# CONFIG_USB_ATI_REMOTE2 is not set
|
||||||
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
||||||
# CONFIG_USB_APPLETOUCH is not set
|
# CONFIG_USB_APPLETOUCH is not set
|
||||||
|
|
||||||
@ -1189,6 +1209,7 @@ CONFIG_USB_STORAGE=m
|
|||||||
# CONFIG_USB_DABUSB is not set
|
# CONFIG_USB_DABUSB is not set
|
||||||
# CONFIG_USB_VICAM is not set
|
# CONFIG_USB_VICAM is not set
|
||||||
# CONFIG_USB_DSBR is not set
|
# CONFIG_USB_DSBR is not set
|
||||||
|
# CONFIG_USB_ET61X251 is not set
|
||||||
# CONFIG_USB_IBMCAM is not set
|
# CONFIG_USB_IBMCAM is not set
|
||||||
# CONFIG_USB_KONICAWC is not set
|
# CONFIG_USB_KONICAWC is not set
|
||||||
# CONFIG_USB_OV511 is not set
|
# CONFIG_USB_OV511 is not set
|
||||||
@ -1255,7 +1276,7 @@ CONFIG_USB_MON=y
|
|||||||
# CONFIG_INFINIBAND is not set
|
# CONFIG_INFINIBAND is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# SN Devices
|
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
|
||||||
#
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1279,6 +1300,7 @@ CONFIG_JFS_FS=m
|
|||||||
# CONFIG_JFS_STATISTICS is not set
|
# CONFIG_JFS_STATISTICS is not set
|
||||||
# CONFIG_FS_POSIX_ACL is not set
|
# CONFIG_FS_POSIX_ACL is not set
|
||||||
# CONFIG_XFS_FS is not set
|
# CONFIG_XFS_FS is not set
|
||||||
|
# CONFIG_OCFS2_FS is not set
|
||||||
CONFIG_MINIX_FS=m
|
CONFIG_MINIX_FS=m
|
||||||
# CONFIG_ROMFS_FS is not set
|
# CONFIG_ROMFS_FS is not set
|
||||||
# CONFIG_INOTIFY is not set
|
# CONFIG_INOTIFY is not set
|
||||||
@ -1317,6 +1339,7 @@ CONFIG_TMPFS=y
|
|||||||
# CONFIG_HUGETLB_PAGE is not set
|
# CONFIG_HUGETLB_PAGE is not set
|
||||||
CONFIG_RAMFS=y
|
CONFIG_RAMFS=y
|
||||||
# CONFIG_RELAYFS_FS is not set
|
# CONFIG_RELAYFS_FS is not set
|
||||||
|
# CONFIG_CONFIGFS_FS is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Miscellaneous filesystems
|
# Miscellaneous filesystems
|
||||||
@ -1375,6 +1398,7 @@ CONFIG_MSDOS_PARTITION=y
|
|||||||
# CONFIG_SGI_PARTITION is not set
|
# CONFIG_SGI_PARTITION is not set
|
||||||
# CONFIG_ULTRIX_PARTITION is not set
|
# CONFIG_ULTRIX_PARTITION is not set
|
||||||
# CONFIG_SUN_PARTITION is not set
|
# CONFIG_SUN_PARTITION is not set
|
||||||
|
# CONFIG_KARMA_PARTITION is not set
|
||||||
# CONFIG_EFI_PARTITION is not set
|
# CONFIG_EFI_PARTITION is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1430,6 +1454,7 @@ CONFIG_NLS_UTF8=m
|
|||||||
# Kernel hacking
|
# Kernel hacking
|
||||||
#
|
#
|
||||||
# CONFIG_PRINTK_TIME is not set
|
# CONFIG_PRINTK_TIME is not set
|
||||||
|
# CONFIG_MAGIC_SYSRQ is not set
|
||||||
# CONFIG_DEBUG_KERNEL is not set
|
# CONFIG_DEBUG_KERNEL is not set
|
||||||
CONFIG_LOG_BUF_SHIFT=14
|
CONFIG_LOG_BUF_SHIFT=14
|
||||||
CONFIG_CROSSCOMPILE=y
|
CONFIG_CROSSCOMPILE=y
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated make config: don't edit
|
# Automatically generated make config: don't edit
|
||||||
# Linux kernel version: 2.6.15.1
|
# Linux kernel version: 2.6.16
|
||||||
# Mon Jan 30 02:08:31 2006
|
# Mon Mar 20 14:06:58 2006
|
||||||
#
|
#
|
||||||
CONFIG_MIPS=y
|
CONFIG_MIPS=y
|
||||||
|
|
||||||
@ -71,7 +71,6 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
|
|||||||
CONFIG_CPU_BIG_ENDIAN=y
|
CONFIG_CPU_BIG_ENDIAN=y
|
||||||
# CONFIG_CPU_LITTLE_ENDIAN is not set
|
# CONFIG_CPU_LITTLE_ENDIAN is not set
|
||||||
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
|
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
|
||||||
CONFIG_IRQ_CPU=y
|
|
||||||
CONFIG_SWAP_IO_SPACE=y
|
CONFIG_SWAP_IO_SPACE=y
|
||||||
CONFIG_MIPS_L1_CACHE_SHIFT=5
|
CONFIG_MIPS_L1_CACHE_SHIFT=5
|
||||||
|
|
||||||
@ -117,11 +116,11 @@ CONFIG_CPU_HAS_PREFETCH=y
|
|||||||
# CONFIG_64BIT_PHYS_ADDR is not set
|
# CONFIG_64BIT_PHYS_ADDR is not set
|
||||||
CONFIG_CPU_ADVANCED=y
|
CONFIG_CPU_ADVANCED=y
|
||||||
CONFIG_CPU_HAS_LLSC=y
|
CONFIG_CPU_HAS_LLSC=y
|
||||||
# CONFIG_CPU_HAS_LLDSCD is not set
|
|
||||||
# CONFIG_CPU_HAS_WB is not set
|
# CONFIG_CPU_HAS_WB is not set
|
||||||
CONFIG_CPU_HAS_SYNC=y
|
CONFIG_CPU_HAS_SYNC=y
|
||||||
CONFIG_GENERIC_HARDIRQS=y
|
CONFIG_GENERIC_HARDIRQS=y
|
||||||
CONFIG_GENERIC_IRQ_PROBE=y
|
CONFIG_GENERIC_IRQ_PROBE=y
|
||||||
|
CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
||||||
CONFIG_ARCH_FLATMEM_ENABLE=y
|
CONFIG_ARCH_FLATMEM_ENABLE=y
|
||||||
CONFIG_SELECT_MEMORY_MODEL=y
|
CONFIG_SELECT_MEMORY_MODEL=y
|
||||||
CONFIG_FLATMEM_MANUAL=y
|
CONFIG_FLATMEM_MANUAL=y
|
||||||
@ -139,7 +138,6 @@ CONFIG_PREEMPT_NONE=y
|
|||||||
# Code maturity level options
|
# Code maturity level options
|
||||||
#
|
#
|
||||||
CONFIG_EXPERIMENTAL=y
|
CONFIG_EXPERIMENTAL=y
|
||||||
CONFIG_CLEAN_COMPILE=y
|
|
||||||
CONFIG_BROKEN_ON_SMP=y
|
CONFIG_BROKEN_ON_SMP=y
|
||||||
CONFIG_INIT_ENV_ARG_LIMIT=32
|
CONFIG_INIT_ENV_ARG_LIMIT=32
|
||||||
|
|
||||||
@ -154,8 +152,6 @@ CONFIG_SYSVIPC=y
|
|||||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||||
CONFIG_SYSCTL=y
|
CONFIG_SYSCTL=y
|
||||||
# CONFIG_AUDIT is not set
|
# CONFIG_AUDIT is not set
|
||||||
CONFIG_HOTPLUG=y
|
|
||||||
CONFIG_KOBJECT_UEVENT=y
|
|
||||||
# CONFIG_IKCONFIG is not set
|
# CONFIG_IKCONFIG is not set
|
||||||
CONFIG_INITRAMFS_SOURCE="../root"
|
CONFIG_INITRAMFS_SOURCE="../root"
|
||||||
CONFIG_INITRAMFS_ROOT_UID=0
|
CONFIG_INITRAMFS_ROOT_UID=0
|
||||||
@ -163,8 +159,10 @@ CONFIG_INITRAMFS_ROOT_GID=0
|
|||||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||||
CONFIG_EMBEDDED=y
|
CONFIG_EMBEDDED=y
|
||||||
# CONFIG_KALLSYMS is not set
|
# CONFIG_KALLSYMS is not set
|
||||||
|
CONFIG_HOTPLUG=y
|
||||||
CONFIG_PRINTK=y
|
CONFIG_PRINTK=y
|
||||||
CONFIG_BUG=y
|
CONFIG_BUG=y
|
||||||
|
# CONFIG_ELF_CORE is not set
|
||||||
CONFIG_BASE_FULL=y
|
CONFIG_BASE_FULL=y
|
||||||
CONFIG_FUTEX=y
|
CONFIG_FUTEX=y
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -173,8 +171,11 @@ CONFIG_CC_ALIGN_FUNCTIONS=0
|
|||||||
CONFIG_CC_ALIGN_LABELS=0
|
CONFIG_CC_ALIGN_LABELS=0
|
||||||
CONFIG_CC_ALIGN_LOOPS=0
|
CONFIG_CC_ALIGN_LOOPS=0
|
||||||
CONFIG_CC_ALIGN_JUMPS=0
|
CONFIG_CC_ALIGN_JUMPS=0
|
||||||
|
# CONFIG_SLAB is not set
|
||||||
# CONFIG_TINY_SHMEM is not set
|
# CONFIG_TINY_SHMEM is not set
|
||||||
CONFIG_BASE_SMALL=0
|
CONFIG_BASE_SMALL=0
|
||||||
|
CONFIG_SLOB=y
|
||||||
|
CONFIG_OBSOLETE_INTERMODULE=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Loadable module support
|
# Loadable module support
|
||||||
@ -238,6 +239,7 @@ CONFIG_NET=y
|
|||||||
#
|
#
|
||||||
# Networking options
|
# Networking options
|
||||||
#
|
#
|
||||||
|
# CONFIG_NETDEBUG is not set
|
||||||
CONFIG_PACKET=y
|
CONFIG_PACKET=y
|
||||||
CONFIG_PACKET_MMAP=y
|
CONFIG_PACKET_MMAP=y
|
||||||
CONFIG_UNIX=y
|
CONFIG_UNIX=y
|
||||||
@ -279,6 +281,25 @@ CONFIG_NETFILTER=y
|
|||||||
# Core Netfilter Configuration
|
# Core Netfilter Configuration
|
||||||
#
|
#
|
||||||
# CONFIG_NETFILTER_NETLINK is not set
|
# CONFIG_NETFILTER_NETLINK is not set
|
||||||
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_MARK=m
|
||||||
|
# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_HELPER=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_MAC=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_MARK=m
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_REALM is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_STATE=y
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_STRING is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# IP: Netfilter Configuration
|
# IP: Netfilter Configuration
|
||||||
@ -296,13 +317,9 @@ CONFIG_IP_NF_AMANDA=m
|
|||||||
# CONFIG_IP_NF_PPTP is not set
|
# CONFIG_IP_NF_PPTP is not set
|
||||||
CONFIG_IP_NF_QUEUE=y
|
CONFIG_IP_NF_QUEUE=y
|
||||||
CONFIG_IP_NF_IPTABLES=y
|
CONFIG_IP_NF_IPTABLES=y
|
||||||
CONFIG_IP_NF_MATCH_LIMIT=m
|
|
||||||
CONFIG_IP_NF_MATCH_IPRANGE=m
|
CONFIG_IP_NF_MATCH_IPRANGE=m
|
||||||
CONFIG_IP_NF_MATCH_MAC=m
|
|
||||||
CONFIG_IP_NF_MATCH_LAYER7=m
|
CONFIG_IP_NF_MATCH_LAYER7=m
|
||||||
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
|
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
|
||||||
# CONFIG_IP_NF_MATCH_PKTTYPE is not set
|
|
||||||
CONFIG_IP_NF_MATCH_MARK=m
|
|
||||||
CONFIG_IP_NF_MATCH_MULTIPORT=m
|
CONFIG_IP_NF_MATCH_MULTIPORT=m
|
||||||
CONFIG_IP_NF_MATCH_TOS=m
|
CONFIG_IP_NF_MATCH_TOS=m
|
||||||
CONFIG_IP_NF_MATCH_TIME=m
|
CONFIG_IP_NF_MATCH_TIME=m
|
||||||
@ -310,28 +327,16 @@ CONFIG_IP_NF_MATCH_RECENT=m
|
|||||||
CONFIG_IP_NF_MATCH_ECN=m
|
CONFIG_IP_NF_MATCH_ECN=m
|
||||||
CONFIG_IP_NF_MATCH_DSCP=m
|
CONFIG_IP_NF_MATCH_DSCP=m
|
||||||
CONFIG_IP_NF_MATCH_AH_ESP=m
|
CONFIG_IP_NF_MATCH_AH_ESP=m
|
||||||
CONFIG_IP_NF_MATCH_LENGTH=m
|
|
||||||
CONFIG_IP_NF_MATCH_TTL=m
|
CONFIG_IP_NF_MATCH_TTL=m
|
||||||
CONFIG_IP_NF_MATCH_TCPMSS=y
|
|
||||||
CONFIG_IP_NF_MATCH_HELPER=m
|
|
||||||
CONFIG_IP_NF_MATCH_STATE=y
|
|
||||||
CONFIG_IP_NF_MATCH_CONNTRACK=m
|
|
||||||
CONFIG_IP_NF_MATCH_OWNER=m
|
CONFIG_IP_NF_MATCH_OWNER=m
|
||||||
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
|
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
|
||||||
# CONFIG_IP_NF_MATCH_REALM is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_SCTP is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_DCCP is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_COMMENT is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_CONNBYTES is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
|
# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
|
||||||
# CONFIG_IP_NF_MATCH_STRING is not set
|
|
||||||
CONFIG_IP_NF_FILTER=y
|
CONFIG_IP_NF_FILTER=y
|
||||||
CONFIG_IP_NF_TARGET_REJECT=y
|
CONFIG_IP_NF_TARGET_REJECT=y
|
||||||
CONFIG_IP_NF_TARGET_IMQ=m
|
CONFIG_IP_NF_TARGET_IMQ=m
|
||||||
# CONFIG_IP_NF_TARGET_LOG is not set
|
# CONFIG_IP_NF_TARGET_LOG is not set
|
||||||
CONFIG_IP_NF_TARGET_ULOG=m
|
CONFIG_IP_NF_TARGET_ULOG=m
|
||||||
CONFIG_IP_NF_TARGET_TCPMSS=y
|
CONFIG_IP_NF_TARGET_TCPMSS=y
|
||||||
# CONFIG_IP_NF_TARGET_NFQUEUE is not set
|
|
||||||
CONFIG_IP_NF_NAT=y
|
CONFIG_IP_NF_NAT=y
|
||||||
CONFIG_IP_NF_NAT_NEEDED=y
|
CONFIG_IP_NF_NAT_NEEDED=y
|
||||||
CONFIG_IP_NF_TARGET_MASQUERADE=y
|
CONFIG_IP_NF_TARGET_MASQUERADE=y
|
||||||
@ -347,9 +352,7 @@ CONFIG_IP_NF_MANGLE=y
|
|||||||
CONFIG_IP_NF_TARGET_TOS=m
|
CONFIG_IP_NF_TARGET_TOS=m
|
||||||
CONFIG_IP_NF_TARGET_ECN=m
|
CONFIG_IP_NF_TARGET_ECN=m
|
||||||
CONFIG_IP_NF_TARGET_DSCP=m
|
CONFIG_IP_NF_TARGET_DSCP=m
|
||||||
CONFIG_IP_NF_TARGET_MARK=y
|
CONFIG_IP_NF_TARGET_TTL=m
|
||||||
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
|
|
||||||
# CONFIG_IP_NF_TARGET_TTL is not set
|
|
||||||
# CONFIG_IP_NF_RAW is not set
|
# CONFIG_IP_NF_RAW is not set
|
||||||
# CONFIG_IP_NF_ARPTABLES is not set
|
# CONFIG_IP_NF_ARPTABLES is not set
|
||||||
CONFIG_IP_NF_SET=m
|
CONFIG_IP_NF_SET=m
|
||||||
@ -384,6 +387,11 @@ CONFIG_IP_NF_TARGET_SET=m
|
|||||||
# SCTP Configuration (EXPERIMENTAL)
|
# SCTP Configuration (EXPERIMENTAL)
|
||||||
#
|
#
|
||||||
# CONFIG_IP_SCTP is not set
|
# CONFIG_IP_SCTP is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# TIPC Configuration (EXPERIMENTAL)
|
||||||
|
#
|
||||||
|
# CONFIG_TIPC is not set
|
||||||
# CONFIG_ATM is not set
|
# CONFIG_ATM is not set
|
||||||
CONFIG_BRIDGE=y
|
CONFIG_BRIDGE=y
|
||||||
CONFIG_VLAN_8021Q=y
|
CONFIG_VLAN_8021Q=y
|
||||||
@ -550,6 +558,7 @@ CONFIG_MTD_CFI_UTIL=y
|
|||||||
# CONFIG_MTD_RAM is not set
|
# CONFIG_MTD_RAM is not set
|
||||||
# CONFIG_MTD_ROM is not set
|
# CONFIG_MTD_ROM is not set
|
||||||
# CONFIG_MTD_ABSENT is not set
|
# CONFIG_MTD_ABSENT is not set
|
||||||
|
# CONFIG_MTD_OBSOLETE_CHIPS is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Mapping drivers for chip access
|
# Mapping drivers for chip access
|
||||||
@ -678,13 +687,7 @@ CONFIG_BLK_DEV_SD=m
|
|||||||
# CONFIG_SCSI_IPR is not set
|
# CONFIG_SCSI_IPR is not set
|
||||||
# CONFIG_SCSI_QLOGIC_FC is not set
|
# CONFIG_SCSI_QLOGIC_FC is not set
|
||||||
# CONFIG_SCSI_QLOGIC_1280 is not set
|
# CONFIG_SCSI_QLOGIC_1280 is not set
|
||||||
CONFIG_SCSI_QLA2XXX=m
|
# CONFIG_SCSI_QLA_FC is not set
|
||||||
# CONFIG_SCSI_QLA21XX is not set
|
|
||||||
# CONFIG_SCSI_QLA22XX is not set
|
|
||||||
# CONFIG_SCSI_QLA2300 is not set
|
|
||||||
# CONFIG_SCSI_QLA2322 is not set
|
|
||||||
# CONFIG_SCSI_QLA6312 is not set
|
|
||||||
# CONFIG_SCSI_QLA24XX is not set
|
|
||||||
# CONFIG_SCSI_LPFC is not set
|
# CONFIG_SCSI_LPFC is not set
|
||||||
# CONFIG_SCSI_DC395x is not set
|
# CONFIG_SCSI_DC395x is not set
|
||||||
# CONFIG_SCSI_DC390T is not set
|
# CONFIG_SCSI_DC390T is not set
|
||||||
@ -718,6 +721,7 @@ CONFIG_SCSI_QLA2XXX=m
|
|||||||
# Network device support
|
# Network device support
|
||||||
#
|
#
|
||||||
CONFIG_NETDEVICES=y
|
CONFIG_NETDEVICES=y
|
||||||
|
# CONFIG_IFB is not set
|
||||||
# CONFIG_DUMMY is not set
|
# CONFIG_DUMMY is not set
|
||||||
# CONFIG_BONDING is not set
|
# CONFIG_BONDING is not set
|
||||||
# CONFIG_EQUALIZER is not set
|
# CONFIG_EQUALIZER is not set
|
||||||
@ -750,6 +754,7 @@ CONFIG_IDT_RC32434_ETH=y
|
|||||||
# CONFIG_SUNGEM is not set
|
# CONFIG_SUNGEM is not set
|
||||||
# CONFIG_CASSINI is not set
|
# CONFIG_CASSINI is not set
|
||||||
# CONFIG_NET_VENDOR_3COM is not set
|
# CONFIG_NET_VENDOR_3COM is not set
|
||||||
|
# CONFIG_DM9000 is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Tulip family network device support
|
# Tulip family network device support
|
||||||
@ -789,6 +794,7 @@ CONFIG_NATSEMI=y
|
|||||||
# CONFIG_R8169 is not set
|
# CONFIG_R8169 is not set
|
||||||
# CONFIG_SIS190 is not set
|
# CONFIG_SIS190 is not set
|
||||||
# CONFIG_SKGE is not set
|
# CONFIG_SKGE is not set
|
||||||
|
# CONFIG_SKY2 is not set
|
||||||
# CONFIG_SK98LIN is not set
|
# CONFIG_SK98LIN is not set
|
||||||
# CONFIG_VIA_VELOCITY is not set
|
# CONFIG_VIA_VELOCITY is not set
|
||||||
# CONFIG_TIGON3 is not set
|
# CONFIG_TIGON3 is not set
|
||||||
@ -902,6 +908,7 @@ CONFIG_INPUT=m
|
|||||||
CONFIG_SERIAL_8250=y
|
CONFIG_SERIAL_8250=y
|
||||||
CONFIG_SERIAL_8250_CONSOLE=y
|
CONFIG_SERIAL_8250_CONSOLE=y
|
||||||
CONFIG_SERIAL_8250_NR_UARTS=2
|
CONFIG_SERIAL_8250_NR_UARTS=2
|
||||||
|
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
|
||||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -962,6 +969,12 @@ CONFIG_WATCHDOG=y
|
|||||||
#
|
#
|
||||||
# CONFIG_I2C is not set
|
# CONFIG_I2C is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# SPI support
|
||||||
|
#
|
||||||
|
# CONFIG_SPI is not set
|
||||||
|
# CONFIG_SPI_MASTER is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Dallas's 1-wire bus
|
# Dallas's 1-wire bus
|
||||||
#
|
#
|
||||||
@ -993,6 +1006,7 @@ CONFIG_VIDEO_DEV=m
|
|||||||
#
|
#
|
||||||
# Video Adapters
|
# Video Adapters
|
||||||
#
|
#
|
||||||
|
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||||
# CONFIG_VIDEO_CPIA is not set
|
# CONFIG_VIDEO_CPIA is not set
|
||||||
# CONFIG_VIDEO_STRADIS is not set
|
# CONFIG_VIDEO_STRADIS is not set
|
||||||
# CONFIG_VIDEO_MXB is not set
|
# CONFIG_VIDEO_MXB is not set
|
||||||
@ -1033,6 +1047,8 @@ CONFIG_SND_RAWMIDI=m
|
|||||||
# CONFIG_SND_SEQUENCER is not set
|
# CONFIG_SND_SEQUENCER is not set
|
||||||
# CONFIG_SND_MIXER_OSS is not set
|
# CONFIG_SND_MIXER_OSS is not set
|
||||||
# CONFIG_SND_PCM_OSS is not set
|
# CONFIG_SND_PCM_OSS is not set
|
||||||
|
# CONFIG_SND_DYNAMIC_MINORS is not set
|
||||||
|
# CONFIG_SND_SUPPORT_OLD_API is not set
|
||||||
# CONFIG_SND_VERBOSE_PRINTK is not set
|
# CONFIG_SND_VERBOSE_PRINTK is not set
|
||||||
# CONFIG_SND_DEBUG is not set
|
# CONFIG_SND_DEBUG is not set
|
||||||
|
|
||||||
@ -1047,6 +1063,7 @@ CONFIG_SND_RAWMIDI=m
|
|||||||
#
|
#
|
||||||
# PCI devices
|
# PCI devices
|
||||||
#
|
#
|
||||||
|
# CONFIG_SND_AD1889 is not set
|
||||||
# CONFIG_SND_ALI5451 is not set
|
# CONFIG_SND_ALI5451 is not set
|
||||||
# CONFIG_SND_ATIIXP is not set
|
# CONFIG_SND_ATIIXP is not set
|
||||||
# CONFIG_SND_ATIIXP_MODEM is not set
|
# CONFIG_SND_ATIIXP_MODEM is not set
|
||||||
@ -1055,38 +1072,38 @@ CONFIG_SND_RAWMIDI=m
|
|||||||
# CONFIG_SND_AU8830 is not set
|
# CONFIG_SND_AU8830 is not set
|
||||||
# CONFIG_SND_AZT3328 is not set
|
# CONFIG_SND_AZT3328 is not set
|
||||||
# CONFIG_SND_BT87X is not set
|
# CONFIG_SND_BT87X is not set
|
||||||
# CONFIG_SND_CS46XX is not set
|
# CONFIG_SND_CA0106 is not set
|
||||||
|
# CONFIG_SND_CMIPCI is not set
|
||||||
# CONFIG_SND_CS4281 is not set
|
# CONFIG_SND_CS4281 is not set
|
||||||
|
# CONFIG_SND_CS46XX is not set
|
||||||
# CONFIG_SND_EMU10K1 is not set
|
# CONFIG_SND_EMU10K1 is not set
|
||||||
# CONFIG_SND_EMU10K1X is not set
|
# CONFIG_SND_EMU10K1X is not set
|
||||||
# CONFIG_SND_CA0106 is not set
|
|
||||||
# CONFIG_SND_KORG1212 is not set
|
|
||||||
# CONFIG_SND_MIXART is not set
|
|
||||||
# CONFIG_SND_NM256 is not set
|
|
||||||
# CONFIG_SND_RME32 is not set
|
|
||||||
# CONFIG_SND_RME96 is not set
|
|
||||||
# CONFIG_SND_RME9652 is not set
|
|
||||||
# CONFIG_SND_HDSP is not set
|
|
||||||
# CONFIG_SND_HDSPM is not set
|
|
||||||
# CONFIG_SND_TRIDENT is not set
|
|
||||||
# CONFIG_SND_YMFPCI is not set
|
|
||||||
# CONFIG_SND_AD1889 is not set
|
|
||||||
# CONFIG_SND_CMIPCI is not set
|
|
||||||
# CONFIG_SND_ENS1370 is not set
|
# CONFIG_SND_ENS1370 is not set
|
||||||
# CONFIG_SND_ENS1371 is not set
|
# CONFIG_SND_ENS1371 is not set
|
||||||
# CONFIG_SND_ES1938 is not set
|
# CONFIG_SND_ES1938 is not set
|
||||||
# CONFIG_SND_ES1968 is not set
|
# CONFIG_SND_ES1968 is not set
|
||||||
# CONFIG_SND_MAESTRO3 is not set
|
|
||||||
# CONFIG_SND_FM801 is not set
|
# CONFIG_SND_FM801 is not set
|
||||||
|
# CONFIG_SND_HDA_INTEL is not set
|
||||||
|
# CONFIG_SND_HDSP is not set
|
||||||
|
# CONFIG_SND_HDSPM is not set
|
||||||
# CONFIG_SND_ICE1712 is not set
|
# CONFIG_SND_ICE1712 is not set
|
||||||
# CONFIG_SND_ICE1724 is not set
|
# CONFIG_SND_ICE1724 is not set
|
||||||
# CONFIG_SND_INTEL8X0 is not set
|
# CONFIG_SND_INTEL8X0 is not set
|
||||||
# CONFIG_SND_INTEL8X0M is not set
|
# CONFIG_SND_INTEL8X0M is not set
|
||||||
|
# CONFIG_SND_KORG1212 is not set
|
||||||
|
# CONFIG_SND_MAESTRO3 is not set
|
||||||
|
# CONFIG_SND_MIXART is not set
|
||||||
|
# CONFIG_SND_NM256 is not set
|
||||||
|
# CONFIG_SND_PCXHR is not set
|
||||||
|
# CONFIG_SND_RME32 is not set
|
||||||
|
# CONFIG_SND_RME96 is not set
|
||||||
|
# CONFIG_SND_RME9652 is not set
|
||||||
# CONFIG_SND_SONICVIBES is not set
|
# CONFIG_SND_SONICVIBES is not set
|
||||||
|
# CONFIG_SND_TRIDENT is not set
|
||||||
# CONFIG_SND_VIA82XX is not set
|
# CONFIG_SND_VIA82XX is not set
|
||||||
# CONFIG_SND_VIA82XX_MODEM is not set
|
# CONFIG_SND_VIA82XX_MODEM is not set
|
||||||
# CONFIG_SND_VX222 is not set
|
# CONFIG_SND_VX222 is not set
|
||||||
# CONFIG_SND_HDA_INTEL is not set
|
# CONFIG_SND_YMFPCI is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# ALSA MIPS devices
|
# ALSA MIPS devices
|
||||||
@ -1154,6 +1171,8 @@ CONFIG_USB_STORAGE=m
|
|||||||
# CONFIG_USB_STORAGE_SDDR09 is not set
|
# CONFIG_USB_STORAGE_SDDR09 is not set
|
||||||
# CONFIG_USB_STORAGE_SDDR55 is not set
|
# CONFIG_USB_STORAGE_SDDR55 is not set
|
||||||
# CONFIG_USB_STORAGE_JUMPSHOT is not set
|
# CONFIG_USB_STORAGE_JUMPSHOT is not set
|
||||||
|
# CONFIG_USB_STORAGE_ALAUDA is not set
|
||||||
|
# CONFIG_USB_LIBUSUAL is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# USB Input Devices
|
# USB Input Devices
|
||||||
@ -1176,6 +1195,7 @@ CONFIG_USB_STORAGE=m
|
|||||||
# CONFIG_USB_YEALINK is not set
|
# CONFIG_USB_YEALINK is not set
|
||||||
# CONFIG_USB_XPAD is not set
|
# CONFIG_USB_XPAD is not set
|
||||||
# CONFIG_USB_ATI_REMOTE is not set
|
# CONFIG_USB_ATI_REMOTE is not set
|
||||||
|
# CONFIG_USB_ATI_REMOTE2 is not set
|
||||||
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
||||||
# CONFIG_USB_APPLETOUCH is not set
|
# CONFIG_USB_APPLETOUCH is not set
|
||||||
|
|
||||||
@ -1191,6 +1211,7 @@ CONFIG_USB_STORAGE=m
|
|||||||
# CONFIG_USB_DABUSB is not set
|
# CONFIG_USB_DABUSB is not set
|
||||||
# CONFIG_USB_VICAM is not set
|
# CONFIG_USB_VICAM is not set
|
||||||
# CONFIG_USB_DSBR is not set
|
# CONFIG_USB_DSBR is not set
|
||||||
|
# CONFIG_USB_ET61X251 is not set
|
||||||
# CONFIG_USB_IBMCAM is not set
|
# CONFIG_USB_IBMCAM is not set
|
||||||
# CONFIG_USB_KONICAWC is not set
|
# CONFIG_USB_KONICAWC is not set
|
||||||
# CONFIG_USB_OV511 is not set
|
# CONFIG_USB_OV511 is not set
|
||||||
@ -1257,7 +1278,7 @@ CONFIG_USB_MON=y
|
|||||||
# CONFIG_INFINIBAND is not set
|
# CONFIG_INFINIBAND is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# SN Devices
|
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
|
||||||
#
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1281,6 +1302,7 @@ CONFIG_JFS_FS=m
|
|||||||
# CONFIG_JFS_STATISTICS is not set
|
# CONFIG_JFS_STATISTICS is not set
|
||||||
# CONFIG_FS_POSIX_ACL is not set
|
# CONFIG_FS_POSIX_ACL is not set
|
||||||
# CONFIG_XFS_FS is not set
|
# CONFIG_XFS_FS is not set
|
||||||
|
# CONFIG_OCFS2_FS is not set
|
||||||
CONFIG_MINIX_FS=m
|
CONFIG_MINIX_FS=m
|
||||||
# CONFIG_ROMFS_FS is not set
|
# CONFIG_ROMFS_FS is not set
|
||||||
# CONFIG_INOTIFY is not set
|
# CONFIG_INOTIFY is not set
|
||||||
@ -1319,6 +1341,7 @@ CONFIG_TMPFS=y
|
|||||||
# CONFIG_HUGETLB_PAGE is not set
|
# CONFIG_HUGETLB_PAGE is not set
|
||||||
CONFIG_RAMFS=y
|
CONFIG_RAMFS=y
|
||||||
# CONFIG_RELAYFS_FS is not set
|
# CONFIG_RELAYFS_FS is not set
|
||||||
|
# CONFIG_CONFIGFS_FS is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Miscellaneous filesystems
|
# Miscellaneous filesystems
|
||||||
@ -1377,6 +1400,7 @@ CONFIG_MSDOS_PARTITION=y
|
|||||||
# CONFIG_SGI_PARTITION is not set
|
# CONFIG_SGI_PARTITION is not set
|
||||||
# CONFIG_ULTRIX_PARTITION is not set
|
# CONFIG_ULTRIX_PARTITION is not set
|
||||||
# CONFIG_SUN_PARTITION is not set
|
# CONFIG_SUN_PARTITION is not set
|
||||||
|
# CONFIG_KARMA_PARTITION is not set
|
||||||
# CONFIG_EFI_PARTITION is not set
|
# CONFIG_EFI_PARTITION is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1432,6 +1456,7 @@ CONFIG_NLS_UTF8=m
|
|||||||
# Kernel hacking
|
# Kernel hacking
|
||||||
#
|
#
|
||||||
# CONFIG_PRINTK_TIME is not set
|
# CONFIG_PRINTK_TIME is not set
|
||||||
|
# CONFIG_MAGIC_SYSRQ is not set
|
||||||
# CONFIG_DEBUG_KERNEL is not set
|
# CONFIG_DEBUG_KERNEL is not set
|
||||||
CONFIG_LOG_BUF_SHIFT=14
|
CONFIG_LOG_BUF_SHIFT=14
|
||||||
CONFIG_CROSSCOMPILE=y
|
CONFIG_CROSSCOMPILE=y
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
diff -Nur linux-2.6.15/arch/mips/aruba/Makefile linux-2.6.15-openwrt/arch/mips/aruba/Makefile
|
diff -Nur linux-2.6.16/arch/mips/aruba/Makefile linux-2.6.16-owrt/arch/mips/aruba/Makefile
|
||||||
--- linux-2.6.15/arch/mips/aruba/Makefile 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/aruba/Makefile 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/aruba/Makefile 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/aruba/Makefile 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,49 @@
|
@@ -0,0 +1,49 @@
|
||||||
+###############################################################################
|
+###############################################################################
|
||||||
+#
|
+#
|
||||||
@ -51,9 +51,9 @@ diff -Nur linux-2.6.15/arch/mips/aruba/Makefile linux-2.6.15-openwrt/arch/mips/a
|
|||||||
+subdir-y += nvram
|
+subdir-y += nvram
|
||||||
+obj-y += nvram/built-in.o
|
+obj-y += nvram/built-in.o
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/arch/mips/aruba/nvram/Makefile linux-2.6.15-openwrt/arch/mips/aruba/nvram/Makefile
|
diff -Nur linux-2.6.16/arch/mips/aruba/nvram/Makefile linux-2.6.16-owrt/arch/mips/aruba/nvram/Makefile
|
||||||
--- linux-2.6.15/arch/mips/aruba/nvram/Makefile 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/aruba/nvram/Makefile 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/aruba/nvram/Makefile 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/aruba/nvram/Makefile 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,46 @@
|
@@ -0,0 +1,46 @@
|
||||||
+###############################################################################
|
+###############################################################################
|
||||||
+#
|
+#
|
||||||
@ -101,9 +101,9 @@ diff -Nur linux-2.6.15/arch/mips/aruba/nvram/Makefile linux-2.6.15-openwrt/arch/
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/arch/mips/aruba/nvram/nvram434.c linux-2.6.15-openwrt/arch/mips/aruba/nvram/nvram434.c
|
diff -Nur linux-2.6.16/arch/mips/aruba/nvram/nvram434.c linux-2.6.16-owrt/arch/mips/aruba/nvram/nvram434.c
|
||||||
--- linux-2.6.15/arch/mips/aruba/nvram/nvram434.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/aruba/nvram/nvram434.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/aruba/nvram/nvram434.c 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/aruba/nvram/nvram434.c 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,392 @@
|
@@ -0,0 +1,392 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -497,9 +497,9 @@ diff -Nur linux-2.6.15/arch/mips/aruba/nvram/nvram434.c linux-2.6.15-openwrt/arc
|
|||||||
+{
|
+{
|
||||||
+ nvram_mapenv(func);
|
+ nvram_mapenv(func);
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.15/arch/mips/aruba/nvram/nvram434.h linux-2.6.15-openwrt/arch/mips/aruba/nvram/nvram434.h
|
diff -Nur linux-2.6.16/arch/mips/aruba/nvram/nvram434.h linux-2.6.16-owrt/arch/mips/aruba/nvram/nvram434.h
|
||||||
--- linux-2.6.15/arch/mips/aruba/nvram/nvram434.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/aruba/nvram/nvram434.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/aruba/nvram/nvram434.h 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/aruba/nvram/nvram434.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,66 @@
|
@@ -0,0 +1,66 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -567,9 +567,9 @@ diff -Nur linux-2.6.15/arch/mips/aruba/nvram/nvram434.h linux-2.6.15-openwrt/arc
|
|||||||
+#endif /* _NVRAM_ */
|
+#endif /* _NVRAM_ */
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/arch/mips/aruba/prom.c linux-2.6.15-openwrt/arch/mips/aruba/prom.c
|
diff -Nur linux-2.6.16/arch/mips/aruba/prom.c linux-2.6.16-owrt/arch/mips/aruba/prom.c
|
||||||
--- linux-2.6.15/arch/mips/aruba/prom.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/aruba/prom.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/aruba/prom.c 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/aruba/prom.c 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,111 @@
|
@@ -0,0 +1,111 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -682,9 +682,9 @@ diff -Nur linux-2.6.15/arch/mips/aruba/prom.c linux-2.6.15-openwrt/arch/mips/aru
|
|||||||
+{
|
+{
|
||||||
+ printk("stubbed prom_free_prom_memory()\n");
|
+ printk("stubbed prom_free_prom_memory()\n");
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.15/arch/mips/aruba/serial.c linux-2.6.15-openwrt/arch/mips/aruba/serial.c
|
diff -Nur linux-2.6.16/arch/mips/aruba/serial.c linux-2.6.16-owrt/arch/mips/aruba/serial.c
|
||||||
--- linux-2.6.15/arch/mips/aruba/serial.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/aruba/serial.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/aruba/serial.c 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/aruba/serial.c 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,94 @@
|
@@ -0,0 +1,94 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -780,10 +780,10 @@ diff -Nur linux-2.6.15/arch/mips/aruba/serial.c linux-2.6.15-openwrt/arch/mips/a
|
|||||||
+
|
+
|
||||||
+ return(0);
|
+ return(0);
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.15/arch/mips/aruba/setup.c linux-2.6.15-openwrt/arch/mips/aruba/setup.c
|
diff -Nur linux-2.6.16/arch/mips/aruba/setup.c linux-2.6.16-owrt/arch/mips/aruba/setup.c
|
||||||
--- linux-2.6.15/arch/mips/aruba/setup.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/aruba/setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/aruba/setup.c 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/aruba/setup.c 2006-03-20 14:30:00.000000000 +0100
|
||||||
@@ -0,0 +1,124 @@
|
@@ -0,0 +1,125 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
+ * BRIEF MODULE DESCRIPTION
|
+ * BRIEF MODULE DESCRIPTION
|
||||||
@ -834,6 +834,7 @@ diff -Nur linux-2.6.15/arch/mips/aruba/setup.c linux-2.6.15-openwrt/arch/mips/ar
|
|||||||
+#include <asm/reboot.h>
|
+#include <asm/reboot.h>
|
||||||
+#include <asm/addrspace.h> /* for KSEG1ADDR() */
|
+#include <asm/addrspace.h> /* for KSEG1ADDR() */
|
||||||
+#include <asm/idt-boards/rc32434/rc32434.h>
|
+#include <asm/idt-boards/rc32434/rc32434.h>
|
||||||
|
+#include <linux/pm.h>
|
||||||
+
|
+
|
||||||
+extern char *__init prom_getcmdline(void);
|
+extern char *__init prom_getcmdline(void);
|
||||||
+
|
+
|
||||||
@ -881,7 +882,7 @@ diff -Nur linux-2.6.15/arch/mips/aruba/setup.c linux-2.6.15-openwrt/arch/mips/ar
|
|||||||
+
|
+
|
||||||
+ _machine_restart = aruba_machine_restart;
|
+ _machine_restart = aruba_machine_restart;
|
||||||
+ _machine_halt = aruba_machine_halt;
|
+ _machine_halt = aruba_machine_halt;
|
||||||
+ _machine_power_off = aruba_machine_halt;
|
+ pm_power_off = aruba_machine_halt;
|
||||||
+
|
+
|
||||||
+ set_io_port_base(KSEG1);
|
+ set_io_port_base(KSEG1);
|
||||||
+
|
+
|
||||||
@ -908,9 +909,9 @@ diff -Nur linux-2.6.15/arch/mips/aruba/setup.c linux-2.6.15-openwrt/arch/mips/ar
|
|||||||
+{
|
+{
|
||||||
+ return "MIPS IDT32434 - ARUBA";
|
+ return "MIPS IDT32434 - ARUBA";
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.15/arch/mips/aruba/time.c linux-2.6.15-openwrt/arch/mips/aruba/time.c
|
diff -Nur linux-2.6.16/arch/mips/aruba/time.c linux-2.6.16-owrt/arch/mips/aruba/time.c
|
||||||
--- linux-2.6.15/arch/mips/aruba/time.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/aruba/time.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/aruba/time.c 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/aruba/time.c 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,108 @@
|
@@ -0,0 +1,108 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -1020,9 +1021,9 @@ diff -Nur linux-2.6.15/arch/mips/aruba/time.c linux-2.6.15-openwrt/arch/mips/aru
|
|||||||
+ timer_interrupt(irq, NULL, regs);
|
+ timer_interrupt(irq, NULL, regs);
|
||||||
+ irq_exit();
|
+ irq_exit();
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.15/arch/mips/aruba/wdt_merlot.c linux-2.6.15-openwrt/arch/mips/aruba/wdt_merlot.c
|
diff -Nur linux-2.6.16/arch/mips/aruba/wdt_merlot.c linux-2.6.16-owrt/arch/mips/aruba/wdt_merlot.c
|
||||||
--- linux-2.6.15/arch/mips/aruba/wdt_merlot.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/aruba/wdt_merlot.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/aruba/wdt_merlot.c 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/aruba/wdt_merlot.c 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,30 @@
|
@@ -0,0 +1,30 @@
|
||||||
+#include <linux/config.h>
|
+#include <linux/config.h>
|
||||||
+#include <linux/kernel.h>
|
+#include <linux/kernel.h>
|
||||||
@ -1054,9 +1055,9 @@ diff -Nur linux-2.6.15/arch/mips/aruba/wdt_merlot.c linux-2.6.15-openwrt/arch/mi
|
|||||||
+ break;
|
+ break;
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.15/arch/mips/Kconfig linux-2.6.15-openwrt/arch/mips/Kconfig
|
diff -Nur linux-2.6.16/arch/mips/Kconfig linux-2.6.16-owrt/arch/mips/Kconfig
|
||||||
--- linux-2.6.15/arch/mips/Kconfig 2006-01-03 04:21:10.000000000 +0100
|
--- linux-2.6.16/arch/mips/Kconfig 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/Kconfig 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/Kconfig 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -227,6 +227,17 @@
|
@@ -227,6 +227,17 @@
|
||||||
either a NEC Vr5432 or QED RM5231. Say Y here if you wish to build
|
either a NEC Vr5432 or QED RM5231. Say Y here if you wish to build
|
||||||
a kernel for this platform.
|
a kernel for this platform.
|
||||||
@ -1075,10 +1076,10 @@ diff -Nur linux-2.6.15/arch/mips/Kconfig linux-2.6.15-openwrt/arch/mips/Kconfig
|
|||||||
config MACH_JAZZ
|
config MACH_JAZZ
|
||||||
bool "Support for the Jazz family of machines"
|
bool "Support for the Jazz family of machines"
|
||||||
select ARC
|
select ARC
|
||||||
diff -Nur linux-2.6.15/arch/mips/Makefile linux-2.6.15-openwrt/arch/mips/Makefile
|
diff -Nur linux-2.6.16/arch/mips/Makefile linux-2.6.16-owrt/arch/mips/Makefile
|
||||||
--- linux-2.6.15/arch/mips/Makefile 2006-01-03 04:21:10.000000000 +0100
|
--- linux-2.6.16/arch/mips/Makefile 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/Makefile 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/Makefile 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -258,6 +258,14 @@
|
@@ -279,6 +279,14 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1093,9 +1094,9 @@ diff -Nur linux-2.6.15/arch/mips/Makefile linux-2.6.15-openwrt/arch/mips/Makefil
|
|||||||
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
|
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
|
||||||
#
|
#
|
||||||
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
|
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
|
||||||
diff -Nur linux-2.6.15/arch/mips/mm/tlbex.c linux-2.6.15-openwrt/arch/mips/mm/tlbex.c
|
diff -Nur linux-2.6.16/arch/mips/mm/tlbex.c linux-2.6.16-owrt/arch/mips/mm/tlbex.c
|
||||||
--- linux-2.6.15/arch/mips/mm/tlbex.c 2006-01-03 04:21:10.000000000 +0100
|
--- linux-2.6.16/arch/mips/mm/tlbex.c 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/arch/mips/mm/tlbex.c 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/mm/tlbex.c 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -852,7 +852,6 @@
|
@@ -852,7 +852,6 @@
|
||||||
|
|
||||||
case CPU_R10000:
|
case CPU_R10000:
|
||||||
@ -1112,10 +1113,10 @@ diff -Nur linux-2.6.15/arch/mips/mm/tlbex.c linux-2.6.15-openwrt/arch/mips/mm/tl
|
|||||||
case CPU_4KEC:
|
case CPU_4KEC:
|
||||||
case CPU_24K:
|
case CPU_24K:
|
||||||
case CPU_34K:
|
case CPU_34K:
|
||||||
diff -Nur linux-2.6.15/drivers/net/Kconfig linux-2.6.15-openwrt/drivers/net/Kconfig
|
diff -Nur linux-2.6.16/drivers/net/Kconfig linux-2.6.16-owrt/drivers/net/Kconfig
|
||||||
--- linux-2.6.15/drivers/net/Kconfig 2006-01-03 04:21:10.000000000 +0100
|
--- linux-2.6.16/drivers/net/Kconfig 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/drivers/net/Kconfig 2006-01-10 00:32:32.000000000 +0100
|
+++ linux-2.6.16-owrt/drivers/net/Kconfig 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -176,6 +176,13 @@
|
@@ -187,6 +187,13 @@
|
||||||
|
|
||||||
source "drivers/net/arm/Kconfig"
|
source "drivers/net/arm/Kconfig"
|
||||||
|
|
||||||
@ -1129,20 +1130,101 @@ diff -Nur linux-2.6.15/drivers/net/Kconfig linux-2.6.15-openwrt/drivers/net/Kcon
|
|||||||
config MACE
|
config MACE
|
||||||
tristate "MACE (Power Mac ethernet) support"
|
tristate "MACE (Power Mac ethernet) support"
|
||||||
depends on NET_ETHERNET && PPC_PMAC && PPC32
|
depends on NET_ETHERNET && PPC_PMAC && PPC32
|
||||||
diff -Nur linux-2.6.15/drivers/net/Makefile linux-2.6.15-openwrt/drivers/net/Makefile
|
diff -Nur linux-2.6.16/drivers/net/Makefile linux-2.6.16-owrt/drivers/net/Makefile
|
||||||
--- linux-2.6.15/drivers/net/Makefile 2006-01-03 04:21:10.000000000 +0100
|
--- linux-2.6.16/drivers/net/Makefile 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/drivers/net/Makefile 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/drivers/net/Makefile 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -190,6 +190,7 @@
|
@@ -38,6 +38,7 @@
|
||||||
obj-$(CONFIG_SMC91X) += smc91x.o
|
|
||||||
obj-$(CONFIG_DM9000) += dm9000.o
|
|
||||||
obj-$(CONFIG_FEC_8XX) += fec_8xx/
|
|
||||||
+obj-$(CONFIG_IDT_RC32434_ETH) += rc32434_eth.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_ARM) += arm/
|
obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
|
||||||
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
|
|
||||||
diff -Nur linux-2.6.15/drivers/net/rc32434_eth.c linux-2.6.15-openwrt/drivers/net/rc32434_eth.c
|
+obj-$(CONFIG_IDT_RC32434_ETH) += rc32434_eth.o
|
||||||
--- linux-2.6.15/drivers/net/rc32434_eth.c 1970-01-01 01:00:00.000000000 +0100
|
obj-$(CONFIG_DGRS) += dgrs.o
|
||||||
+++ linux-2.6.15-openwrt/drivers/net/rc32434_eth.c 2006-01-10 00:32:33.000000000 +0100
|
obj-$(CONFIG_VORTEX) += 3c59x.o
|
||||||
|
obj-$(CONFIG_TYPHOON) += typhoon.o
|
||||||
|
diff -Nur linux-2.6.16/drivers/net/natsemi.c linux-2.6.16-owrt/drivers/net/natsemi.c
|
||||||
|
--- linux-2.6.16/drivers/net/natsemi.c 2006-03-20 06:53:29.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/drivers/net/natsemi.c 2006-03-20 14:25:10.000000000 +0100
|
||||||
|
@@ -771,6 +771,49 @@
|
||||||
|
static int netdev_get_eeprom(struct net_device *dev, u8 *buf);
|
||||||
|
static struct ethtool_ops ethtool_ops;
|
||||||
|
|
||||||
|
+#ifdef CONFIG_MACH_ARUBA
|
||||||
|
+
|
||||||
|
+#include <linux/ctype.h>
|
||||||
|
+
|
||||||
|
+#ifndef ERR
|
||||||
|
+#define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+static int parse_mac_addr(struct net_device *dev, char* macstr)
|
||||||
|
+{
|
||||||
|
+ int i, j;
|
||||||
|
+ unsigned char result, value;
|
||||||
|
+
|
||||||
|
+ for (i=0; i<6; i++) {
|
||||||
|
+ result = 0;
|
||||||
|
+ if (i != 5 && *(macstr+2) != ':') {
|
||||||
|
+ ERR("invalid mac address format: %d %c\n",
|
||||||
|
+ i, *(macstr+2));
|
||||||
|
+ return -EINVAL;
|
||||||
|
+ }
|
||||||
|
+ for (j=0; j<2; j++) {
|
||||||
|
+ if (isxdigit(*macstr) && (value = isdigit(*macstr) ? *macstr-'0' :
|
||||||
|
+ toupper(*macstr)-'A'+10) < 16) {
|
||||||
|
+ result = result*16 + value;
|
||||||
|
+ macstr++;
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ ERR("invalid mac address "
|
||||||
|
+ "character: %c\n", *macstr);
|
||||||
|
+ return -EINVAL;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ macstr++;
|
||||||
|
+ dev->dev_addr[i] = result;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ dev->dev_addr[5]++;
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
static inline void __iomem *ns_ioaddr(struct net_device *dev)
|
||||||
|
{
|
||||||
|
return (void __iomem *) dev->base_addr;
|
||||||
|
@@ -859,6 +902,7 @@
|
||||||
|
goto err_ioremap;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef CONFIG_MACH_ARUBA
|
||||||
|
/* Work around the dropped serial bit. */
|
||||||
|
prev_eedata = eeprom_read(ioaddr, 6);
|
||||||
|
for (i = 0; i < 3; i++) {
|
||||||
|
@@ -867,6 +911,19 @@
|
||||||
|
dev->dev_addr[i*2+1] = eedata >> 7;
|
||||||
|
prev_eedata = eedata;
|
||||||
|
}
|
||||||
|
+#else
|
||||||
|
+ {
|
||||||
|
+ char mac[32];
|
||||||
|
+ unsigned char def_mac[6] = {00, 0x0b, 0x86, 0xba, 0xdb, 0xad};
|
||||||
|
+ extern char *getenv(char *e);
|
||||||
|
+ memset(mac, 0, 32);
|
||||||
|
+ memcpy(mac, getenv("ethaddr"), 17);
|
||||||
|
+ if (parse_mac_addr(dev, mac)){
|
||||||
|
+ printk("%s: MAC address not found\n", __func__);
|
||||||
|
+ memcpy(dev->dev_addr, def_mac, 6);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
dev->base_addr = (unsigned long __force) ioaddr;
|
||||||
|
dev->irq = irq;
|
||||||
|
diff -Nur linux-2.6.16/drivers/net/rc32434_eth.c linux-2.6.16-owrt/drivers/net/rc32434_eth.c
|
||||||
|
--- linux-2.6.16/drivers/net/rc32434_eth.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/drivers/net/rc32434_eth.c 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,1268 @@
|
@@ -0,0 +1,1268 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -2412,9 +2494,9 @@ diff -Nur linux-2.6.15/drivers/net/rc32434_eth.c linux-2.6.15-openwrt/drivers/ne
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/drivers/net/rc32434_eth.h linux-2.6.15-openwrt/drivers/net/rc32434_eth.h
|
diff -Nur linux-2.6.16/drivers/net/rc32434_eth.h linux-2.6.16-owrt/drivers/net/rc32434_eth.h
|
||||||
--- linux-2.6.15/drivers/net/rc32434_eth.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/drivers/net/rc32434_eth.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/drivers/net/rc32434_eth.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/drivers/net/rc32434_eth.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,187 @@
|
@@ -0,0 +1,187 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -2603,9 +2685,9 @@ diff -Nur linux-2.6.15/drivers/net/rc32434_eth.h linux-2.6.15-openwrt/drivers/ne
|
|||||||
+ rc32434_writel(0, &ch->dmadptr);
|
+ rc32434_writel(0, &ch->dmadptr);
|
||||||
+ rc32434_writel(0, &ch->dmandptr);
|
+ rc32434_writel(0, &ch->dmandptr);
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/bootinfo.h linux-2.6.15-openwrt/include/asm-mips/bootinfo.h
|
diff -Nur linux-2.6.16/include/asm-mips/bootinfo.h linux-2.6.16-owrt/include/asm-mips/bootinfo.h
|
||||||
--- linux-2.6.15/include/asm-mips/bootinfo.h 2006-01-03 04:21:10.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/bootinfo.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/bootinfo.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/bootinfo.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -218,6 +218,17 @@
|
@@ -218,6 +218,17 @@
|
||||||
#define MACH_GROUP_TITAN 22 /* PMC-Sierra Titan */
|
#define MACH_GROUP_TITAN 22 /* PMC-Sierra Titan */
|
||||||
#define MACH_TITAN_YOSEMITE 1 /* PMC-Sierra Yosemite */
|
#define MACH_TITAN_YOSEMITE 1 /* PMC-Sierra Yosemite */
|
||||||
@ -2624,9 +2706,9 @@ diff -Nur linux-2.6.15/include/asm-mips/bootinfo.h linux-2.6.15-openwrt/include/
|
|||||||
#define CL_SIZE COMMAND_LINE_SIZE
|
#define CL_SIZE COMMAND_LINE_SIZE
|
||||||
|
|
||||||
const char *get_system_type(void);
|
const char *get_system_type(void);
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/cpu.h linux-2.6.15-openwrt/include/asm-mips/cpu.h
|
diff -Nur linux-2.6.16/include/asm-mips/cpu.h linux-2.6.16-owrt/include/asm-mips/cpu.h
|
||||||
--- linux-2.6.15/include/asm-mips/cpu.h 2006-01-03 04:21:10.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/cpu.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/cpu.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/cpu.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -53,6 +53,9 @@
|
@@ -53,6 +53,9 @@
|
||||||
#define PRID_IMP_R12000 0x0e00
|
#define PRID_IMP_R12000 0x0e00
|
||||||
#define PRID_IMP_R8000 0x1000
|
#define PRID_IMP_R8000 0x1000
|
||||||
@ -2647,9 +2729,9 @@ diff -Nur linux-2.6.15/include/asm-mips/cpu.h linux-2.6.15-openwrt/include/asm-m
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* ISA Level encodings
|
* ISA Level encodings
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32300.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32300.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32300.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32300.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32300.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32300.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32300.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32300.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,142 @@
|
@@ -0,0 +1,142 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -2793,9 +2875,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32300.h linux-2.6.1
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#endif // __IDT_RC32300_H__
|
+#endif // __IDT_RC32300_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32334.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32334.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32334.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32334.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32334.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32334.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32334.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32334.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,207 @@
|
@@ -0,0 +1,207 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -3004,9 +3086,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32334.h linux-2.6.1
|
|||||||
+#define RAM_SIZE (32*1024*1024)
|
+#define RAM_SIZE (32*1024*1024)
|
||||||
+
|
+
|
||||||
+#endif // __IDT_RC32334_H__
|
+#endif // __IDT_RC32334_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32355_dma.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32355_dma.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32355_dma.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32355_dma.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32355_dma.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32355_dma.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32355_dma.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32355_dma.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,206 @@
|
@@ -0,0 +1,206 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -3214,9 +3296,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32355_dma.h linux-2
|
|||||||
+ ((count) & DMADESC_COUNT_MASK)
|
+ ((count) & DMADESC_COUNT_MASK)
|
||||||
+
|
+
|
||||||
+#endif /* RC32355_DMA_H */
|
+#endif /* RC32355_DMA_H */
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32355_eth.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32355_eth.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32355_eth.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32355_eth.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32355_eth.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32355_eth.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32355_eth.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32355_eth.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,442 @@
|
@@ -0,0 +1,442 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -3660,9 +3742,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32355_eth.h linux-2
|
|||||||
+
|
+
|
||||||
+#endif /* RC32355_ETHER_H */
|
+#endif /* RC32355_ETHER_H */
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32355.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32355.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32355.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32355.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32355.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32355.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32355.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32355.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,177 @@
|
@@ -0,0 +1,177 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -3841,9 +3923,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32355.h linux-2.6.1
|
|||||||
+#define NVRAM_ENVSTART_OFF 32
|
+#define NVRAM_ENVSTART_OFF 32
|
||||||
+
|
+
|
||||||
+#endif /* _RC32355_H_ */
|
+#endif /* _RC32355_H_ */
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_dma.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_dma.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_dma.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_dma.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_dma.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_dma.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_dma.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_dma.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,226 @@
|
@@ -0,0 +1,226 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -4071,9 +4153,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_dma.h linux-2
|
|||||||
+#endif // aws - Compatibility.
|
+#endif // aws - Compatibility.
|
||||||
+
|
+
|
||||||
+#endif // __IDT_RC32365_DMA_H__
|
+#endif // __IDT_RC32365_DMA_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_dma_v.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_dma_v.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_dma_v.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_dma_v.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_dma_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_dma_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_dma_v.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_dma_v.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,86 @@
|
@@ -0,0 +1,86 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -4161,9 +4243,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_dma_v.h linux
|
|||||||
+ local_writel(dma_addr, &ch->dmandptr);
|
+ local_writel(dma_addr, &ch->dmandptr);
|
||||||
+}
|
+}
|
||||||
+#endif //__IDT_RC32365_DMA_V_H__
|
+#endif //__IDT_RC32365_DMA_V_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_eth.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_eth.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_eth.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_eth.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_eth.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_eth.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_eth.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_eth.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,344 @@
|
@@ -0,0 +1,344 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -4509,9 +4591,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_eth.h linux-2
|
|||||||
+ u32 ipabmctx ;
|
+ u32 ipabmctx ;
|
||||||
+}volatile *IPABM_ETH_t;
|
+}volatile *IPABM_ETH_t;
|
||||||
+#endif //__IDT_RC32365_ETH_H__
|
+#endif //__IDT_RC32365_ETH_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_eth_v.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_eth_v.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_eth_v.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_eth_v.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_eth_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_eth_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_eth_v.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_eth_v.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,72 @@
|
@@ -0,0 +1,72 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -4585,9 +4667,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_eth_v.h linux
|
|||||||
+#define RCVPKT_LENGTH(X) (((X) & ETHRX_length_m) >> ETHRX_length_b) /* Length of the received packet */
|
+#define RCVPKT_LENGTH(X) (((X) & ETHRX_length_m) >> ETHRX_length_b) /* Length of the received packet */
|
||||||
+
|
+
|
||||||
+#endif //__IDT_RC32365_ETH_V_H__
|
+#endif //__IDT_RC32365_ETH_V_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_gpio.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_gpio.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_gpio.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_gpio.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_gpio.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_gpio.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_gpio.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_gpio.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,181 @@
|
@@ -0,0 +1,181 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -4770,9 +4852,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_gpio.h linux-
|
|||||||
+} GPIO_DEFS_t;
|
+} GPIO_DEFS_t;
|
||||||
+
|
+
|
||||||
+#endif //__IDT_RC32365_GPIO_H__
|
+#endif //__IDT_RC32365_GPIO_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_gpio_v.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_gpio_v.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_gpio_v.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_gpio_v.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_gpio_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_gpio_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_gpio_v.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_gpio_v.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,91 @@
|
@@ -0,0 +1,91 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -4865,9 +4947,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_gpio_v.h linu
|
|||||||
+
|
+
|
||||||
+#endif //__IDT_RC32365_GPIO_V_H__
|
+#endif //__IDT_RC32365_GPIO_V_H__
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,160 @@
|
@@ -0,0 +1,160 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -5029,9 +5111,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365.h linux-2.6.1
|
|||||||
+#define RAM_SIZE (32 * 1024 * 1024)
|
+#define RAM_SIZE (32 * 1024 * 1024)
|
||||||
+
|
+
|
||||||
+#endif //__IDT_RC32365_H__
|
+#endif //__IDT_RC32365_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_pci.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_pci.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_pci.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_pci.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_pci.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_pci.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_pci.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_pci.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,515 @@
|
@@ -0,0 +1,515 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -5548,9 +5630,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_pci.h linux-2
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+#endif // __IDT_RC32365_PCI_H__
|
+#endif // __IDT_RC32365_PCI_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_pci_v.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_pci_v.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_pci_v.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_pci_v.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_pci_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32300/rc32365_pci_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32300/rc32365_pci_v.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32300/rc32365_pci_v.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,217 @@
|
@@ -0,0 +1,217 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -5769,9 +5851,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32300/rc32365_pci_v.h linux
|
|||||||
+#define PCITC_RTIMER_VAL 0x10
|
+#define PCITC_RTIMER_VAL 0x10
|
||||||
+
|
+
|
||||||
+#endif //__IDT_RC32365_PCI_V_H__
|
+#endif //__IDT_RC32365_PCI_V_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_dma.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_dma.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_dma.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_dma.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_dma.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_dma.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_dma.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_dma.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,205 @@
|
@@ -0,0 +1,205 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -5978,9 +6060,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_dma.h linux-2
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_dma_v.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_dma_v.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_dma_v.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_dma_v.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_dma_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_dma_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_dma_v.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_dma_v.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,89 @@
|
@@ -0,0 +1,89 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -6071,9 +6153,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_dma_v.h linux
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_eth.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_eth.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_eth.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_eth.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_eth.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_eth.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_eth.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_eth.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,333 @@
|
@@ -0,0 +1,333 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -6408,9 +6490,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_eth.h linux-2
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_eth_v.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_eth_v.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_eth_v.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_eth_v.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_eth_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_eth_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_eth_v.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_eth_v.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,77 @@
|
@@ -0,0 +1,77 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -6489,9 +6571,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_eth_v.h linux
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_gpio.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_gpio.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_gpio.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_gpio.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_gpio.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_gpio.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_gpio.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_gpio.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,167 @@
|
@@ -0,0 +1,167 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -6660,9 +6742,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_gpio.h linux-
|
|||||||
+
|
+
|
||||||
+#endif // __IDT_GPIO_H__
|
+#endif // __IDT_GPIO_H__
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,199 @@
|
@@ -0,0 +1,199 @@
|
||||||
+ /**************************************************************************
|
+ /**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -6863,9 +6945,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434.h linux-2.6.1
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_integ.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_integ.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_integ.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_integ.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_integ.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_integ.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_integ.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_integ.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,90 @@
|
@@ -0,0 +1,90 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -6957,9 +7039,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_integ.h linux
|
|||||||
+} ;
|
+} ;
|
||||||
+
|
+
|
||||||
+#endif // __IDT_INTEG_H__
|
+#endif // __IDT_INTEG_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_int.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_int.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_int.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_int.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_int.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_int.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_int.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_int.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,174 @@
|
@@ -0,0 +1,174 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -7135,9 +7217,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_int.h linux-2
|
|||||||
+#endif // __IDT_INT_H__
|
+#endif // __IDT_INT_H__
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_iparb.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_iparb.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_iparb.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_iparb.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_iparb.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_iparb.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_iparb.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_iparb.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,111 @@
|
@@ -0,0 +1,111 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -7250,9 +7332,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_iparb.h linux
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif // __IDT_IPARB_H__
|
+#endif // __IDT_IPARB_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_pci.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_pci.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_pci.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_pci.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_pci.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_pci.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_pci.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_pci.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,695 @@
|
@@ -0,0 +1,695 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -7949,9 +8031,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_pci.h linux-2
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_rst.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_rst.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_rst.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_rst.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_rst.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_rst.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_rst.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_rst.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,119 @@
|
@@ -0,0 +1,119 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -8072,9 +8154,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_rst.h linux-2
|
|||||||
+ BCV_res15_m = 0x00008000,
|
+ BCV_res15_m = 0x00008000,
|
||||||
+} ;
|
+} ;
|
||||||
+#endif // __IDT_RST_H__
|
+#endif // __IDT_RST_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_spi.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_spi.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_spi.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_spi.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_spi.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_spi.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_spi.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_spi.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,120 @@
|
@@ -0,0 +1,120 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -8196,9 +8278,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_spi.h linux-2
|
|||||||
+ SIOD_pci_m = 0x00000008,
|
+ SIOD_pci_m = 0x00000008,
|
||||||
+} ;
|
+} ;
|
||||||
+#endif // __IDT_SPI_H__
|
+#endif // __IDT_SPI_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_timer.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_timer.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_timer.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_timer.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_timer.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_timer.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_timer.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_timer.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,91 @@
|
@@ -0,0 +1,91 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -8291,9 +8373,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_timer.h linux
|
|||||||
+} ;
|
+} ;
|
||||||
+#endif // __IDT_TIM_H__
|
+#endif // __IDT_TIM_H__
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_uart.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_uart.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_uart.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_uart.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_uart.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32434/rc32434_uart.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32434/rc32434_uart.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32434/rc32434_uart.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,189 @@
|
@@ -0,0 +1,189 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -8484,9 +8566,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32434/rc32434_uart.h linux-
|
|||||||
+} ;
|
+} ;
|
||||||
+
|
+
|
||||||
+#endif // __IDT_UART_H__
|
+#endif // __IDT_UART_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_dma.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_dma.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_dma.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_dma.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_dma.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_dma.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_dma.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_dma.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,231 @@
|
@@ -0,0 +1,231 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -8719,9 +8801,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_dma.h linux-2
|
|||||||
+#endif // aws - Compatibility.
|
+#endif // aws - Compatibility.
|
||||||
+
|
+
|
||||||
+#endif //__IDT_RC32438_DMA_H__
|
+#endif //__IDT_RC32438_DMA_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_dma_v.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_dma_v.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_dma_v.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_dma_v.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_dma_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_dma_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_dma_v.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_dma_v.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,82 @@
|
@@ -0,0 +1,82 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -8805,9 +8887,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_dma_v.h linux
|
|||||||
+ rc32438_writel(dma_addr, &ch->dmandptr);
|
+ rc32438_writel(dma_addr, &ch->dmandptr);
|
||||||
+}
|
+}
|
||||||
+#endif //__IDT_RC32438_DMA_V_H__
|
+#endif //__IDT_RC32438_DMA_V_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_eth.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_eth.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_eth.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_eth.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_eth.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_eth.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_eth.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_eth.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,328 @@
|
@@ -0,0 +1,328 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -9137,9 +9219,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_eth.h linux-2
|
|||||||
+ ETHTX_cc_m = 0x001E0000,
|
+ ETHTX_cc_m = 0x001E0000,
|
||||||
+} ;
|
+} ;
|
||||||
+#endif //__IDT_RC32438_ETH_H__
|
+#endif //__IDT_RC32438_ETH_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_eth_v.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_eth_v.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_eth_v.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_eth_v.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_eth_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_eth_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_eth_v.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_eth_v.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,72 @@
|
@@ -0,0 +1,72 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -9213,9 +9295,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_eth_v.h linux
|
|||||||
+#define RCVPKT_LENGTH(X) (((X) & ETHRX_length_m) >> ETHRX_length_b) /* Length of the received packet */
|
+#define RCVPKT_LENGTH(X) (((X) & ETHRX_length_m) >> ETHRX_length_b) /* Length of the received packet */
|
||||||
+
|
+
|
||||||
+#endif //__IDT_RC32438_ETH_V_H__
|
+#endif //__IDT_RC32438_ETH_V_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_gpio.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_gpio.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_gpio.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_gpio.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_gpio.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_gpio.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_gpio.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_gpio.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,257 @@
|
@@ -0,0 +1,257 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -9474,9 +9556,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_gpio.h linux-
|
|||||||
+} GPIO_DEFS_t;
|
+} GPIO_DEFS_t;
|
||||||
+
|
+
|
||||||
+#endif //__IDT_RC32438_GPIO_H__
|
+#endif //__IDT_RC32438_GPIO_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,152 @@
|
@@ -0,0 +1,152 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -9630,9 +9712,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438.h linux-2.6.1
|
|||||||
+ return ret;
|
+ return ret;
|
||||||
+}
|
+}
|
||||||
+#endif //__IDT_RC32438_H__
|
+#endif //__IDT_RC32438_H__
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_pci.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_pci.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_pci.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_pci.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_pci.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_pci.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_pci.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_pci.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,510 @@
|
@@ -0,0 +1,510 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -10144,9 +10226,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_pci.h linux-2
|
|||||||
+ PCIM_db_m = 0x00000004, // inbound or outbound doorbell
|
+ PCIM_db_m = 0x00000004, // inbound or outbound doorbell
|
||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_pci_v.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_pci_v.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_pci_v.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_pci_v.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_pci_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_pci_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_pci_v.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_pci_v.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,190 @@
|
@@ -0,0 +1,190 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -10338,9 +10420,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_pci_v.h linux
|
|||||||
+#define PCITC_DTIMER_VAL 8
|
+#define PCITC_DTIMER_VAL 8
|
||||||
+#define PCITC_RTIMER_VAL 0x10
|
+#define PCITC_RTIMER_VAL 0x10
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_timer.h linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_timer.h
|
diff -Nur linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_timer.h linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_timer.h
|
||||||
--- linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_timer.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/idt-boards/rc32438/rc32438_timer.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/idt-boards/rc32438/rc32438_timer.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/idt-boards/rc32438/rc32438_timer.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -0,0 +1,91 @@
|
@@ -0,0 +1,91 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
@ -10433,9 +10515,9 @@ diff -Nur linux-2.6.15/include/asm-mips/idt-boards/rc32438/rc32438_timer.h linux
|
|||||||
+} ;
|
+} ;
|
||||||
+#endif //__IDT_RC32438_TIM_H__
|
+#endif //__IDT_RC32438_TIM_H__
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.15/include/asm-mips/mach-generic/irq.h linux-2.6.15-openwrt/include/asm-mips/mach-generic/irq.h
|
diff -Nur linux-2.6.16/include/asm-mips/mach-generic/irq.h linux-2.6.16-owrt/include/asm-mips/mach-generic/irq.h
|
||||||
--- linux-2.6.15/include/asm-mips/mach-generic/irq.h 2006-01-03 04:21:10.000000000 +0100
|
--- linux-2.6.16/include/asm-mips/mach-generic/irq.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/asm-mips/mach-generic/irq.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/mach-generic/irq.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -8,6 +8,6 @@
|
@@ -8,6 +8,6 @@
|
||||||
#ifndef __ASM_MACH_GENERIC_IRQ_H
|
#ifndef __ASM_MACH_GENERIC_IRQ_H
|
||||||
#define __ASM_MACH_GENERIC_IRQ_H
|
#define __ASM_MACH_GENERIC_IRQ_H
|
||||||
@ -10444,9 +10526,9 @@ diff -Nur linux-2.6.15/include/asm-mips/mach-generic/irq.h linux-2.6.15-openwrt/
|
|||||||
+#define NR_IRQS 256
|
+#define NR_IRQS 256
|
||||||
|
|
||||||
#endif /* __ASM_MACH_GENERIC_IRQ_H */
|
#endif /* __ASM_MACH_GENERIC_IRQ_H */
|
||||||
diff -Nur linux-2.6.15/include/linux/init.h linux-2.6.15-openwrt/include/linux/init.h
|
diff -Nur linux-2.6.16/include/linux/init.h linux-2.6.16-owrt/include/linux/init.h
|
||||||
--- linux-2.6.15/include/linux/init.h 2006-01-03 04:21:10.000000000 +0100
|
--- linux-2.6.16/include/linux/init.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/linux/init.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/linux/init.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -86,6 +86,8 @@
|
@@ -86,6 +86,8 @@
|
||||||
static initcall_t __initcall_##fn __attribute_used__ \
|
static initcall_t __initcall_##fn __attribute_used__ \
|
||||||
__attribute__((__section__(".initcall" level ".init"))) = fn
|
__attribute__((__section__(".initcall" level ".init"))) = fn
|
||||||
@ -10456,129 +10538,14 @@ diff -Nur linux-2.6.15/include/linux/init.h linux-2.6.15-openwrt/include/linux/i
|
|||||||
#define core_initcall(fn) __define_initcall("1",fn)
|
#define core_initcall(fn) __define_initcall("1",fn)
|
||||||
#define postcore_initcall(fn) __define_initcall("2",fn)
|
#define postcore_initcall(fn) __define_initcall("2",fn)
|
||||||
#define arch_initcall(fn) __define_initcall("3",fn)
|
#define arch_initcall(fn) __define_initcall("3",fn)
|
||||||
diff -Nur linux-2.6.15/include/linux/kernel.h linux-2.6.15-openwrt/include/linux/kernel.h
|
diff -Nur linux-2.6.16/include/linux/kernel.h linux-2.6.16-owrt/include/linux/kernel.h
|
||||||
--- linux-2.6.15/include/linux/kernel.h 2006-01-03 04:21:10.000000000 +0100
|
--- linux-2.6.16/include/linux/kernel.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.15-openwrt/include/linux/kernel.h 2006-01-10 00:32:33.000000000 +0100
|
+++ linux-2.6.16-owrt/include/linux/kernel.h 2006-03-20 14:25:10.000000000 +0100
|
||||||
@@ -307,6 +307,7 @@
|
@@ -324,6 +324,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Force a compilation error if condition is true */
|
/* Force a compilation error if condition is true */
|
||||||
+extern void BUILD_BUG(void);
|
+extern void BUILD_BUG(void);
|
||||||
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
|
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
|
||||||
|
|
||||||
#ifdef CONFIG_SYSCTL
|
/* Trap pasters of __FUNCTION__ at compile-time */
|
||||||
diff -Nur linux-2.6.15/Makefile linux-2.6.15-openwrt/Makefile
|
|
||||||
--- linux-2.6.15/Makefile 2006-01-03 04:21:10.000000000 +0100
|
|
||||||
+++ linux-2.6.15-openwrt/Makefile 2006-01-10 00:32:33.000000000 +0100
|
|
||||||
@@ -166,10 +166,7 @@
|
|
||||||
# then ARCH is assigned, getting whatever value it gets normally, and
|
|
||||||
# SUBARCH is subsequently ignored.
|
|
||||||
|
|
||||||
-SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
|
|
||||||
- -e s/arm.*/arm/ -e s/sa110/arm/ \
|
|
||||||
- -e s/s390x/s390/ -e s/parisc64/parisc/ \
|
|
||||||
- -e s/ppc64/powerpc/ )
|
|
||||||
+SUBARCH := mips
|
|
||||||
|
|
||||||
# Cross compiling and selecting different set of gcc/bin-utils
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
diff -Nur linux-2.6.15/drivers/net/natsemi.c linux-2.6.15-openwrt/drivers/net/natsemi.c
|
|
||||||
--- linux-2.6.15/drivers/net/natsemi.c 2006-01-02 19:21:10.000000000 -0800
|
|
||||||
+++ linux-2.6.15-openwrt/drivers/net/natsemi.c 2006-01-10 07:29:49.581994000 -0800
|
|
||||||
@@ -771,6 +771,49 @@
|
|
||||||
static int netdev_get_eeprom(struct net_device *dev, u8 *buf);
|
|
||||||
static struct ethtool_ops ethtool_ops;
|
|
||||||
|
|
||||||
+#ifdef CONFIG_MACH_ARUBA
|
|
||||||
+
|
|
||||||
+#include <linux/ctype.h>
|
|
||||||
+
|
|
||||||
+#ifndef ERR
|
|
||||||
+#define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+static int parse_mac_addr(struct net_device *dev, char* macstr)
|
|
||||||
+{
|
|
||||||
+ int i, j;
|
|
||||||
+ unsigned char result, value;
|
|
||||||
+
|
|
||||||
+ for (i=0; i<6; i++) {
|
|
||||||
+ result = 0;
|
|
||||||
+ if (i != 5 && *(macstr+2) != ':') {
|
|
||||||
+ ERR("invalid mac address format: %d %c\n",
|
|
||||||
+ i, *(macstr+2));
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+ for (j=0; j<2; j++) {
|
|
||||||
+ if (isxdigit(*macstr) && (value = isdigit(*macstr) ? *macstr-'0' :
|
|
||||||
+ toupper(*macstr)-'A'+10) < 16) {
|
|
||||||
+ result = result*16 + value;
|
|
||||||
+ macstr++;
|
|
||||||
+ }
|
|
||||||
+ else {
|
|
||||||
+ ERR("invalid mac address "
|
|
||||||
+ "character: %c\n", *macstr);
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ macstr++;
|
|
||||||
+ dev->dev_addr[i] = result;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ dev->dev_addr[5]++;
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
static inline void __iomem *ns_ioaddr(struct net_device *dev)
|
|
||||||
{
|
|
||||||
return (void __iomem *) dev->base_addr;
|
|
||||||
@@ -859,6 +902,7 @@
|
|
||||||
goto err_ioremap;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifndef CONFIG_MACH_ARUBA
|
|
||||||
/* Work around the dropped serial bit. */
|
|
||||||
prev_eedata = eeprom_read(ioaddr, 6);
|
|
||||||
for (i = 0; i < 3; i++) {
|
|
||||||
@@ -867,6 +911,19 @@
|
|
||||||
dev->dev_addr[i*2+1] = eedata >> 7;
|
|
||||||
prev_eedata = eedata;
|
|
||||||
}
|
|
||||||
+#else
|
|
||||||
+ {
|
|
||||||
+ char mac[32];
|
|
||||||
+ unsigned char def_mac[6] = {00, 0x0b, 0x86, 0xba, 0xdb, 0xad};
|
|
||||||
+ extern char *getenv(char *e);
|
|
||||||
+ memset(mac, 0, 32);
|
|
||||||
+ memcpy(mac, getenv("ethaddr"), 17);
|
|
||||||
+ if (parse_mac_addr(dev, mac)){
|
|
||||||
+ printk("%s: MAC address not found\n", __func__);
|
|
||||||
+ memcpy(dev->dev_addr, def_mac, 6);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
dev->base_addr = (unsigned long __force) ioaddr;
|
|
||||||
dev->irq = irq;
|
|
||||||
diff -Nur linux-2.6.15/drivers/net/Makefile linux-2.6.15-openwrt/drivers/net/Makefile
|
|
||||||
--- linux-2.6.15/drivers/net/Makefile 2006-01-13 09:19:55.000000000 -0800
|
|
||||||
+++ linux-2.6.15-openwrt/drivers/net/Makefile 2006-01-09 20:44:10.378339000 -0800
|
|
||||||
@@ -35,6 +35,7 @@
|
|
||||||
|
|
||||||
obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
|
|
||||||
|
|
||||||
+obj-$(CONFIG_IDT_RC32434_ETH) += rc32434_eth.o
|
|
||||||
obj-$(CONFIG_DGRS) += dgrs.o
|
|
||||||
obj-$(CONFIG_VORTEX) += 3c59x.o
|
|
||||||
obj-$(CONFIG_TYPHOON) += typhoon.o
|
|
||||||
@@ -190,7 +189,6 @@
|
|
||||||
obj-$(CONFIG_SMC91X) += smc91x.o
|
|
||||||
obj-$(CONFIG_DM9000) += dm9000.o
|
|
||||||
obj-$(CONFIG_FEC_8XX) += fec_8xx/
|
|
||||||
-obj-$(CONFIG_IDT_RC32434_ETH) += rc32434_eth.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_ARM) += arm/
|
|
||||||
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.15.6
|
LINUX_VERSION:=2.6.16
|
||||||
LINUX_RELEASE:=1
|
LINUX_RELEASE:=1
|
||||||
LINUX_KERNEL_MD5SUM:=2ea7c865d6c09a02cbe6ce5fddcd02ca
|
LINUX_KERNEL_MD5SUM:=9a91b2719949ff0856b40bc467fd47be
|
||||||
|
|
||||||
include ../rules.mk
|
include ../rules.mk
|
||||||
include ./config
|
include ./config
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated make config: don't edit
|
# Automatically generated make config: don't edit
|
||||||
# Linux kernel version: 2.6.15
|
# Linux kernel version: 2.6.16
|
||||||
# Mon Jan 16 04:38:41 2006
|
# Tue Mar 21 00:25:31 2006
|
||||||
#
|
#
|
||||||
CONFIG_MIPS=y
|
CONFIG_MIPS=y
|
||||||
|
|
||||||
@ -119,6 +119,7 @@ CONFIG_CPU_HAS_LLSC=y
|
|||||||
CONFIG_CPU_HAS_SYNC=y
|
CONFIG_CPU_HAS_SYNC=y
|
||||||
CONFIG_GENERIC_HARDIRQS=y
|
CONFIG_GENERIC_HARDIRQS=y
|
||||||
CONFIG_GENERIC_IRQ_PROBE=y
|
CONFIG_GENERIC_IRQ_PROBE=y
|
||||||
|
CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
||||||
CONFIG_ARCH_FLATMEM_ENABLE=y
|
CONFIG_ARCH_FLATMEM_ENABLE=y
|
||||||
CONFIG_SELECT_MEMORY_MODEL=y
|
CONFIG_SELECT_MEMORY_MODEL=y
|
||||||
CONFIG_FLATMEM_MANUAL=y
|
CONFIG_FLATMEM_MANUAL=y
|
||||||
@ -136,7 +137,6 @@ CONFIG_PREEMPT_NONE=y
|
|||||||
# Code maturity level options
|
# Code maturity level options
|
||||||
#
|
#
|
||||||
CONFIG_EXPERIMENTAL=y
|
CONFIG_EXPERIMENTAL=y
|
||||||
CONFIG_CLEAN_COMPILE=y
|
|
||||||
CONFIG_BROKEN_ON_SMP=y
|
CONFIG_BROKEN_ON_SMP=y
|
||||||
CONFIG_INIT_ENV_ARG_LIMIT=32
|
CONFIG_INIT_ENV_ARG_LIMIT=32
|
||||||
|
|
||||||
@ -151,15 +151,15 @@ CONFIG_SYSVIPC=y
|
|||||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||||
CONFIG_SYSCTL=y
|
CONFIG_SYSCTL=y
|
||||||
# CONFIG_AUDIT is not set
|
# CONFIG_AUDIT is not set
|
||||||
CONFIG_HOTPLUG=y
|
|
||||||
CONFIG_KOBJECT_UEVENT=y
|
|
||||||
# CONFIG_IKCONFIG is not set
|
# CONFIG_IKCONFIG is not set
|
||||||
CONFIG_INITRAMFS_SOURCE=""
|
CONFIG_INITRAMFS_SOURCE=""
|
||||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||||
CONFIG_EMBEDDED=y
|
CONFIG_EMBEDDED=y
|
||||||
# CONFIG_KALLSYMS is not set
|
# CONFIG_KALLSYMS is not set
|
||||||
|
CONFIG_HOTPLUG=y
|
||||||
CONFIG_PRINTK=y
|
CONFIG_PRINTK=y
|
||||||
CONFIG_BUG=y
|
CONFIG_BUG=y
|
||||||
|
# CONFIG_ELF_CORE is not set
|
||||||
CONFIG_BASE_FULL=y
|
CONFIG_BASE_FULL=y
|
||||||
CONFIG_FUTEX=y
|
CONFIG_FUTEX=y
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -168,8 +168,11 @@ CONFIG_CC_ALIGN_FUNCTIONS=0
|
|||||||
CONFIG_CC_ALIGN_LABELS=0
|
CONFIG_CC_ALIGN_LABELS=0
|
||||||
CONFIG_CC_ALIGN_LOOPS=0
|
CONFIG_CC_ALIGN_LOOPS=0
|
||||||
CONFIG_CC_ALIGN_JUMPS=0
|
CONFIG_CC_ALIGN_JUMPS=0
|
||||||
|
# CONFIG_SLAB is not set
|
||||||
# CONFIG_TINY_SHMEM is not set
|
# CONFIG_TINY_SHMEM is not set
|
||||||
CONFIG_BASE_SMALL=0
|
CONFIG_BASE_SMALL=0
|
||||||
|
CONFIG_SLOB=y
|
||||||
|
CONFIG_OBSOLETE_INTERMODULE=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Loadable module support
|
# Loadable module support
|
||||||
@ -222,6 +225,10 @@ CONFIG_CARDBUS=y
|
|||||||
# PC-card bridges
|
# PC-card bridges
|
||||||
#
|
#
|
||||||
CONFIG_YENTA=m
|
CONFIG_YENTA=m
|
||||||
|
# CONFIG_YENTA_O2 is not set
|
||||||
|
# CONFIG_YENTA_RICOH is not set
|
||||||
|
# CONFIG_YENTA_TI is not set
|
||||||
|
# CONFIG_YENTA_TOSHIBA is not set
|
||||||
# CONFIG_PD6729 is not set
|
# CONFIG_PD6729 is not set
|
||||||
# CONFIG_I82092 is not set
|
# CONFIG_I82092 is not set
|
||||||
CONFIG_PCCARD_NONSTATIC=m
|
CONFIG_PCCARD_NONSTATIC=m
|
||||||
@ -246,6 +253,7 @@ CONFIG_NET=y
|
|||||||
#
|
#
|
||||||
# Networking options
|
# Networking options
|
||||||
#
|
#
|
||||||
|
# CONFIG_NETDEBUG is not set
|
||||||
CONFIG_PACKET=y
|
CONFIG_PACKET=y
|
||||||
CONFIG_PACKET_MMAP=y
|
CONFIG_PACKET_MMAP=y
|
||||||
CONFIG_UNIX=y
|
CONFIG_UNIX=y
|
||||||
@ -283,6 +291,7 @@ CONFIG_TCP_CONG_ADVANCED=y
|
|||||||
# TCP congestion control
|
# TCP congestion control
|
||||||
#
|
#
|
||||||
CONFIG_TCP_CONG_BIC=m
|
CONFIG_TCP_CONG_BIC=m
|
||||||
|
CONFIG_TCP_CONG_CUBIC=m
|
||||||
CONFIG_TCP_CONG_WESTWOOD=m
|
CONFIG_TCP_CONG_WESTWOOD=m
|
||||||
CONFIG_TCP_CONG_HTCP=m
|
CONFIG_TCP_CONG_HTCP=m
|
||||||
CONFIG_TCP_CONG_HSTCP=m
|
CONFIG_TCP_CONG_HSTCP=m
|
||||||
@ -309,6 +318,27 @@ CONFIG_NETFILTER=y
|
|||||||
# Core Netfilter Configuration
|
# Core Netfilter Configuration
|
||||||
#
|
#
|
||||||
# CONFIG_NETFILTER_NETLINK is not set
|
# CONFIG_NETFILTER_NETLINK is not set
|
||||||
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_MARK=m
|
||||||
|
# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_HELPER=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_MAC=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_MARK=m
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_REALM is not set
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_STATE=y
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_STRING is not set
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# IP: Netfilter Configuration
|
# IP: Netfilter Configuration
|
||||||
@ -326,50 +356,34 @@ CONFIG_IP_NF_AMANDA=m
|
|||||||
CONFIG_IP_NF_PPTP=m
|
CONFIG_IP_NF_PPTP=m
|
||||||
CONFIG_IP_NF_QUEUE=m
|
CONFIG_IP_NF_QUEUE=m
|
||||||
CONFIG_IP_NF_IPTABLES=y
|
CONFIG_IP_NF_IPTABLES=y
|
||||||
CONFIG_IP_NF_MATCH_LIMIT=m
|
|
||||||
CONFIG_IP_NF_MATCH_IPRANGE=m
|
CONFIG_IP_NF_MATCH_IPRANGE=m
|
||||||
CONFIG_IP_NF_MATCH_MAC=m
|
|
||||||
CONFIG_IP_NF_MATCH_LAYER7=m
|
CONFIG_IP_NF_MATCH_LAYER7=m
|
||||||
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
|
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
|
||||||
CONFIG_IP_NF_MATCH_PKTTYPE=m
|
CONFIG_IP_NF_MATCH_MULTIPORT=m
|
||||||
CONFIG_IP_NF_MATCH_MARK=y
|
|
||||||
CONFIG_IP_NF_MATCH_MULTIPORT=y
|
|
||||||
CONFIG_IP_NF_MATCH_TOS=m
|
CONFIG_IP_NF_MATCH_TOS=m
|
||||||
CONFIG_IP_NF_MATCH_TIME=m
|
CONFIG_IP_NF_MATCH_TIME=m
|
||||||
CONFIG_IP_NF_MATCH_RECENT=m
|
CONFIG_IP_NF_MATCH_RECENT=m
|
||||||
CONFIG_IP_NF_MATCH_ECN=m
|
CONFIG_IP_NF_MATCH_ECN=m
|
||||||
CONFIG_IP_NF_MATCH_DSCP=m
|
CONFIG_IP_NF_MATCH_DSCP=m
|
||||||
CONFIG_IP_NF_MATCH_AH_ESP=m
|
CONFIG_IP_NF_MATCH_AH_ESP=m
|
||||||
CONFIG_IP_NF_MATCH_LENGTH=m
|
|
||||||
CONFIG_IP_NF_MATCH_TTL=m
|
CONFIG_IP_NF_MATCH_TTL=m
|
||||||
CONFIG_IP_NF_MATCH_TCPMSS=m
|
|
||||||
CONFIG_IP_NF_MATCH_HELPER=m
|
|
||||||
CONFIG_IP_NF_MATCH_STATE=y
|
|
||||||
CONFIG_IP_NF_MATCH_CONNTRACK=m
|
|
||||||
CONFIG_IP_NF_MATCH_OWNER=m
|
CONFIG_IP_NF_MATCH_OWNER=m
|
||||||
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
|
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
|
||||||
# CONFIG_IP_NF_MATCH_REALM is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_SCTP is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_DCCP is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_COMMENT is not set
|
|
||||||
CONFIG_IP_NF_MATCH_CONNMARK=m
|
|
||||||
# CONFIG_IP_NF_MATCH_CONNBYTES is not set
|
|
||||||
# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
|
# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
|
||||||
CONFIG_IP_NF_MATCH_STRING=m
|
# CONFIG_IP_NF_MATCH_POLICY is not set
|
||||||
CONFIG_IP_NF_FILTER=y
|
CONFIG_IP_NF_FILTER=y
|
||||||
CONFIG_IP_NF_TARGET_REJECT=y
|
CONFIG_IP_NF_TARGET_REJECT=y
|
||||||
CONFIG_IP_NF_TARGET_IMQ=m
|
CONFIG_IP_NF_TARGET_IMQ=m
|
||||||
CONFIG_IP_NF_TARGET_LOG=m
|
# CONFIG_IP_NF_TARGET_LOG is not set
|
||||||
CONFIG_IP_NF_TARGET_ULOG=m
|
CONFIG_IP_NF_TARGET_ULOG=m
|
||||||
CONFIG_IP_NF_TARGET_TCPMSS=y
|
CONFIG_IP_NF_TARGET_TCPMSS=y
|
||||||
# CONFIG_IP_NF_TARGET_NFQUEUE is not set
|
|
||||||
CONFIG_IP_NF_NAT=y
|
CONFIG_IP_NF_NAT=y
|
||||||
CONFIG_IP_NF_NAT_NEEDED=y
|
CONFIG_IP_NF_NAT_NEEDED=y
|
||||||
CONFIG_IP_NF_TARGET_MASQUERADE=y
|
CONFIG_IP_NF_TARGET_MASQUERADE=y
|
||||||
CONFIG_IP_NF_TARGET_REDIRECT=m
|
CONFIG_IP_NF_TARGET_REDIRECT=y
|
||||||
CONFIG_IP_NF_TARGET_NETMAP=m
|
# CONFIG_IP_NF_TARGET_NETMAP is not set
|
||||||
# CONFIG_IP_NF_TARGET_SAME is not set
|
# CONFIG_IP_NF_TARGET_SAME is not set
|
||||||
CONFIG_IP_NF_NAT_SNMP_BASIC=m
|
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
|
||||||
CONFIG_IP_NF_NAT_IRC=y
|
CONFIG_IP_NF_NAT_IRC=y
|
||||||
CONFIG_IP_NF_NAT_FTP=y
|
CONFIG_IP_NF_NAT_FTP=y
|
||||||
CONFIG_IP_NF_NAT_TFTP=m
|
CONFIG_IP_NF_NAT_TFTP=m
|
||||||
@ -379,15 +393,10 @@ CONFIG_IP_NF_MANGLE=y
|
|||||||
CONFIG_IP_NF_TARGET_TOS=m
|
CONFIG_IP_NF_TARGET_TOS=m
|
||||||
CONFIG_IP_NF_TARGET_ECN=m
|
CONFIG_IP_NF_TARGET_ECN=m
|
||||||
CONFIG_IP_NF_TARGET_DSCP=m
|
CONFIG_IP_NF_TARGET_DSCP=m
|
||||||
CONFIG_IP_NF_TARGET_MARK=y
|
|
||||||
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
|
|
||||||
CONFIG_IP_NF_TARGET_TTL=m
|
CONFIG_IP_NF_TARGET_TTL=m
|
||||||
CONFIG_IP_NF_TARGET_CONNMARK=m
|
|
||||||
# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
|
# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
|
||||||
# CONFIG_IP_NF_RAW is not set
|
# CONFIG_IP_NF_RAW is not set
|
||||||
CONFIG_IP_NF_ARPTABLES=m
|
# CONFIG_IP_NF_ARPTABLES is not set
|
||||||
CONFIG_IP_NF_ARPFILTER=m
|
|
||||||
CONFIG_IP_NF_ARP_MANGLE=m
|
|
||||||
CONFIG_IP_NF_SET=m
|
CONFIG_IP_NF_SET=m
|
||||||
CONFIG_IP_NF_SET_MAX=256
|
CONFIG_IP_NF_SET_MAX=256
|
||||||
CONFIG_IP_NF_SET_HASHSIZE=1024
|
CONFIG_IP_NF_SET_HASHSIZE=1024
|
||||||
@ -405,26 +414,21 @@ CONFIG_IP_NF_TARGET_SET=m
|
|||||||
#
|
#
|
||||||
CONFIG_IP6_NF_QUEUE=m
|
CONFIG_IP6_NF_QUEUE=m
|
||||||
CONFIG_IP6_NF_IPTABLES=m
|
CONFIG_IP6_NF_IPTABLES=m
|
||||||
CONFIG_IP6_NF_MATCH_LIMIT=m
|
|
||||||
CONFIG_IP6_NF_MATCH_MAC=m
|
|
||||||
# CONFIG_IP6_NF_MATCH_RT is not set
|
# CONFIG_IP6_NF_MATCH_RT is not set
|
||||||
# CONFIG_IP6_NF_MATCH_OPTS is not set
|
# CONFIG_IP6_NF_MATCH_OPTS is not set
|
||||||
# CONFIG_IP6_NF_MATCH_FRAG is not set
|
# CONFIG_IP6_NF_MATCH_FRAG is not set
|
||||||
# CONFIG_IP6_NF_MATCH_HL is not set
|
# CONFIG_IP6_NF_MATCH_HL is not set
|
||||||
CONFIG_IP6_NF_MATCH_MULTIPORT=m
|
CONFIG_IP6_NF_MATCH_MULTIPORT=m
|
||||||
CONFIG_IP6_NF_MATCH_OWNER=m
|
CONFIG_IP6_NF_MATCH_OWNER=m
|
||||||
CONFIG_IP6_NF_MATCH_MARK=m
|
|
||||||
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
|
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
|
||||||
# CONFIG_IP6_NF_MATCH_AHESP is not set
|
# CONFIG_IP6_NF_MATCH_AHESP is not set
|
||||||
CONFIG_IP6_NF_MATCH_LENGTH=m
|
|
||||||
CONFIG_IP6_NF_MATCH_EUI64=m
|
CONFIG_IP6_NF_MATCH_EUI64=m
|
||||||
|
# CONFIG_IP6_NF_MATCH_POLICY is not set
|
||||||
CONFIG_IP6_NF_FILTER=m
|
CONFIG_IP6_NF_FILTER=m
|
||||||
CONFIG_IP6_NF_TARGET_IMQ=m
|
CONFIG_IP6_NF_TARGET_IMQ=m
|
||||||
CONFIG_IP6_NF_TARGET_LOG=m
|
# CONFIG_IP6_NF_TARGET_LOG is not set
|
||||||
CONFIG_IP6_NF_TARGET_REJECT=m
|
CONFIG_IP6_NF_TARGET_REJECT=m
|
||||||
# CONFIG_IP6_NF_TARGET_NFQUEUE is not set
|
|
||||||
CONFIG_IP6_NF_MANGLE=m
|
CONFIG_IP6_NF_MANGLE=m
|
||||||
CONFIG_IP6_NF_TARGET_MARK=m
|
|
||||||
# CONFIG_IP6_NF_TARGET_HL is not set
|
# CONFIG_IP6_NF_TARGET_HL is not set
|
||||||
# CONFIG_IP6_NF_RAW is not set
|
# CONFIG_IP6_NF_RAW is not set
|
||||||
|
|
||||||
@ -461,6 +465,11 @@ CONFIG_BRIDGE_EBT_ULOG=m
|
|||||||
# SCTP Configuration (EXPERIMENTAL)
|
# SCTP Configuration (EXPERIMENTAL)
|
||||||
#
|
#
|
||||||
# CONFIG_IP_SCTP is not set
|
# CONFIG_IP_SCTP is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# TIPC Configuration (EXPERIMENTAL)
|
||||||
|
#
|
||||||
|
# CONFIG_TIPC is not set
|
||||||
CONFIG_ATM=m
|
CONFIG_ATM=m
|
||||||
CONFIG_ATM_CLIP=m
|
CONFIG_ATM_CLIP=m
|
||||||
CONFIG_ATM_CLIP_NO_ICMP=y
|
CONFIG_ATM_CLIP_NO_ICMP=y
|
||||||
@ -643,6 +652,7 @@ CONFIG_MTD_CFI_UTIL=y
|
|||||||
# CONFIG_MTD_RAM is not set
|
# CONFIG_MTD_RAM is not set
|
||||||
# CONFIG_MTD_ROM is not set
|
# CONFIG_MTD_ROM is not set
|
||||||
# CONFIG_MTD_ABSENT is not set
|
# CONFIG_MTD_ABSENT is not set
|
||||||
|
# CONFIG_MTD_OBSOLETE_CHIPS is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Mapping drivers for chip access
|
# Mapping drivers for chip access
|
||||||
@ -769,13 +779,7 @@ CONFIG_BLK_DEV_SD=m
|
|||||||
# CONFIG_SCSI_IPR is not set
|
# CONFIG_SCSI_IPR is not set
|
||||||
# CONFIG_SCSI_QLOGIC_FC is not set
|
# CONFIG_SCSI_QLOGIC_FC is not set
|
||||||
# CONFIG_SCSI_QLOGIC_1280 is not set
|
# CONFIG_SCSI_QLOGIC_1280 is not set
|
||||||
CONFIG_SCSI_QLA2XXX=m
|
# CONFIG_SCSI_QLA_FC is not set
|
||||||
# CONFIG_SCSI_QLA21XX is not set
|
|
||||||
# CONFIG_SCSI_QLA22XX is not set
|
|
||||||
# CONFIG_SCSI_QLA2300 is not set
|
|
||||||
# CONFIG_SCSI_QLA2322 is not set
|
|
||||||
# CONFIG_SCSI_QLA6312 is not set
|
|
||||||
# CONFIG_SCSI_QLA24XX is not set
|
|
||||||
# CONFIG_SCSI_LPFC is not set
|
# CONFIG_SCSI_LPFC is not set
|
||||||
# CONFIG_SCSI_DC395x is not set
|
# CONFIG_SCSI_DC395x is not set
|
||||||
# CONFIG_SCSI_DC390T is not set
|
# CONFIG_SCSI_DC390T is not set
|
||||||
@ -848,6 +852,7 @@ CONFIG_MII=y
|
|||||||
# CONFIG_SUNGEM is not set
|
# CONFIG_SUNGEM is not set
|
||||||
# CONFIG_CASSINI is not set
|
# CONFIG_CASSINI is not set
|
||||||
# CONFIG_NET_VENDOR_3COM is not set
|
# CONFIG_NET_VENDOR_3COM is not set
|
||||||
|
# CONFIG_DM9000 is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Tulip family network device support
|
# Tulip family network device support
|
||||||
@ -887,6 +892,7 @@ CONFIG_B44=y
|
|||||||
# CONFIG_R8169 is not set
|
# CONFIG_R8169 is not set
|
||||||
# CONFIG_SIS190 is not set
|
# CONFIG_SIS190 is not set
|
||||||
# CONFIG_SKGE is not set
|
# CONFIG_SKGE is not set
|
||||||
|
# CONFIG_SKY2 is not set
|
||||||
# CONFIG_SK98LIN is not set
|
# CONFIG_SK98LIN is not set
|
||||||
# CONFIG_VIA_VELOCITY is not set
|
# CONFIG_VIA_VELOCITY is not set
|
||||||
# CONFIG_TIGON3 is not set
|
# CONFIG_TIGON3 is not set
|
||||||
@ -926,8 +932,9 @@ CONFIG_NET_RADIO=y
|
|||||||
#
|
#
|
||||||
CONFIG_IPW2100=m
|
CONFIG_IPW2100=m
|
||||||
CONFIG_IPW2100_MONITOR=y
|
CONFIG_IPW2100_MONITOR=y
|
||||||
# CONFIG_IPW_DEBUG is not set
|
# CONFIG_IPW2100_DEBUG is not set
|
||||||
CONFIG_IPW2200=m
|
CONFIG_IPW2200=m
|
||||||
|
# CONFIG_IPW2200_DEBUG is not set
|
||||||
# CONFIG_HERMES is not set
|
# CONFIG_HERMES is not set
|
||||||
# CONFIG_ATMEL is not set
|
# CONFIG_ATMEL is not set
|
||||||
|
|
||||||
@ -943,6 +950,7 @@ CONFIG_IPW2200=m
|
|||||||
# CONFIG_PRISM54 is not set
|
# CONFIG_PRISM54 is not set
|
||||||
CONFIG_HOSTAP=m
|
CONFIG_HOSTAP=m
|
||||||
CONFIG_HOSTAP_FIRMWARE=y
|
CONFIG_HOSTAP_FIRMWARE=y
|
||||||
|
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
|
||||||
CONFIG_HOSTAP_PLX=m
|
CONFIG_HOSTAP_PLX=m
|
||||||
CONFIG_HOSTAP_PCI=m
|
CONFIG_HOSTAP_PCI=m
|
||||||
CONFIG_HOSTAP_CS=m
|
CONFIG_HOSTAP_CS=m
|
||||||
@ -1045,6 +1053,7 @@ CONFIG_SERIAL_8250=y
|
|||||||
CONFIG_SERIAL_8250_CONSOLE=y
|
CONFIG_SERIAL_8250_CONSOLE=y
|
||||||
CONFIG_SERIAL_8250_CS=m
|
CONFIG_SERIAL_8250_CS=m
|
||||||
CONFIG_SERIAL_8250_NR_UARTS=2
|
CONFIG_SERIAL_8250_NR_UARTS=2
|
||||||
|
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
|
||||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1095,6 +1104,12 @@ CONFIG_UNIX98_PTYS=y
|
|||||||
#
|
#
|
||||||
# CONFIG_I2C is not set
|
# CONFIG_I2C is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# SPI support
|
||||||
|
#
|
||||||
|
# CONFIG_SPI is not set
|
||||||
|
# CONFIG_SPI_MASTER is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Dallas's 1-wire bus
|
# Dallas's 1-wire bus
|
||||||
#
|
#
|
||||||
@ -1126,6 +1141,7 @@ CONFIG_VIDEO_DEV=m
|
|||||||
#
|
#
|
||||||
# Video Adapters
|
# Video Adapters
|
||||||
#
|
#
|
||||||
|
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||||
# CONFIG_VIDEO_CPIA is not set
|
# CONFIG_VIDEO_CPIA is not set
|
||||||
# CONFIG_VIDEO_STRADIS is not set
|
# CONFIG_VIDEO_STRADIS is not set
|
||||||
# CONFIG_VIDEO_MXB is not set
|
# CONFIG_VIDEO_MXB is not set
|
||||||
@ -1166,6 +1182,8 @@ CONFIG_SND_RAWMIDI=m
|
|||||||
# CONFIG_SND_SEQUENCER is not set
|
# CONFIG_SND_SEQUENCER is not set
|
||||||
# CONFIG_SND_MIXER_OSS is not set
|
# CONFIG_SND_MIXER_OSS is not set
|
||||||
# CONFIG_SND_PCM_OSS is not set
|
# CONFIG_SND_PCM_OSS is not set
|
||||||
|
# CONFIG_SND_DYNAMIC_MINORS is not set
|
||||||
|
# CONFIG_SND_SUPPORT_OLD_API is not set
|
||||||
# CONFIG_SND_VERBOSE_PRINTK is not set
|
# CONFIG_SND_VERBOSE_PRINTK is not set
|
||||||
# CONFIG_SND_DEBUG is not set
|
# CONFIG_SND_DEBUG is not set
|
||||||
|
|
||||||
@ -1180,6 +1198,7 @@ CONFIG_SND_RAWMIDI=m
|
|||||||
#
|
#
|
||||||
# PCI devices
|
# PCI devices
|
||||||
#
|
#
|
||||||
|
# CONFIG_SND_AD1889 is not set
|
||||||
# CONFIG_SND_ALI5451 is not set
|
# CONFIG_SND_ALI5451 is not set
|
||||||
# CONFIG_SND_ATIIXP is not set
|
# CONFIG_SND_ATIIXP is not set
|
||||||
# CONFIG_SND_ATIIXP_MODEM is not set
|
# CONFIG_SND_ATIIXP_MODEM is not set
|
||||||
@ -1188,38 +1207,38 @@ CONFIG_SND_RAWMIDI=m
|
|||||||
# CONFIG_SND_AU8830 is not set
|
# CONFIG_SND_AU8830 is not set
|
||||||
# CONFIG_SND_AZT3328 is not set
|
# CONFIG_SND_AZT3328 is not set
|
||||||
# CONFIG_SND_BT87X is not set
|
# CONFIG_SND_BT87X is not set
|
||||||
# CONFIG_SND_CS46XX is not set
|
# CONFIG_SND_CA0106 is not set
|
||||||
|
# CONFIG_SND_CMIPCI is not set
|
||||||
# CONFIG_SND_CS4281 is not set
|
# CONFIG_SND_CS4281 is not set
|
||||||
|
# CONFIG_SND_CS46XX is not set
|
||||||
# CONFIG_SND_EMU10K1 is not set
|
# CONFIG_SND_EMU10K1 is not set
|
||||||
# CONFIG_SND_EMU10K1X is not set
|
# CONFIG_SND_EMU10K1X is not set
|
||||||
# CONFIG_SND_CA0106 is not set
|
|
||||||
# CONFIG_SND_KORG1212 is not set
|
|
||||||
# CONFIG_SND_MIXART is not set
|
|
||||||
# CONFIG_SND_NM256 is not set
|
|
||||||
# CONFIG_SND_RME32 is not set
|
|
||||||
# CONFIG_SND_RME96 is not set
|
|
||||||
# CONFIG_SND_RME9652 is not set
|
|
||||||
# CONFIG_SND_HDSP is not set
|
|
||||||
# CONFIG_SND_HDSPM is not set
|
|
||||||
# CONFIG_SND_TRIDENT is not set
|
|
||||||
# CONFIG_SND_YMFPCI is not set
|
|
||||||
# CONFIG_SND_AD1889 is not set
|
|
||||||
# CONFIG_SND_CMIPCI is not set
|
|
||||||
# CONFIG_SND_ENS1370 is not set
|
# CONFIG_SND_ENS1370 is not set
|
||||||
# CONFIG_SND_ENS1371 is not set
|
# CONFIG_SND_ENS1371 is not set
|
||||||
# CONFIG_SND_ES1938 is not set
|
# CONFIG_SND_ES1938 is not set
|
||||||
# CONFIG_SND_ES1968 is not set
|
# CONFIG_SND_ES1968 is not set
|
||||||
# CONFIG_SND_MAESTRO3 is not set
|
|
||||||
# CONFIG_SND_FM801 is not set
|
# CONFIG_SND_FM801 is not set
|
||||||
|
# CONFIG_SND_HDA_INTEL is not set
|
||||||
|
# CONFIG_SND_HDSP is not set
|
||||||
|
# CONFIG_SND_HDSPM is not set
|
||||||
# CONFIG_SND_ICE1712 is not set
|
# CONFIG_SND_ICE1712 is not set
|
||||||
# CONFIG_SND_ICE1724 is not set
|
# CONFIG_SND_ICE1724 is not set
|
||||||
# CONFIG_SND_INTEL8X0 is not set
|
# CONFIG_SND_INTEL8X0 is not set
|
||||||
# CONFIG_SND_INTEL8X0M is not set
|
# CONFIG_SND_INTEL8X0M is not set
|
||||||
|
# CONFIG_SND_KORG1212 is not set
|
||||||
|
# CONFIG_SND_MAESTRO3 is not set
|
||||||
|
# CONFIG_SND_MIXART is not set
|
||||||
|
# CONFIG_SND_NM256 is not set
|
||||||
|
# CONFIG_SND_PCXHR is not set
|
||||||
|
# CONFIG_SND_RME32 is not set
|
||||||
|
# CONFIG_SND_RME96 is not set
|
||||||
|
# CONFIG_SND_RME9652 is not set
|
||||||
# CONFIG_SND_SONICVIBES is not set
|
# CONFIG_SND_SONICVIBES is not set
|
||||||
|
# CONFIG_SND_TRIDENT is not set
|
||||||
# CONFIG_SND_VIA82XX is not set
|
# CONFIG_SND_VIA82XX is not set
|
||||||
# CONFIG_SND_VIA82XX_MODEM is not set
|
# CONFIG_SND_VIA82XX_MODEM is not set
|
||||||
# CONFIG_SND_VX222 is not set
|
# CONFIG_SND_VX222 is not set
|
||||||
# CONFIG_SND_HDA_INTEL is not set
|
# CONFIG_SND_YMFPCI is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# ALSA MIPS devices
|
# ALSA MIPS devices
|
||||||
@ -1291,7 +1310,9 @@ CONFIG_USB_STORAGE=m
|
|||||||
# CONFIG_USB_STORAGE_SDDR09 is not set
|
# CONFIG_USB_STORAGE_SDDR09 is not set
|
||||||
# CONFIG_USB_STORAGE_SDDR55 is not set
|
# CONFIG_USB_STORAGE_SDDR55 is not set
|
||||||
# CONFIG_USB_STORAGE_JUMPSHOT is not set
|
# CONFIG_USB_STORAGE_JUMPSHOT is not set
|
||||||
|
# CONFIG_USB_STORAGE_ALAUDA is not set
|
||||||
# CONFIG_USB_STORAGE_ONETOUCH is not set
|
# CONFIG_USB_STORAGE_ONETOUCH is not set
|
||||||
|
# CONFIG_USB_LIBUSUAL is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# USB Input Devices
|
# USB Input Devices
|
||||||
@ -1314,6 +1335,7 @@ CONFIG_USB_STORAGE=m
|
|||||||
# CONFIG_USB_YEALINK is not set
|
# CONFIG_USB_YEALINK is not set
|
||||||
# CONFIG_USB_XPAD is not set
|
# CONFIG_USB_XPAD is not set
|
||||||
# CONFIG_USB_ATI_REMOTE is not set
|
# CONFIG_USB_ATI_REMOTE is not set
|
||||||
|
# CONFIG_USB_ATI_REMOTE2 is not set
|
||||||
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
||||||
# CONFIG_USB_APPLETOUCH is not set
|
# CONFIG_USB_APPLETOUCH is not set
|
||||||
|
|
||||||
@ -1329,6 +1351,7 @@ CONFIG_USB_STORAGE=m
|
|||||||
# CONFIG_USB_DABUSB is not set
|
# CONFIG_USB_DABUSB is not set
|
||||||
# CONFIG_USB_VICAM is not set
|
# CONFIG_USB_VICAM is not set
|
||||||
# CONFIG_USB_DSBR is not set
|
# CONFIG_USB_DSBR is not set
|
||||||
|
# CONFIG_USB_ET61X251 is not set
|
||||||
# CONFIG_USB_IBMCAM is not set
|
# CONFIG_USB_IBMCAM is not set
|
||||||
# CONFIG_USB_KONICAWC is not set
|
# CONFIG_USB_KONICAWC is not set
|
||||||
# CONFIG_USB_OV511 is not set
|
# CONFIG_USB_OV511 is not set
|
||||||
@ -1411,6 +1434,7 @@ CONFIG_USB_SERIAL_PL2303=m
|
|||||||
CONFIG_USB_ATM=m
|
CONFIG_USB_ATM=m
|
||||||
CONFIG_USB_SPEEDTOUCH=m
|
CONFIG_USB_SPEEDTOUCH=m
|
||||||
# CONFIG_USB_CXACRU is not set
|
# CONFIG_USB_CXACRU is not set
|
||||||
|
# CONFIG_USB_UEAGLEATM is not set
|
||||||
# CONFIG_USB_XUSBATM is not set
|
# CONFIG_USB_XUSBATM is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1429,7 +1453,7 @@ CONFIG_USB_SPEEDTOUCH=m
|
|||||||
# CONFIG_INFINIBAND is not set
|
# CONFIG_INFINIBAND is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# SN Devices
|
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
|
||||||
#
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1457,6 +1481,7 @@ CONFIG_XFS_FS=m
|
|||||||
# CONFIG_XFS_SECURITY is not set
|
# CONFIG_XFS_SECURITY is not set
|
||||||
# CONFIG_XFS_POSIX_ACL is not set
|
# CONFIG_XFS_POSIX_ACL is not set
|
||||||
# CONFIG_XFS_RT is not set
|
# CONFIG_XFS_RT is not set
|
||||||
|
# CONFIG_OCFS2_FS is not set
|
||||||
CONFIG_MINIX_FS=m
|
CONFIG_MINIX_FS=m
|
||||||
# CONFIG_ROMFS_FS is not set
|
# CONFIG_ROMFS_FS is not set
|
||||||
CONFIG_INOTIFY=y
|
CONFIG_INOTIFY=y
|
||||||
@ -1495,6 +1520,7 @@ CONFIG_TMPFS=y
|
|||||||
# CONFIG_HUGETLB_PAGE is not set
|
# CONFIG_HUGETLB_PAGE is not set
|
||||||
CONFIG_RAMFS=y
|
CONFIG_RAMFS=y
|
||||||
# CONFIG_RELAYFS_FS is not set
|
# CONFIG_RELAYFS_FS is not set
|
||||||
|
# CONFIG_CONFIGFS_FS is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Miscellaneous filesystems
|
# Miscellaneous filesystems
|
||||||
@ -1574,6 +1600,7 @@ CONFIG_MSDOS_PARTITION=y
|
|||||||
# CONFIG_SGI_PARTITION is not set
|
# CONFIG_SGI_PARTITION is not set
|
||||||
# CONFIG_ULTRIX_PARTITION is not set
|
# CONFIG_ULTRIX_PARTITION is not set
|
||||||
# CONFIG_SUN_PARTITION is not set
|
# CONFIG_SUN_PARTITION is not set
|
||||||
|
# CONFIG_KARMA_PARTITION is not set
|
||||||
# CONFIG_EFI_PARTITION is not set
|
# CONFIG_EFI_PARTITION is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1629,6 +1656,7 @@ CONFIG_NLS_UTF8=m
|
|||||||
# Kernel hacking
|
# Kernel hacking
|
||||||
#
|
#
|
||||||
# CONFIG_PRINTK_TIME is not set
|
# CONFIG_PRINTK_TIME is not set
|
||||||
|
# CONFIG_MAGIC_SYSRQ is not set
|
||||||
# CONFIG_DEBUG_KERNEL is not set
|
# CONFIG_DEBUG_KERNEL is not set
|
||||||
CONFIG_LOG_BUF_SHIFT=14
|
CONFIG_LOG_BUF_SHIFT=14
|
||||||
CONFIG_CROSSCOMPILE=y
|
CONFIG_CROSSCOMPILE=y
|
||||||
@ -1682,7 +1710,3 @@ CONFIG_CRC32=y
|
|||||||
# CONFIG_LIBCRC32C is not set
|
# CONFIG_LIBCRC32C is not set
|
||||||
CONFIG_ZLIB_INFLATE=y
|
CONFIG_ZLIB_INFLATE=y
|
||||||
CONFIG_ZLIB_DEFLATE=y
|
CONFIG_ZLIB_DEFLATE=y
|
||||||
CONFIG_TEXTSEARCH=y
|
|
||||||
CONFIG_TEXTSEARCH_KMP=m
|
|
||||||
CONFIG_TEXTSEARCH_BM=m
|
|
||||||
CONFIG_TEXTSEARCH_FSM=m
|
|
||||||
|
@ -1,64 +1,6 @@
|
|||||||
diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/broadcom/bcmsrom.c linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/bcmsrom.c
|
||||||
--- linux.old/arch/mips/Kconfig 2006-01-12 00:25:32.203973000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/broadcom/bcmsrom.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/Kconfig 2006-01-12 00:20:30.697130000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/bcmsrom.c 2006-03-21 09:30:59.000000000 +0100
|
||||||
@@ -244,6 +244,17 @@
|
|
||||||
Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
|
|
||||||
Olivetti M700-10 workstations.
|
|
||||||
|
|
||||||
+config BCM947XX
|
|
||||||
+ bool "Support for BCM947xx based boards"
|
|
||||||
+ select DMA_NONCOHERENT
|
|
||||||
+ select HW_HAS_PCI
|
|
||||||
+ select IRQ_CPU
|
|
||||||
+ select SYS_HAS_CPU_MIPS32_R1
|
|
||||||
+ select SYS_SUPPORTS_32BIT_KERNEL
|
|
||||||
+ select SYS_SUPPORTS_LITTLE_ENDIAN
|
|
||||||
+ help
|
|
||||||
+ Support for BCM947xx based boards
|
|
||||||
+
|
|
||||||
config LASAT
|
|
||||||
bool "Support for LASAT Networks platforms"
|
|
||||||
select DMA_NONCOHERENT
|
|
||||||
diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
|
|
||||||
--- linux.old/arch/mips/Makefile 2006-01-12 00:25:32.223974250 +0100
|
|
||||||
+++ linux.dev/arch/mips/Makefile 2006-01-12 00:20:30.701130250 +0100
|
|
||||||
@@ -689,6 +689,13 @@
|
|
||||||
load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000
|
|
||||||
|
|
||||||
#
|
|
||||||
+# Broadcom BCM47XX boards
|
|
||||||
+#
|
|
||||||
+core-$(CONFIG_BCM947XX) += arch/mips/bcm947xx/ arch/mips/bcm947xx/broadcom/
|
|
||||||
+cflags-$(CONFIG_BCM947XX) += -Iarch/mips/bcm947xx/include
|
|
||||||
+load-$(CONFIG_BCM947XX) := 0xffffffff80001000
|
|
||||||
+
|
|
||||||
+#
|
|
||||||
# SNI RM200 PCI
|
|
||||||
#
|
|
||||||
core-$(CONFIG_SNI_RM200_PCI) += arch/mips/sni/
|
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/Makefile linux.dev/arch/mips/bcm947xx/Makefile
|
|
||||||
--- linux.old/arch/mips/bcm947xx/Makefile 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux.dev/arch/mips/bcm947xx/Makefile 2006-01-12 00:20:30.701130250 +0100
|
|
||||||
@@ -0,0 +1,6 @@
|
|
||||||
+#
|
|
||||||
+# Makefile for the BCM47xx specific kernel interface routines
|
|
||||||
+# under Linux.
|
|
||||||
+#
|
|
||||||
+
|
|
||||||
+obj-y := irq.o int-handler.o prom.o setup.o time.o pci.o
|
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/broadcom/Makefile linux.dev/arch/mips/bcm947xx/broadcom/Makefile
|
|
||||||
--- linux.old/arch/mips/bcm947xx/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux.dev/arch/mips/bcm947xx/broadcom/Makefile 2006-01-12 00:20:30.713131000 +0100
|
|
||||||
@@ -0,0 +1,6 @@
|
|
||||||
+#
|
|
||||||
+# Makefile for the BCM47xx specific kernel interface routines
|
|
||||||
+# under Linux.
|
|
||||||
+#
|
|
||||||
+
|
|
||||||
+obj-y := sbutils.o linux_osl.o bcmsrom.o bcmutils.o sbmips.o sbpci.o sflash.o nvram.o cfe_env.o
|
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/broadcom/bcmsrom.c linux.dev/arch/mips/bcm947xx/broadcom/bcmsrom.c
|
|
||||||
--- linux.old/arch/mips/bcm947xx/broadcom/bcmsrom.c 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux.dev/arch/mips/bcm947xx/broadcom/bcmsrom.c 2006-01-12 00:20:30.717131250 +0100
|
|
||||||
@@ -0,0 +1,481 @@
|
@@ -0,0 +1,481 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc useful routines to access NIC SROM/OTP .
|
+ * Misc useful routines to access NIC SROM/OTP .
|
||||||
@ -541,9 +483,9 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/bcmsrom.c linux.dev/arch/mips/bc
|
|||||||
+ return err;
|
+ return err;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/broadcom/bcmutils.c linux.dev/arch/mips/bcm947xx/broadcom/bcmutils.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/broadcom/bcmutils.c linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/bcmutils.c
|
||||||
--- linux.old/arch/mips/bcm947xx/broadcom/bcmutils.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/broadcom/bcmutils.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/broadcom/bcmutils.c 2006-01-12 00:20:30.717131250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/bcmutils.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,356 @@
|
@@ -0,0 +1,356 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc useful OS-independent routines.
|
+ * Misc useful OS-independent routines.
|
||||||
@ -901,9 +843,9 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/bcmutils.c linux.dev/arch/mips/b
|
|||||||
+#define CNBUFS 5
|
+#define CNBUFS 5
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/broadcom/cfe_env.c linux.dev/arch/mips/bcm947xx/broadcom/cfe_env.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/broadcom/cfe_env.c linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/cfe_env.c
|
||||||
--- linux.old/arch/mips/bcm947xx/broadcom/cfe_env.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/broadcom/cfe_env.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/broadcom/cfe_env.c 2006-01-12 00:20:30.717131250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/cfe_env.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,234 @@
|
@@ -0,0 +1,234 @@
|
||||||
+/*
|
+/*
|
||||||
+ * NVRAM variable manipulation (Linux kernel half)
|
+ * NVRAM variable manipulation (Linux kernel half)
|
||||||
@ -1139,9 +1081,9 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/cfe_env.c linux.dev/arch/mips/bc
|
|||||||
+
|
+
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/broadcom/linux_osl.c linux.dev/arch/mips/bcm947xx/broadcom/linux_osl.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/broadcom/linux_osl.c linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/linux_osl.c
|
||||||
--- linux.old/arch/mips/bcm947xx/broadcom/linux_osl.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/broadcom/linux_osl.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/broadcom/linux_osl.c 2006-01-12 00:20:30.717131250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/linux_osl.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,102 @@
|
@@ -0,0 +1,102 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Linux OS Independent Layer
|
+ * Linux OS Independent Layer
|
||||||
@ -1245,9 +1187,19 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/linux_osl.c linux.dev/arch/mips/
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/broadcom/nvram.c linux.dev/arch/mips/bcm947xx/broadcom/nvram.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/broadcom/Makefile linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/Makefile
|
||||||
--- linux.old/arch/mips/bcm947xx/broadcom/nvram.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/broadcom/nvram.c 2006-01-12 00:20:30.717131250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/Makefile 2006-03-21 09:31:00.000000000 +0100
|
||||||
|
@@ -0,0 +1,6 @@
|
||||||
|
+#
|
||||||
|
+# Makefile for the BCM47xx specific kernel interface routines
|
||||||
|
+# under Linux.
|
||||||
|
+#
|
||||||
|
+
|
||||||
|
+obj-y := sbutils.o linux_osl.o bcmsrom.o bcmutils.o sbmips.o sbpci.o sflash.o nvram.o cfe_env.o
|
||||||
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/broadcom/nvram.c linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/nvram.c
|
||||||
|
--- linux-2.6.16/arch/mips/bcm947xx/broadcom/nvram.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/nvram.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,192 @@
|
@@ -0,0 +1,192 @@
|
||||||
+/*
|
+/*
|
||||||
+ * NVRAM variable manipulation (Linux kernel half)
|
+ * NVRAM variable manipulation (Linux kernel half)
|
||||||
@ -1441,9 +1393,9 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/nvram.c linux.dev/arch/mips/bcm9
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+EXPORT_SYMBOL(nvram_get);
|
+EXPORT_SYMBOL(nvram_get);
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbmips.c linux.dev/arch/mips/bcm947xx/broadcom/sbmips.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/broadcom/sbmips.c linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/sbmips.c
|
||||||
--- linux.old/arch/mips/bcm947xx/broadcom/sbmips.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/broadcom/sbmips.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/broadcom/sbmips.c 2006-01-12 00:27:27.399172250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/sbmips.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,1055 @@
|
@@ -0,0 +1,1055 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM47XX Sonics SiliconBackplane MIPS core routines
|
+ * BCM47XX Sonics SiliconBackplane MIPS core routines
|
||||||
@ -2500,9 +2452,9 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbmips.c linux.dev/arch/mips/bcm
|
|||||||
+ return ret;
|
+ return ret;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbpci.c linux.dev/arch/mips/bcm947xx/broadcom/sbpci.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/broadcom/sbpci.c linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/sbpci.c
|
||||||
--- linux.old/arch/mips/bcm947xx/broadcom/sbpci.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/broadcom/sbpci.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/broadcom/sbpci.c 2006-01-12 00:52:25.864820500 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/sbpci.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,534 @@
|
@@ -0,0 +1,534 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Low-Level PCI and SB support for BCM47xx
|
+ * Low-Level PCI and SB support for BCM47xx
|
||||||
@ -3038,9 +2990,9 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbpci.c linux.dev/arch/mips/bcm9
|
|||||||
+ return 0;
|
+ return 0;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbutils.c linux.dev/arch/mips/bcm947xx/broadcom/sbutils.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/broadcom/sbutils.c linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/sbutils.c
|
||||||
--- linux.old/arch/mips/bcm947xx/broadcom/sbutils.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/broadcom/sbutils.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/broadcom/sbutils.c 2006-01-12 00:20:30.725131750 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/sbutils.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,2370 @@
|
@@ -0,0 +1,2370 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc utility routines for accessing chip-specific features
|
+ * Misc utility routines for accessing chip-specific features
|
||||||
@ -5412,9 +5364,9 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbutils.c linux.dev/arch/mips/bc
|
|||||||
+EXPORT_SYMBOL(sb_gpiosetcore);
|
+EXPORT_SYMBOL(sb_gpiosetcore);
|
||||||
+EXPORT_SYMBOL(sb_gpiotimerval);
|
+EXPORT_SYMBOL(sb_gpiotimerval);
|
||||||
+EXPORT_SYMBOL(sb_watchdog);
|
+EXPORT_SYMBOL(sb_watchdog);
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/broadcom/sflash.c linux.dev/arch/mips/bcm947xx/broadcom/sflash.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/broadcom/sflash.c linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/sflash.c
|
||||||
--- linux.old/arch/mips/bcm947xx/broadcom/sflash.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/broadcom/sflash.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/broadcom/sflash.c 2006-01-12 00:20:30.725131750 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/broadcom/sflash.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,418 @@
|
@@ -0,0 +1,418 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Broadcom SiliconBackplane chipcommon serial flash interface
|
+ * Broadcom SiliconBackplane chipcommon serial flash interface
|
||||||
@ -5834,9 +5786,9 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/sflash.c linux.dev/arch/mips/bcm
|
|||||||
+ return ret;
|
+ return ret;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/bcmdevs.h linux.dev/arch/mips/bcm947xx/include/bcmdevs.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/bcmdevs.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/bcmdevs.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/bcmdevs.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/bcmdevs.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/bcmdevs.h 2006-01-12 00:20:30.725131750 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/bcmdevs.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,391 @@
|
@@ -0,0 +1,391 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Broadcom device-specific manifest constants.
|
+ * Broadcom device-specific manifest constants.
|
||||||
@ -6229,9 +6181,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmdevs.h linux.dev/arch/mips/bcm
|
|||||||
+#define GPIO_NUMPINS 16
|
+#define GPIO_NUMPINS 16
|
||||||
+
|
+
|
||||||
+#endif /* _BCMDEVS_H */
|
+#endif /* _BCMDEVS_H */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/bcmendian.h linux.dev/arch/mips/bcm947xx/include/bcmendian.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/bcmendian.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/bcmendian.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/bcmendian.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/bcmendian.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/bcmendian.h 2006-01-12 00:20:30.725131750 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/bcmendian.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,152 @@
|
@@ -0,0 +1,152 @@
|
||||||
+/*
|
+/*
|
||||||
+ * local version of endian.h - byte order defines
|
+ * local version of endian.h - byte order defines
|
||||||
@ -6385,9 +6337,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmendian.h linux.dev/arch/mips/b
|
|||||||
+)
|
+)
|
||||||
+
|
+
|
||||||
+#endif /* _BCMENDIAN_H_ */
|
+#endif /* _BCMENDIAN_H_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/bcmnvram.h linux.dev/arch/mips/bcm947xx/include/bcmnvram.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/bcmnvram.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/bcmnvram.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/bcmnvram.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/bcmnvram.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/bcmnvram.h 2006-01-12 00:20:30.725131750 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/bcmnvram.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,95 @@
|
@@ -0,0 +1,95 @@
|
||||||
+/*
|
+/*
|
||||||
+ * NVRAM variable manipulation
|
+ * NVRAM variable manipulation
|
||||||
@ -6484,9 +6436,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmnvram.h linux.dev/arch/mips/bc
|
|||||||
+#define NVRAM_MAX_PARAM_LEN 64
|
+#define NVRAM_MAX_PARAM_LEN 64
|
||||||
+
|
+
|
||||||
+#endif /* _bcmnvram_h_ */
|
+#endif /* _bcmnvram_h_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/bcmsrom.h linux.dev/arch/mips/bcm947xx/include/bcmsrom.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/bcmsrom.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/bcmsrom.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/bcmsrom.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/bcmsrom.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/bcmsrom.h 2006-01-12 00:20:30.725131750 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/bcmsrom.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,23 @@
|
@@ -0,0 +1,23 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc useful routines to access NIC local SROM/OTP .
|
+ * Misc useful routines to access NIC local SROM/OTP .
|
||||||
@ -6511,9 +6463,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmsrom.h linux.dev/arch/mips/bcm
|
|||||||
+extern int srom_write(uint bus, void *curmap, osl_t *osh, uint byteoff, uint nbytes, uint16 *buf);
|
+extern int srom_write(uint bus, void *curmap, osl_t *osh, uint byteoff, uint nbytes, uint16 *buf);
|
||||||
+
|
+
|
||||||
+#endif /* _bcmsrom_h_ */
|
+#endif /* _bcmsrom_h_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/bcmutils.h linux.dev/arch/mips/bcm947xx/include/bcmutils.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/bcmutils.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/bcmutils.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/bcmutils.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/bcmutils.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/bcmutils.h 2006-01-12 00:20:30.725131750 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/bcmutils.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,308 @@
|
@@ -0,0 +1,308 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc useful os-independent macros and functions.
|
+ * Misc useful os-independent macros and functions.
|
||||||
@ -6823,9 +6775,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmutils.h linux.dev/arch/mips/bc
|
|||||||
+extern uint bcm_mkiovar(char *name, char *data, uint datalen, char *buf, uint len);
|
+extern uint bcm_mkiovar(char *name, char *data, uint datalen, char *buf, uint len);
|
||||||
+
|
+
|
||||||
+#endif /* _bcmutils_h_ */
|
+#endif /* _bcmutils_h_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/bitfuncs.h linux.dev/arch/mips/bcm947xx/include/bitfuncs.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/bitfuncs.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/bitfuncs.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/bitfuncs.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/bitfuncs.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/bitfuncs.h 2006-01-12 00:20:30.729132000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/bitfuncs.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,85 @@
|
@@ -0,0 +1,85 @@
|
||||||
+/*
|
+/*
|
||||||
+ * bit manipulation utility functions
|
+ * bit manipulation utility functions
|
||||||
@ -6912,9 +6864,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bitfuncs.h linux.dev/arch/mips/bc
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+#endif /* _BITFUNCS_H */
|
+#endif /* _BITFUNCS_H */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/flash.h linux.dev/arch/mips/bcm947xx/include/flash.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/flash.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/flash.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/flash.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/flash.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/flash.h 2006-01-12 00:20:30.729132000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/flash.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,188 @@
|
@@ -0,0 +1,188 @@
|
||||||
+/*
|
+/*
|
||||||
+ * flash.h: Common definitions for flash access.
|
+ * flash.h: Common definitions for flash access.
|
||||||
@ -7104,9 +7056,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/flash.h linux.dev/arch/mips/bcm94
|
|||||||
+extern flash_desc_t flashes[];
|
+extern flash_desc_t flashes[];
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/flashutl.h linux.dev/arch/mips/bcm947xx/include/flashutl.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/flashutl.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/flashutl.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/flashutl.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/flashutl.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/flashutl.h 2006-01-12 00:20:30.729132000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/flashutl.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,27 @@
|
@@ -0,0 +1,27 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM47XX FLASH driver interface
|
+ * BCM47XX FLASH driver interface
|
||||||
@ -7135,9 +7087,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/flashutl.h linux.dev/arch/mips/bc
|
|||||||
+#endif /* _LANGUAGE_ASSEMBLY */
|
+#endif /* _LANGUAGE_ASSEMBLY */
|
||||||
+
|
+
|
||||||
+#endif /* _flashutl_h_ */
|
+#endif /* _flashutl_h_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/hndmips.h linux.dev/arch/mips/bcm947xx/include/hndmips.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/hndmips.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/hndmips.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/hndmips.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/hndmips.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/hndmips.h 2006-01-12 00:20:30.729132000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/hndmips.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,16 @@
|
@@ -0,0 +1,16 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Alternate include file for HND sbmips.h since CFE also ships with
|
+ * Alternate include file for HND sbmips.h since CFE also ships with
|
||||||
@ -7155,9 +7107,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/hndmips.h linux.dev/arch/mips/bcm
|
|||||||
+ */
|
+ */
|
||||||
+
|
+
|
||||||
+#include "sbmips.h"
|
+#include "sbmips.h"
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/linux_osl.h linux.dev/arch/mips/bcm947xx/include/linux_osl.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/linux_osl.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/linux_osl.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/linux_osl.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/linux_osl.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/linux_osl.h 2006-01-12 00:20:30.729132000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/linux_osl.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,331 @@
|
@@ -0,0 +1,331 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Linux OS Independent Layer
|
+ * Linux OS Independent Layer
|
||||||
@ -7490,9 +7442,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/linux_osl.h linux.dev/arch/mips/b
|
|||||||
+#define PKTBUFSZ 2048
|
+#define PKTBUFSZ 2048
|
||||||
+
|
+
|
||||||
+#endif /* _linux_osl_h_ */
|
+#endif /* _linux_osl_h_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/linuxver.h linux.dev/arch/mips/bcm947xx/include/linuxver.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/linuxver.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/linuxver.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/linuxver.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/linuxver.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/linuxver.h 2006-01-12 00:20:30.729132000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/linuxver.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,389 @@
|
@@ -0,0 +1,389 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Linux-specific abstractions to gain some independence from linux kernel versions.
|
+ * Linux-specific abstractions to gain some independence from linux kernel versions.
|
||||||
@ -7883,9 +7835,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/linuxver.h linux.dev/arch/mips/bc
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+#endif /* _linuxver_h_ */
|
+#endif /* _linuxver_h_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/mipsinc.h linux.dev/arch/mips/bcm947xx/include/mipsinc.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/mipsinc.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/mipsinc.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/mipsinc.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/mipsinc.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/mipsinc.h 2006-01-12 00:20:30.733132250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/mipsinc.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,552 @@
|
@@ -0,0 +1,552 @@
|
||||||
+/*
|
+/*
|
||||||
+ * HND Run Time Environment for standalone MIPS programs.
|
+ * HND Run Time Environment for standalone MIPS programs.
|
||||||
@ -8439,9 +8391,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/mipsinc.h linux.dev/arch/mips/bcm
|
|||||||
+#endif /* !_LANGUAGE_ASSEMBLY */
|
+#endif /* !_LANGUAGE_ASSEMBLY */
|
||||||
+
|
+
|
||||||
+#endif /* _MISPINC_H */
|
+#endif /* _MISPINC_H */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/osl.h linux.dev/arch/mips/bcm947xx/include/osl.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/osl.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/osl.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/osl.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/osl.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/osl.h 2006-01-12 00:20:30.733132250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/osl.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,42 @@
|
@@ -0,0 +1,42 @@
|
||||||
+/*
|
+/*
|
||||||
+ * OS Abstraction Layer
|
+ * OS Abstraction Layer
|
||||||
@ -8485,9 +8437,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/osl.h linux.dev/arch/mips/bcm947x
|
|||||||
+#define MAXPRIO 7 /* 0-7 */
|
+#define MAXPRIO 7 /* 0-7 */
|
||||||
+
|
+
|
||||||
+#endif /* _osl_h_ */
|
+#endif /* _osl_h_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/pcicfg.h linux.dev/arch/mips/bcm947xx/include/pcicfg.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/pcicfg.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/pcicfg.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/pcicfg.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/pcicfg.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/pcicfg.h 2006-01-12 00:20:30.733132250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/pcicfg.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,398 @@
|
@@ -0,0 +1,398 @@
|
||||||
+/*
|
+/*
|
||||||
+ * pcicfg.h: PCI configuration constants and structures.
|
+ * pcicfg.h: PCI configuration constants and structures.
|
||||||
@ -8887,9 +8839,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/pcicfg.h linux.dev/arch/mips/bcm9
|
|||||||
+#define PCI_CFG_CMD_STAT_TA 0x08000000 /* target abort status */
|
+#define PCI_CFG_CMD_STAT_TA 0x08000000 /* target abort status */
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/proto/ethernet.h linux.dev/arch/mips/bcm947xx/include/proto/ethernet.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/proto/ethernet.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/proto/ethernet.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/proto/ethernet.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/proto/ethernet.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/proto/ethernet.h 2006-01-12 00:20:30.733132250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/proto/ethernet.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,145 @@
|
@@ -0,0 +1,145 @@
|
||||||
+/*******************************************************************************
|
+/*******************************************************************************
|
||||||
+ * $Id$
|
+ * $Id$
|
||||||
@ -9036,9 +8988,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/proto/ethernet.h linux.dev/arch/m
|
|||||||
+#undef PACKED
|
+#undef PACKED
|
||||||
+
|
+
|
||||||
+#endif /* _NET_ETHERNET_H_ */
|
+#endif /* _NET_ETHERNET_H_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/s5.h linux.dev/arch/mips/bcm947xx/include/s5.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/s5.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/s5.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/s5.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/s5.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/s5.h 2006-01-12 00:20:30.733132250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/s5.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,103 @@
|
@@ -0,0 +1,103 @@
|
||||||
+#ifndef _S5_H_
|
+#ifndef _S5_H_
|
||||||
+#define _S5_H_
|
+#define _S5_H_
|
||||||
@ -9143,9 +9095,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/s5.h linux.dev/arch/mips/bcm947xx
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+#endif /*!_S5_H_ */
|
+#endif /*!_S5_H_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/sbchipc.h linux.dev/arch/mips/bcm947xx/include/sbchipc.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/sbchipc.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbchipc.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/sbchipc.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/sbchipc.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/sbchipc.h 2006-01-12 00:20:30.733132250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbchipc.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,440 @@
|
@@ -0,0 +1,440 @@
|
||||||
+/*
|
+/*
|
||||||
+ * SiliconBackplane Chipcommon core hardware definitions.
|
+ * SiliconBackplane Chipcommon core hardware definitions.
|
||||||
@ -9587,9 +9539,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbchipc.h linux.dev/arch/mips/bcm
|
|||||||
+#define OTP_MAGIC 0x4e56
|
+#define OTP_MAGIC 0x4e56
|
||||||
+
|
+
|
||||||
+#endif /* _SBCHIPC_H */
|
+#endif /* _SBCHIPC_H */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/sbconfig.h linux.dev/arch/mips/bcm947xx/include/sbconfig.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/sbconfig.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbconfig.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/sbconfig.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/sbconfig.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/sbconfig.h 2006-01-12 00:20:30.737132500 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbconfig.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,342 @@
|
@@ -0,0 +1,342 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Broadcom SiliconBackplane hardware register definitions.
|
+ * Broadcom SiliconBackplane hardware register definitions.
|
||||||
@ -9933,9 +9885,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbconfig.h linux.dev/arch/mips/bc
|
|||||||
+#define BISZ_SIZE 7 /* descriptor size in 32-bit intergers */
|
+#define BISZ_SIZE 7 /* descriptor size in 32-bit intergers */
|
||||||
+
|
+
|
||||||
+#endif /* _SBCONFIG_H */
|
+#endif /* _SBCONFIG_H */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/sbextif.h linux.dev/arch/mips/bcm947xx/include/sbextif.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/sbextif.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbextif.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/sbextif.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/sbextif.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/sbextif.h 2006-01-12 00:20:30.737132500 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbextif.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,242 @@
|
@@ -0,0 +1,242 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Hardware-specific External Interface I/O core definitions
|
+ * Hardware-specific External Interface I/O core definitions
|
||||||
@ -10179,9 +10131,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbextif.h linux.dev/arch/mips/bcm
|
|||||||
+#define CC_CLOCK_BASE 24000000 /* Half the clock freq. in the 4710 */
|
+#define CC_CLOCK_BASE 24000000 /* Half the clock freq. in the 4710 */
|
||||||
+
|
+
|
||||||
+#endif /* _SBEXTIF_H */
|
+#endif /* _SBEXTIF_H */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/sbmemc.h linux.dev/arch/mips/bcm947xx/include/sbmemc.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/sbmemc.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbmemc.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/sbmemc.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/sbmemc.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/sbmemc.h 2006-01-12 00:20:30.737132500 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbmemc.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,148 @@
|
@@ -0,0 +1,148 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM47XX Sonics SiliconBackplane DDR/SDRAM controller core hardware definitions.
|
+ * BCM47XX Sonics SiliconBackplane DDR/SDRAM controller core hardware definitions.
|
||||||
@ -10331,9 +10283,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbmemc.h linux.dev/arch/mips/bcm9
|
|||||||
+#define MEMC_CONFIG_DDR 0x00000001
|
+#define MEMC_CONFIG_DDR 0x00000001
|
||||||
+
|
+
|
||||||
+#endif /* _SBMEMC_H */
|
+#endif /* _SBMEMC_H */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/sbmips.h linux.dev/arch/mips/bcm947xx/include/sbmips.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/sbmips.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbmips.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/sbmips.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/sbmips.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/sbmips.h 2006-01-12 00:20:30.737132500 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbmips.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,62 @@
|
@@ -0,0 +1,62 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Broadcom SiliconBackplane MIPS definitions
|
+ * Broadcom SiliconBackplane MIPS definitions
|
||||||
@ -10397,9 +10349,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbmips.h linux.dev/arch/mips/bcm9
|
|||||||
+#endif /* _LANGUAGE_ASSEMBLY */
|
+#endif /* _LANGUAGE_ASSEMBLY */
|
||||||
+
|
+
|
||||||
+#endif /* _SBMIPS_H */
|
+#endif /* _SBMIPS_H */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/sbpci.h linux.dev/arch/mips/bcm947xx/include/sbpci.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/sbpci.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbpci.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/sbpci.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/sbpci.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/sbpci.h 2006-01-12 00:20:30.737132500 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbpci.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,122 @@
|
@@ -0,0 +1,122 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM47XX Sonics SiliconBackplane PCI core hardware definitions.
|
+ * BCM47XX Sonics SiliconBackplane PCI core hardware definitions.
|
||||||
@ -10523,9 +10475,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbpci.h linux.dev/arch/mips/bcm94
|
|||||||
+#endif /* !_LANGUAGE_ASSEMBLY */
|
+#endif /* !_LANGUAGE_ASSEMBLY */
|
||||||
+
|
+
|
||||||
+#endif /* _SBPCI_H */
|
+#endif /* _SBPCI_H */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/sbsdram.h linux.dev/arch/mips/bcm947xx/include/sbsdram.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/sbsdram.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbsdram.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/sbsdram.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/sbsdram.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/sbsdram.h 2006-01-12 00:20:30.737132500 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbsdram.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,75 @@
|
@@ -0,0 +1,75 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM47XX Sonics SiliconBackplane SDRAM controller core hardware definitions.
|
+ * BCM47XX Sonics SiliconBackplane SDRAM controller core hardware definitions.
|
||||||
@ -10602,9 +10554,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbsdram.h linux.dev/arch/mips/bcm
|
|||||||
+#define MEM8MX16X2 0xc29 /* 32 MB */
|
+#define MEM8MX16X2 0xc29 /* 32 MB */
|
||||||
+
|
+
|
||||||
+#endif /* _SBSDRAM_H */
|
+#endif /* _SBSDRAM_H */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/sbutils.h linux.dev/arch/mips/bcm947xx/include/sbutils.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/sbutils.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbutils.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/sbutils.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/sbutils.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/sbutils.h 2006-01-12 00:20:30.737132500 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/sbutils.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,136 @@
|
@@ -0,0 +1,136 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc utility routines for accessing chip-specific features
|
+ * Misc utility routines for accessing chip-specific features
|
||||||
@ -10742,9 +10694,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbutils.h linux.dev/arch/mips/bcm
|
|||||||
+#define SB_DEVPATH_BUFSZ 16 /* min buffer size in bytes */
|
+#define SB_DEVPATH_BUFSZ 16 /* min buffer size in bytes */
|
||||||
+
|
+
|
||||||
+#endif /* _sbutils_h_ */
|
+#endif /* _sbutils_h_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/sflash.h linux.dev/arch/mips/bcm947xx/include/sflash.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/sflash.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/sflash.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/sflash.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/sflash.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/sflash.h 2006-01-12 00:20:30.745133000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/sflash.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,36 @@
|
@@ -0,0 +1,36 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Broadcom SiliconBackplane chipcommon serial flash interface
|
+ * Broadcom SiliconBackplane chipcommon serial flash interface
|
||||||
@ -10782,9 +10734,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sflash.h linux.dev/arch/mips/bcm9
|
|||||||
+extern struct sflash * sflash_init(chipcregs_t *cc);
|
+extern struct sflash * sflash_init(chipcregs_t *cc);
|
||||||
+
|
+
|
||||||
+#endif /* _sflash_h_ */
|
+#endif /* _sflash_h_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/trxhdr.h linux.dev/arch/mips/bcm947xx/include/trxhdr.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/trxhdr.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/trxhdr.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/trxhdr.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/trxhdr.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/trxhdr.h 2006-01-12 00:20:30.745133000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/trxhdr.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,33 @@
|
@@ -0,0 +1,33 @@
|
||||||
+/*
|
+/*
|
||||||
+ * TRX image file header format.
|
+ * TRX image file header format.
|
||||||
@ -10819,9 +10771,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/trxhdr.h linux.dev/arch/mips/bcm9
|
|||||||
+
|
+
|
||||||
+/* Compatibility */
|
+/* Compatibility */
|
||||||
+typedef struct trx_header TRXHDR, *PTRXHDR;
|
+typedef struct trx_header TRXHDR, *PTRXHDR;
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/include/typedefs.h linux.dev/arch/mips/bcm947xx/include/typedefs.h
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/include/typedefs.h linux-2.6.16-owrt/arch/mips/bcm947xx/include/typedefs.h
|
||||||
--- linux.old/arch/mips/bcm947xx/include/typedefs.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/include/typedefs.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/include/typedefs.h 2006-01-12 00:20:30.745133000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/include/typedefs.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,326 @@
|
@@ -0,0 +1,326 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright 2005, Broadcom Corporation
|
+ * Copyright 2005, Broadcom Corporation
|
||||||
@ -11149,9 +11101,9 @@ diff -urN linux.old/arch/mips/bcm947xx/include/typedefs.h linux.dev/arch/mips/bc
|
|||||||
+#endif /* USE_TYPEDEF_DEFAULTS */
|
+#endif /* USE_TYPEDEF_DEFAULTS */
|
||||||
+
|
+
|
||||||
+#endif /* _TYPEDEFS_H_ */
|
+#endif /* _TYPEDEFS_H_ */
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/int-handler.S linux.dev/arch/mips/bcm947xx/int-handler.S
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/int-handler.S linux-2.6.16-owrt/arch/mips/bcm947xx/int-handler.S
|
||||||
--- linux.old/arch/mips/bcm947xx/int-handler.S 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/int-handler.S 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/int-handler.S 2006-01-12 00:20:30.745133000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/int-handler.S 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,48 @@
|
@@ -0,0 +1,48 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
||||||
@ -11201,9 +11153,9 @@ diff -urN linux.old/arch/mips/bcm947xx/int-handler.S linux.dev/arch/mips/bcm947x
|
|||||||
+ nop
|
+ nop
|
||||||
+
|
+
|
||||||
+ END(bcm47xx_irq_handler)
|
+ END(bcm47xx_irq_handler)
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/irq.c linux.dev/arch/mips/bcm947xx/irq.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/irq.c linux-2.6.16-owrt/arch/mips/bcm947xx/irq.c
|
||||||
--- linux.old/arch/mips/bcm947xx/irq.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/irq.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/irq.c 2006-01-12 00:20:30.745133000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/irq.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,67 @@
|
@@ -0,0 +1,67 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
||||||
@ -11272,9 +11224,19 @@ diff -urN linux.old/arch/mips/bcm947xx/irq.c linux.dev/arch/mips/bcm947xx/irq.c
|
|||||||
+ set_except_vector(0, bcm47xx_irq_handler);
|
+ set_except_vector(0, bcm47xx_irq_handler);
|
||||||
+ mips_cpu_irq_init(0);
|
+ mips_cpu_irq_init(0);
|
||||||
+}
|
+}
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/pci.c linux.dev/arch/mips/bcm947xx/pci.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/Makefile linux-2.6.16-owrt/arch/mips/bcm947xx/Makefile
|
||||||
--- linux.old/arch/mips/bcm947xx/pci.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/Makefile 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/pci.c 2006-01-12 00:20:30.745133000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/Makefile 2006-03-21 09:31:00.000000000 +0100
|
||||||
|
@@ -0,0 +1,6 @@
|
||||||
|
+#
|
||||||
|
+# Makefile for the BCM47xx specific kernel interface routines
|
||||||
|
+# under Linux.
|
||||||
|
+#
|
||||||
|
+
|
||||||
|
+obj-y := irq.o int-handler.o prom.o setup.o time.o pci.o
|
||||||
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/pci.c linux-2.6.16-owrt/arch/mips/bcm947xx/pci.c
|
||||||
|
--- linux-2.6.16/arch/mips/bcm947xx/pci.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/pci.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,215 @@
|
@@ -0,0 +1,215 @@
|
||||||
+#include <linux/kernel.h>
|
+#include <linux/kernel.h>
|
||||||
+#include <linux/init.h>
|
+#include <linux/init.h>
|
||||||
@ -11491,9 +11453,9 @@ diff -urN linux.old/arch/mips/bcm947xx/pci.c linux.dev/arch/mips/bcm947xx/pci.c
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, bcm47xx_fixup_bridge);
|
+DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, bcm47xx_fixup_bridge);
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/prom.c linux.dev/arch/mips/bcm947xx/prom.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/prom.c linux-2.6.16-owrt/arch/mips/bcm947xx/prom.c
|
||||||
--- linux.old/arch/mips/bcm947xx/prom.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/prom.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/prom.c 2006-01-12 00:20:30.745133000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/prom.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,59 @@
|
@@ -0,0 +1,59 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
||||||
@ -11554,10 +11516,10 @@ diff -urN linux.old/arch/mips/bcm947xx/prom.c linux.dev/arch/mips/bcm947xx/prom.
|
|||||||
+{
|
+{
|
||||||
+ return 0;
|
+ return 0;
|
||||||
+}
|
+}
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/setup.c linux.dev/arch/mips/bcm947xx/setup.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/setup.c linux-2.6.16-owrt/arch/mips/bcm947xx/setup.c
|
||||||
--- linux.old/arch/mips/bcm947xx/setup.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/setup.c 2006-01-12 00:20:30.749133250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/setup.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,157 @@
|
@@ -0,0 +1,158 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
||||||
+ * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
|
+ * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
|
||||||
@ -11593,6 +11555,7 @@ diff -urN linux.old/arch/mips/bcm947xx/setup.c linux.dev/arch/mips/bcm947xx/setu
|
|||||||
+#include <asm/bootinfo.h>
|
+#include <asm/bootinfo.h>
|
||||||
+#include <asm/time.h>
|
+#include <asm/time.h>
|
||||||
+#include <asm/reboot.h>
|
+#include <asm/reboot.h>
|
||||||
|
+#include <linux/pm.h>
|
||||||
+
|
+
|
||||||
+#include <typedefs.h>
|
+#include <typedefs.h>
|
||||||
+#include <osl.h>
|
+#include <osl.h>
|
||||||
@ -11706,7 +11669,7 @@ diff -urN linux.old/arch/mips/bcm947xx/setup.c linux.dev/arch/mips/bcm947xx/setu
|
|||||||
+
|
+
|
||||||
+ _machine_restart = bcm47xx_machine_restart;
|
+ _machine_restart = bcm47xx_machine_restart;
|
||||||
+ _machine_halt = bcm47xx_machine_halt;
|
+ _machine_halt = bcm47xx_machine_halt;
|
||||||
+ _machine_power_off = bcm47xx_machine_halt;
|
+ pm_power_off = bcm47xx_machine_halt;
|
||||||
+
|
+
|
||||||
+ board_time_init = bcm47xx_time_init;
|
+ board_time_init = bcm47xx_time_init;
|
||||||
+ board_timer_setup = bcm47xx_timer_setup;
|
+ board_timer_setup = bcm47xx_timer_setup;
|
||||||
@ -11715,9 +11678,9 @@ diff -urN linux.old/arch/mips/bcm947xx/setup.c linux.dev/arch/mips/bcm947xx/setu
|
|||||||
+EXPORT_SYMBOL(sbh);
|
+EXPORT_SYMBOL(sbh);
|
||||||
+EXPORT_SYMBOL(sbh_lock);
|
+EXPORT_SYMBOL(sbh_lock);
|
||||||
+EXPORT_SYMBOL(boardflags);
|
+EXPORT_SYMBOL(boardflags);
|
||||||
diff -urN linux.old/arch/mips/bcm947xx/time.c linux.dev/arch/mips/bcm947xx/time.c
|
diff -Nur linux-2.6.16/arch/mips/bcm947xx/time.c linux-2.6.16-owrt/arch/mips/bcm947xx/time.c
|
||||||
--- linux.old/arch/mips/bcm947xx/time.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/arch/mips/bcm947xx/time.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/bcm947xx/time.c 2006-01-12 00:20:30.749133250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/bcm947xx/time.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -0,0 +1,59 @@
|
@@ -0,0 +1,59 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
||||||
@ -11778,10 +11741,31 @@ diff -urN linux.old/arch/mips/bcm947xx/time.c linux.dev/arch/mips/bcm947xx/time.
|
|||||||
+ /* Enable the timer interrupt */
|
+ /* Enable the timer interrupt */
|
||||||
+ setup_irq(7, irq);
|
+ setup_irq(7, irq);
|
||||||
+}
|
+}
|
||||||
diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-probe.c
|
diff -Nur linux-2.6.16/arch/mips/Kconfig linux-2.6.16-owrt/arch/mips/Kconfig
|
||||||
--- linux.old/arch/mips/kernel/cpu-probe.c 2006-01-12 00:25:32.684003000 +0100
|
--- linux-2.6.16/arch/mips/Kconfig 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/kernel/cpu-probe.c 2006-01-12 00:20:30.757133750 +0100
|
+++ linux-2.6.16-owrt/arch/mips/Kconfig 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -656,6 +656,28 @@
|
@@ -244,6 +244,17 @@
|
||||||
|
Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
|
||||||
|
Olivetti M700-10 workstations.
|
||||||
|
|
||||||
|
+config BCM947XX
|
||||||
|
+ bool "Support for BCM947xx based boards"
|
||||||
|
+ select DMA_NONCOHERENT
|
||||||
|
+ select HW_HAS_PCI
|
||||||
|
+ select IRQ_CPU
|
||||||
|
+ select SYS_HAS_CPU_MIPS32_R1
|
||||||
|
+ select SYS_SUPPORTS_32BIT_KERNEL
|
||||||
|
+ select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||||
|
+ help
|
||||||
|
+ Support for BCM947xx based boards
|
||||||
|
+
|
||||||
|
config LASAT
|
||||||
|
bool "Support for LASAT Networks platforms"
|
||||||
|
select DMA_NONCOHERENT
|
||||||
|
diff -Nur linux-2.6.16/arch/mips/kernel/cpu-probe.c linux-2.6.16-owrt/arch/mips/kernel/cpu-probe.c
|
||||||
|
--- linux-2.6.16/arch/mips/kernel/cpu-probe.c 2006-03-20 06:53:29.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/arch/mips/kernel/cpu-probe.c 2006-03-21 09:32:48.000000000 +0100
|
||||||
|
@@ -678,6 +678,28 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -11791,13 +11775,13 @@ diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-
|
|||||||
+ switch (c->processor_id & 0xff00) {
|
+ switch (c->processor_id & 0xff00) {
|
||||||
+ case PRID_IMP_BCM3302:
|
+ case PRID_IMP_BCM3302:
|
||||||
+ c->cputype = CPU_BCM3302;
|
+ c->cputype = CPU_BCM3302;
|
||||||
+ c->isa_level = MIPS_CPU_ISA_M32;
|
+ c->isa_level = MIPS_CPU_ISA_M32R1;
|
||||||
+ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
|
+ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
|
||||||
+ MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER;
|
+ MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER;
|
||||||
+ break;
|
+ break;
|
||||||
+ case PRID_IMP_BCM4710:
|
+ case PRID_IMP_BCM4710:
|
||||||
+ c->cputype = CPU_BCM4710;
|
+ c->cputype = CPU_BCM4710;
|
||||||
+ c->isa_level = MIPS_CPU_ISA_M32;
|
+ c->isa_level = MIPS_CPU_ISA_M32R1;
|
||||||
+ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
|
+ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
|
||||||
+ MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER;
|
+ MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER;
|
||||||
+ break;
|
+ break;
|
||||||
@ -11810,7 +11794,7 @@ diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-
|
|||||||
__init void cpu_probe(void)
|
__init void cpu_probe(void)
|
||||||
{
|
{
|
||||||
struct cpuinfo_mips *c = ¤t_cpu_data;
|
struct cpuinfo_mips *c = ¤t_cpu_data;
|
||||||
@@ -678,6 +700,9 @@
|
@@ -700,6 +722,9 @@
|
||||||
case PRID_COMP_SIBYTE:
|
case PRID_COMP_SIBYTE:
|
||||||
cpu_probe_sibyte(c);
|
cpu_probe_sibyte(c);
|
||||||
break;
|
break;
|
||||||
@ -11820,9 +11804,9 @@ diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-
|
|||||||
case PRID_COMP_SANDCRAFT:
|
case PRID_COMP_SANDCRAFT:
|
||||||
cpu_probe_sandcraft(c);
|
cpu_probe_sandcraft(c);
|
||||||
break;
|
break;
|
||||||
diff -urN linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
|
diff -Nur linux-2.6.16/arch/mips/kernel/head.S linux-2.6.16-owrt/arch/mips/kernel/head.S
|
||||||
--- linux.old/arch/mips/kernel/head.S 2006-01-12 00:25:32.684003000 +0100
|
--- linux-2.6.16/arch/mips/kernel/head.S 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/kernel/head.S 2006-01-12 00:20:30.761134000 +0100
|
+++ linux-2.6.16-owrt/arch/mips/kernel/head.S 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -107,6 +107,14 @@
|
@@ -107,6 +107,14 @@
|
||||||
#endif
|
#endif
|
||||||
.endm
|
.endm
|
||||||
@ -11838,9 +11822,9 @@ diff -urN linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
|
|||||||
/*
|
/*
|
||||||
* Reserved space for exception handlers.
|
* Reserved space for exception handlers.
|
||||||
* Necessary for machines which link their kernels at KSEG0.
|
* Necessary for machines which link their kernels at KSEG0.
|
||||||
diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c
|
diff -Nur linux-2.6.16/arch/mips/kernel/proc.c linux-2.6.16-owrt/arch/mips/kernel/proc.c
|
||||||
--- linux.old/arch/mips/kernel/proc.c 2006-01-12 00:25:32.692003500 +0100
|
--- linux-2.6.16/arch/mips/kernel/proc.c 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/kernel/proc.c 2006-01-12 00:20:30.765134250 +0100
|
+++ linux-2.6.16-owrt/arch/mips/kernel/proc.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -82,6 +82,8 @@
|
@@ -82,6 +82,8 @@
|
||||||
[CPU_VR4181] = "NEC VR4181",
|
[CPU_VR4181] = "NEC VR4181",
|
||||||
[CPU_VR4181A] = "NEC VR4181A",
|
[CPU_VR4181A] = "NEC VR4181A",
|
||||||
@ -11850,10 +11834,27 @@ diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c
|
|||||||
[CPU_PR4450] = "Philips PR4450",
|
[CPU_PR4450] = "Philips PR4450",
|
||||||
};
|
};
|
||||||
|
|
||||||
diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
|
diff -Nur linux-2.6.16/arch/mips/Makefile linux-2.6.16-owrt/arch/mips/Makefile
|
||||||
--- linux.old/arch/mips/mm/tlbex.c 2006-01-12 00:25:32.796010000 +0100
|
--- linux-2.6.16/arch/mips/Makefile 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/mm/tlbex.c 2006-01-12 00:20:31.137157500 +0100
|
+++ linux-2.6.16-owrt/arch/mips/Makefile 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -862,6 +862,8 @@
|
@@ -710,6 +710,13 @@
|
||||||
|
load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000
|
||||||
|
|
||||||
|
#
|
||||||
|
+# Broadcom BCM47XX boards
|
||||||
|
+#
|
||||||
|
+core-$(CONFIG_BCM947XX) += arch/mips/bcm947xx/ arch/mips/bcm947xx/broadcom/
|
||||||
|
+cflags-$(CONFIG_BCM947XX) += -Iarch/mips/bcm947xx/include
|
||||||
|
+load-$(CONFIG_BCM947XX) := 0xffffffff80001000
|
||||||
|
+
|
||||||
|
+#
|
||||||
|
# SNI RM200 PCI
|
||||||
|
#
|
||||||
|
core-$(CONFIG_SNI_RM200_PCI) += arch/mips/sni/
|
||||||
|
diff -Nur linux-2.6.16/arch/mips/mm/tlbex.c linux-2.6.16-owrt/arch/mips/mm/tlbex.c
|
||||||
|
--- linux-2.6.16/arch/mips/mm/tlbex.c 2006-03-20 06:53:29.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/arch/mips/mm/tlbex.c 2006-03-21 09:31:00.000000000 +0100
|
||||||
|
@@ -858,6 +858,8 @@
|
||||||
case CPU_4KSC:
|
case CPU_4KSC:
|
||||||
case CPU_20KC:
|
case CPU_20KC:
|
||||||
case CPU_25KF:
|
case CPU_25KF:
|
||||||
@ -11862,9 +11863,9 @@ diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
|
|||||||
tlbw(p);
|
tlbw(p);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
|
diff -Nur linux-2.6.16/include/asm-mips/bootinfo.h linux-2.6.16-owrt/include/asm-mips/bootinfo.h
|
||||||
--- linux.old/include/asm-mips/bootinfo.h 2006-01-12 00:25:32.800010250 +0100
|
--- linux-2.6.16/include/asm-mips/bootinfo.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/bootinfo.h 2006-01-12 00:20:30.777135000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/bootinfo.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -218,6 +218,12 @@
|
@@ -218,6 +218,12 @@
|
||||||
#define MACH_GROUP_TITAN 22 /* PMC-Sierra Titan */
|
#define MACH_GROUP_TITAN 22 /* PMC-Sierra Titan */
|
||||||
#define MACH_TITAN_YOSEMITE 1 /* PMC-Sierra Yosemite */
|
#define MACH_TITAN_YOSEMITE 1 /* PMC-Sierra Yosemite */
|
||||||
@ -11878,9 +11879,9 @@ diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/booti
|
|||||||
#define CL_SIZE COMMAND_LINE_SIZE
|
#define CL_SIZE COMMAND_LINE_SIZE
|
||||||
|
|
||||||
const char *get_system_type(void);
|
const char *get_system_type(void);
|
||||||
diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
|
diff -Nur linux-2.6.16/include/asm-mips/cpu.h linux-2.6.16-owrt/include/asm-mips/cpu.h
|
||||||
--- linux.old/include/asm-mips/cpu.h 2006-01-12 00:25:32.800010250 +0100
|
--- linux-2.6.16/include/asm-mips/cpu.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/cpu.h 2006-01-12 00:20:30.777135000 +0100
|
+++ linux-2.6.16-owrt/include/asm-mips/cpu.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -102,6 +102,13 @@
|
@@ -102,6 +102,13 @@
|
||||||
#define PRID_IMP_SR71000 0x0400
|
#define PRID_IMP_SR71000 0x0400
|
||||||
|
|
||||||
@ -11906,9 +11907,9 @@ diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* ISA Level encodings
|
* ISA Level encodings
|
||||||
diff -urN linux.old/include/linux/init.h linux.dev/include/linux/init.h
|
diff -Nur linux-2.6.16/include/linux/init.h linux-2.6.16-owrt/include/linux/init.h
|
||||||
--- linux.old/include/linux/init.h 2006-01-12 00:25:32.828012000 +0100
|
--- linux-2.6.16/include/linux/init.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/include/linux/init.h 2006-01-12 00:20:30.777135000 +0100
|
+++ linux-2.6.16-owrt/include/linux/init.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -86,6 +86,8 @@
|
@@ -86,6 +86,8 @@
|
||||||
static initcall_t __initcall_##fn __attribute_used__ \
|
static initcall_t __initcall_##fn __attribute_used__ \
|
||||||
__attribute__((__section__(".initcall" level ".init"))) = fn
|
__attribute__((__section__(".initcall" level ".init"))) = fn
|
||||||
@ -11918,10 +11919,10 @@ diff -urN linux.old/include/linux/init.h linux.dev/include/linux/init.h
|
|||||||
#define core_initcall(fn) __define_initcall("1",fn)
|
#define core_initcall(fn) __define_initcall("1",fn)
|
||||||
#define postcore_initcall(fn) __define_initcall("2",fn)
|
#define postcore_initcall(fn) __define_initcall("2",fn)
|
||||||
#define arch_initcall(fn) __define_initcall("3",fn)
|
#define arch_initcall(fn) __define_initcall("3",fn)
|
||||||
diff -urN linux.old/include/linux/pci_ids.h linux.dev/include/linux/pci_ids.h
|
diff -Nur linux-2.6.16/include/linux/pci_ids.h linux-2.6.16-owrt/include/linux/pci_ids.h
|
||||||
--- linux.old/include/linux/pci_ids.h 2006-01-12 00:25:32.828012000 +0100
|
--- linux-2.6.16/include/linux/pci_ids.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/include/linux/pci_ids.h 2006-01-12 00:20:30.781135250 +0100
|
+++ linux-2.6.16-owrt/include/linux/pci_ids.h 2006-03-21 09:31:00.000000000 +0100
|
||||||
@@ -1836,6 +1836,7 @@
|
@@ -1885,6 +1885,7 @@
|
||||||
#define PCI_DEVICE_ID_TIGON3_5901_2 0x170e
|
#define PCI_DEVICE_ID_TIGON3_5901_2 0x170e
|
||||||
#define PCI_DEVICE_ID_BCM4401 0x4401
|
#define PCI_DEVICE_ID_BCM4401 0x4401
|
||||||
#define PCI_DEVICE_ID_BCM4401B0 0x4402
|
#define PCI_DEVICE_ID_BCM4401B0 0x4402
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
diff -urN linux.old/include/linux/netfilter_ipv4/ip_conntrack.h linux.dev/include/linux/netfilter_ipv4/ip_conntrack.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_conntrack.h
|
||||||
--- linux.old/include/linux/netfilter_ipv4/ip_conntrack.h 2006-01-31 20:18:24.952957500 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/include/linux/netfilter_ipv4/ip_conntrack.h 2006-01-31 19:52:21.869393000 +0100
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_conntrack.h 2006-03-20 13:48:06.000000000 +0100
|
||||||
@@ -122,6 +122,15 @@
|
@@ -122,6 +122,15 @@
|
||||||
/* Traversed often, so hopefully in different cacheline to top */
|
/* Traversed often, so hopefully in different cacheline to top */
|
||||||
/* These are my tuples; original and reply */
|
/* These are my tuples; original and reply */
|
||||||
@ -17,9 +17,9 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ip_conntrack.h linux.dev/includ
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct ip_conntrack_expect
|
struct ip_conntrack_expect
|
||||||
diff -urN linux.old/include/linux/netfilter_ipv4/ipt_layer7.h linux.dev/include/linux/netfilter_ipv4/ipt_layer7.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ipt_layer7.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ipt_layer7.h
|
||||||
--- linux.old/include/linux/netfilter_ipv4/ipt_layer7.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ipt_layer7.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/linux/netfilter_ipv4/ipt_layer7.h 2006-01-31 20:04:29.500745000 +0100
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ipt_layer7.h 2006-03-20 13:48:06.000000000 +0100
|
||||||
@@ -0,0 +1,27 @@
|
@@ -0,0 +1,27 @@
|
||||||
+/*
|
+/*
|
||||||
+ By Matthew Strait <quadong@users.sf.net>, Dec 2003.
|
+ By Matthew Strait <quadong@users.sf.net>, Dec 2003.
|
||||||
@ -48,49 +48,9 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ipt_layer7.h linux.dev/include/
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif /* _IPT_LAYER7_H */
|
+#endif /* _IPT_LAYER7_H */
|
||||||
diff -urN linux.old/net/ipv4/netfilter/Kconfig linux.dev/net/ipv4/netfilter/Kconfig
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ip_conntrack_core.c linux-2.6.16-owrt/net/ipv4/netfilter/ip_conntrack_core.c
|
||||||
--- linux.old/net/ipv4/netfilter/Kconfig 2006-01-31 20:18:24.960958000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ip_conntrack_core.c 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/net/ipv4/netfilter/Kconfig 2006-01-31 19:52:21.869393000 +0100
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ip_conntrack_core.c 2006-03-20 13:48:06.000000000 +0100
|
||||||
@@ -219,6 +219,24 @@
|
|
||||||
|
|
||||||
To compile it as a module, choose M here. If unsure, say N.
|
|
||||||
|
|
||||||
+config IP_NF_MATCH_LAYER7
|
|
||||||
+ tristate "Layer 7 match support (EXPERIMENTAL)"
|
|
||||||
+ depends on IP_NF_IPTABLES && IP_NF_CT_ACCT && IP_NF_CONNTRACK && EXPERIMENTAL
|
|
||||||
+ help
|
|
||||||
+ Say Y if you want to be able to classify connections (and their
|
|
||||||
+ packets) based on regular expression matching of their application
|
|
||||||
+ layer data. This is one way to classify applications such as
|
|
||||||
+ peer-to-peer filesharing systems that do not always use the same
|
|
||||||
+ port.
|
|
||||||
+
|
|
||||||
+ To compile it as a module, choose M here. If unsure, say N.
|
|
||||||
+
|
|
||||||
+config IP_NF_MATCH_LAYER7_DEBUG
|
|
||||||
+ bool "Layer 7 debugging output"
|
|
||||||
+ depends on IP_NF_MATCH_LAYER7
|
|
||||||
+ help
|
|
||||||
+ Say Y to get lots of debugging output.
|
|
||||||
+
|
|
||||||
config IP_NF_MATCH_PKTTYPE
|
|
||||||
tristate "Packet type match support"
|
|
||||||
depends on IP_NF_IPTABLES
|
|
||||||
diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Makefile
|
|
||||||
--- linux.old/net/ipv4/netfilter/Makefile 2006-01-31 20:18:24.960958000 +0100
|
|
||||||
+++ linux.dev/net/ipv4/netfilter/Makefile 2006-01-31 19:52:21.873393250 +0100
|
|
||||||
@@ -77,6 +77,8 @@
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_COMMENT) += ipt_comment.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_STRING) += ipt_string.o
|
|
||||||
|
|
||||||
+obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_layer7.o
|
|
||||||
+
|
|
||||||
# targets
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
|
|
||||||
diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_core.c linux.dev/net/ipv4/netfilter/ip_conntrack_core.c
|
|
||||||
--- linux.old/net/ipv4/netfilter/ip_conntrack_core.c 2006-01-31 20:18:24.964958250 +0100
|
|
||||||
+++ linux.dev/net/ipv4/netfilter/ip_conntrack_core.c 2006-01-31 19:52:21.873393250 +0100
|
|
||||||
@@ -339,6 +339,13 @@
|
@@ -339,6 +339,13 @@
|
||||||
* too. */
|
* too. */
|
||||||
ip_ct_remove_expectations(ct);
|
ip_ct_remove_expectations(ct);
|
||||||
@ -105,10 +65,10 @@ diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_core.c linux.dev/net/ipv4/ne
|
|||||||
/* We overload first tuple to link into unconfirmed list. */
|
/* We overload first tuple to link into unconfirmed list. */
|
||||||
if (!is_confirmed(ct)) {
|
if (!is_confirmed(ct)) {
|
||||||
BUG_ON(list_empty(&ct->tuplehash[IP_CT_DIR_ORIGINAL].list));
|
BUG_ON(list_empty(&ct->tuplehash[IP_CT_DIR_ORIGINAL].list));
|
||||||
diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c linux.dev/net/ipv4/netfilter/ip_conntrack_standalone.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ip_conntrack_standalone.c linux-2.6.16-owrt/net/ipv4/netfilter/ip_conntrack_standalone.c
|
||||||
--- linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c 2006-01-31 20:18:24.964958250 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ip_conntrack_standalone.c 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/net/ipv4/netfilter/ip_conntrack_standalone.c 2006-01-31 19:52:21.877393500 +0100
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ip_conntrack_standalone.c 2006-03-20 13:48:06.000000000 +0100
|
||||||
@@ -188,6 +188,12 @@
|
@@ -189,6 +189,12 @@
|
||||||
return -ENOSPC;
|
return -ENOSPC;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -121,9 +81,9 @@ diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c linux.dev/net/i
|
|||||||
if (seq_printf(s, "use=%u\n", atomic_read(&conntrack->ct_general.use)))
|
if (seq_printf(s, "use=%u\n", atomic_read(&conntrack->ct_general.use)))
|
||||||
return -ENOSPC;
|
return -ENOSPC;
|
||||||
|
|
||||||
diff -urN linux.old/net/ipv4/netfilter/ipt_layer7.c linux.dev/net/ipv4/netfilter/ipt_layer7.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ipt_layer7.c linux-2.6.16-owrt/net/ipv4/netfilter/ipt_layer7.c
|
||||||
--- linux.old/net/ipv4/netfilter/ipt_layer7.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ipt_layer7.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/net/ipv4/netfilter/ipt_layer7.c 2006-01-31 20:55:41.145545750 +0100
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ipt_layer7.c 2006-03-20 13:48:06.000000000 +0100
|
||||||
@@ -0,0 +1,592 @@
|
@@ -0,0 +1,592 @@
|
||||||
+/*
|
+/*
|
||||||
+ Kernel module to match application layer (OSI layer 7)
|
+ Kernel module to match application layer (OSI layer 7)
|
||||||
@ -717,9 +677,49 @@ diff -urN linux.old/net/ipv4/netfilter/ipt_layer7.c linux.dev/net/ipv4/netfilter
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.c linux.dev/net/ipv4/netfilter/regexp/regexp.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/Kconfig linux-2.6.16-owrt/net/ipv4/netfilter/Kconfig
|
||||||
--- linux.old/net/ipv4/netfilter/regexp/regexp.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/Kconfig 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux.dev/net/ipv4/netfilter/regexp/regexp.c 2006-01-31 19:52:21.885394000 +0100
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/Kconfig 2006-03-20 13:48:39.000000000 +0100
|
||||||
|
@@ -201,6 +201,24 @@
|
||||||
|
|
||||||
|
To compile it as a module, choose M here. If unsure, say N.
|
||||||
|
|
||||||
|
+config IP_NF_MATCH_LAYER7
|
||||||
|
+ tristate "Layer 7 match support (EXPERIMENTAL)"
|
||||||
|
+ depends on IP_NF_IPTABLES && IP_NF_CT_ACCT && IP_NF_CONNTRACK && EXPERIMENTAL
|
||||||
|
+ help
|
||||||
|
+ Say Y if you want to be able to classify connections (and their
|
||||||
|
+ packets) based on regular expression matching of their application
|
||||||
|
+ layer data. This is one way to classify applications such as
|
||||||
|
+ peer-to-peer filesharing systems that do not always use the same
|
||||||
|
+ port.
|
||||||
|
+
|
||||||
|
+ To compile it as a module, choose M here. If unsure, say N.
|
||||||
|
+
|
||||||
|
+config IP_NF_MATCH_LAYER7_DEBUG
|
||||||
|
+ bool "Layer 7 debugging output"
|
||||||
|
+ depends on IP_NF_MATCH_LAYER7
|
||||||
|
+ help
|
||||||
|
+ Say Y to get lots of debugging output.
|
||||||
|
+
|
||||||
|
config IP_NF_MATCH_MULTIPORT
|
||||||
|
tristate "Multiple port match support"
|
||||||
|
depends on IP_NF_IPTABLES
|
||||||
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/Makefile linux-2.6.16-owrt/net/ipv4/netfilter/Makefile
|
||||||
|
--- linux-2.6.16/net/ipv4/netfilter/Makefile 2006-03-20 06:53:29.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/Makefile 2006-03-20 13:48:06.000000000 +0100
|
||||||
|
@@ -59,6 +59,8 @@
|
||||||
|
obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
|
||||||
|
obj-$(CONFIG_IP_NF_MATCH_POLICY) += ipt_policy.o
|
||||||
|
|
||||||
|
+obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_layer7.o
|
||||||
|
+
|
||||||
|
# targets
|
||||||
|
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
|
||||||
|
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
|
||||||
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/regexp/regexp.c linux-2.6.16-owrt/net/ipv4/netfilter/regexp/regexp.c
|
||||||
|
--- linux-2.6.16/net/ipv4/netfilter/regexp/regexp.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/regexp/regexp.c 2006-03-20 13:48:06.000000000 +0100
|
||||||
@@ -0,0 +1,1195 @@
|
@@ -0,0 +1,1195 @@
|
||||||
+/*
|
+/*
|
||||||
+ * regcomp and regexec -- regsub and regerror are elsewhere
|
+ * regcomp and regexec -- regsub and regerror are elsewhere
|
||||||
@ -1916,9 +1916,9 @@ diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.c linux.dev/net/ipv4/netfil
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.h linux.dev/net/ipv4/netfilter/regexp/regexp.h
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/regexp/regexp.h linux-2.6.16-owrt/net/ipv4/netfilter/regexp/regexp.h
|
||||||
--- linux.old/net/ipv4/netfilter/regexp/regexp.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/regexp/regexp.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/net/ipv4/netfilter/regexp/regexp.h 2006-01-31 19:52:21.885394000 +0100
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/regexp/regexp.h 2006-03-20 13:48:06.000000000 +0100
|
||||||
@@ -0,0 +1,41 @@
|
@@ -0,0 +1,41 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Definitions etc. for regexp(3) routines.
|
+ * Definitions etc. for regexp(3) routines.
|
||||||
@ -1961,18 +1961,18 @@ diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.h linux.dev/net/ipv4/netfil
|
|||||||
+void regerror(char *s);
|
+void regerror(char *s);
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
diff -urN linux.old/net/ipv4/netfilter/regexp/regmagic.h linux.dev/net/ipv4/netfilter/regexp/regmagic.h
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/regexp/regmagic.h linux-2.6.16-owrt/net/ipv4/netfilter/regexp/regmagic.h
|
||||||
--- linux.old/net/ipv4/netfilter/regexp/regmagic.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/regexp/regmagic.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/net/ipv4/netfilter/regexp/regmagic.h 2006-01-31 19:52:21.885394000 +0100
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/regexp/regmagic.h 2006-03-20 13:48:06.000000000 +0100
|
||||||
@@ -0,0 +1,5 @@
|
@@ -0,0 +1,5 @@
|
||||||
+/*
|
+/*
|
||||||
+ * The first byte of the regexp internal "program" is actually this magic
|
+ * The first byte of the regexp internal "program" is actually this magic
|
||||||
+ * number; the start node begins in the second byte.
|
+ * number; the start node begins in the second byte.
|
||||||
+ */
|
+ */
|
||||||
+#define MAGIC 0234
|
+#define MAGIC 0234
|
||||||
diff -urN linux.old/net/ipv4/netfilter/regexp/regsub.c linux.dev/net/ipv4/netfilter/regexp/regsub.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/regexp/regsub.c linux-2.6.16-owrt/net/ipv4/netfilter/regexp/regsub.c
|
||||||
--- linux.old/net/ipv4/netfilter/regexp/regsub.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/regexp/regsub.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/net/ipv4/netfilter/regexp/regsub.c 2006-01-31 19:52:21.885394000 +0100
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/regexp/regsub.c 2006-03-20 13:48:06.000000000 +0100
|
||||||
@@ -0,0 +1,95 @@
|
@@ -0,0 +1,95 @@
|
||||||
+/*
|
+/*
|
||||||
+ * regsub
|
+ * regsub
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_set.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_set.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set.h 2005-09-20 13:11:38.782384000 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,489 @@
|
@@ -0,0 +1,489 @@
|
||||||
+#ifndef _IP_SET_H
|
+#ifndef _IP_SET_H
|
||||||
+#define _IP_SET_H
|
+#define _IP_SET_H
|
||||||
@ -491,9 +491,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set.h linux-2.6.12.5-ip
|
|||||||
+#endif /* __KERNEL__ */
|
+#endif /* __KERNEL__ */
|
||||||
+
|
+
|
||||||
+#endif /*_IP_SET_H*/
|
+#endif /*_IP_SET_H*/
|
||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_iphash.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_iphash.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_iphash.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iphash.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_iphash.h 2005-09-20 13:11:38.782384000 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_iphash.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,30 @@
|
@@ -0,0 +1,30 @@
|
||||||
+#ifndef __IP_SET_IPHASH_H
|
+#ifndef __IP_SET_IPHASH_H
|
||||||
+#define __IP_SET_IPHASH_H
|
+#define __IP_SET_IPHASH_H
|
||||||
@ -525,9 +525,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif /* __IP_SET_IPHASH_H */
|
+#endif /* __IP_SET_IPHASH_H */
|
||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_ipmap.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_ipmap.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_ipmap.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipmap.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_ipmap.h 2005-09-20 13:11:38.782384000 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_ipmap.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,56 @@
|
@@ -0,0 +1,56 @@
|
||||||
+#ifndef __IP_SET_IPMAP_H
|
+#ifndef __IP_SET_IPMAP_H
|
||||||
+#define __IP_SET_IPMAP_H
|
+#define __IP_SET_IPMAP_H
|
||||||
@ -585,9 +585,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.1
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#endif /* __IP_SET_IPMAP_H */
|
+#endif /* __IP_SET_IPMAP_H */
|
||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_iptree.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_iptree.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_iptree.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iptree.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_iptree.h 2005-09-20 13:11:38.782384000 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_iptree.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,39 @@
|
@@ -0,0 +1,39 @@
|
||||||
+#ifndef __IP_SET_IPTREE_H
|
+#ifndef __IP_SET_IPTREE_H
|
||||||
+#define __IP_SET_IPTREE_H
|
+#define __IP_SET_IPTREE_H
|
||||||
@ -628,9 +628,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif /* __IP_SET_IPTREE_H */
|
+#endif /* __IP_SET_IPTREE_H */
|
||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_jhash.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_jhash.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_jhash.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_set_jhash.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_jhash.h 2005-09-20 13:11:38.782384000 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_jhash.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,148 @@
|
@@ -0,0 +1,148 @@
|
||||||
+#ifndef _LINUX_IPSET_JHASH_H
|
+#ifndef _LINUX_IPSET_JHASH_H
|
||||||
+#define _LINUX_IPSET_JHASH_H
|
+#define _LINUX_IPSET_JHASH_H
|
||||||
@ -780,9 +780,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.1
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#endif /* _LINUX_IPSET_JHASH_H */
|
+#endif /* _LINUX_IPSET_JHASH_H */
|
||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_macipmap.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_macipmap.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_macipmap.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_set_macipmap.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_macipmap.h 2005-09-20 13:11:38.782384000 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_macipmap.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,38 @@
|
@@ -0,0 +1,38 @@
|
||||||
+#ifndef __IP_SET_MACIPMAP_H
|
+#ifndef __IP_SET_MACIPMAP_H
|
||||||
+#define __IP_SET_MACIPMAP_H
|
+#define __IP_SET_MACIPMAP_H
|
||||||
@ -822,9 +822,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif /* __IP_SET_MACIPMAP_H */
|
+#endif /* __IP_SET_MACIPMAP_H */
|
||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_malloc.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_malloc.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_malloc.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_set_malloc.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_malloc.h 2005-09-20 13:11:38.782384000 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_malloc.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,42 @@
|
@@ -0,0 +1,42 @@
|
||||||
+#ifndef _IP_SET_MALLOC_H
|
+#ifndef _IP_SET_MALLOC_H
|
||||||
+#define _IP_SET_MALLOC_H
|
+#define _IP_SET_MALLOC_H
|
||||||
@ -868,9 +868,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.
|
|||||||
+#endif /* __KERNEL__ */
|
+#endif /* __KERNEL__ */
|
||||||
+
|
+
|
||||||
+#endif /*_IP_SET_MALLOC_H*/
|
+#endif /*_IP_SET_MALLOC_H*/
|
||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_nethash.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_nethash.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_nethash.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_set_nethash.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_nethash.h 2005-09-20 13:11:38.782384000 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_nethash.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,55 @@
|
@@ -0,0 +1,55 @@
|
||||||
+#ifndef __IP_SET_NETHASH_H
|
+#ifndef __IP_SET_NETHASH_H
|
||||||
+#define __IP_SET_NETHASH_H
|
+#define __IP_SET_NETHASH_H
|
||||||
@ -927,9 +927,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#endif /* __IP_SET_NETHASH_H */
|
+#endif /* __IP_SET_NETHASH_H */
|
||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_portmap.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_portmap.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_portmap.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_set_portmap.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_portmap.h 2005-09-20 13:11:38.782384000 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_portmap.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,25 @@
|
@@ -0,0 +1,25 @@
|
||||||
+#ifndef __IP_SET_PORTMAP_H
|
+#ifndef __IP_SET_PORTMAP_H
|
||||||
+#define __IP_SET_PORTMAP_H
|
+#define __IP_SET_PORTMAP_H
|
||||||
@ -956,9 +956,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif /* __IP_SET_PORTMAP_H */
|
+#endif /* __IP_SET_PORTMAP_H */
|
||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_prime.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_prime.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ip_set_prime.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_prime.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_prime.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ip_set_prime.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ip_set_prime.h 2005-09-20 13:11:38.782384000 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ip_set_prime.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,34 @@
|
@@ -0,0 +1,34 @@
|
||||||
+#ifndef __IP_SET_PRIME_H
|
+#ifndef __IP_SET_PRIME_H
|
||||||
+#define __IP_SET_PRIME_H
|
+#define __IP_SET_PRIME_H
|
||||||
@ -994,9 +994,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ip_set_prime.h linux-2.6.1
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#endif /* __IP_SET_PRIME_H */
|
+#endif /* __IP_SET_PRIME_H */
|
||||||
diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ipt_set.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ipt_set.h
|
||||||
--- linux-2.6.12.5/include/linux/netfilter_ipv4/ipt_set.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ipt_set.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/include/linux/netfilter_ipv4/ipt_set.h 2005-09-20 13:11:38.786384250 +0200
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ipt_set.h 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,21 @@
|
@@ -0,0 +1,21 @@
|
||||||
+#ifndef _IPT_SET_H
|
+#ifndef _IPT_SET_H
|
||||||
+#define _IPT_SET_H
|
+#define _IPT_SET_H
|
||||||
@ -1019,9 +1019,9 @@ diff -Nur linux-2.6.12.5/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.12.5-i
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif /*_IPT_SET_H*/
|
+#endif /*_IPT_SET_H*/
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set.c linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ip_set.c linux-2.6.16-owrt/net/ipv4/netfilter/ip_set.c
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/ip_set.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ip_set.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set.c 2005-09-20 13:11:38.786384250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ip_set.c 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,1989 @@
|
@@ -0,0 +1,1989 @@
|
||||||
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
||||||
+ * Patrick Schaaf <bof@bof.de>
|
+ * Patrick Schaaf <bof@bof.de>
|
||||||
@ -3012,9 +3012,9 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set.c linux-2.6.12.5-ipset/net/ip
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_iphash.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_iphash.c
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/ip_set_iphash.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ip_set_iphash.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_iphash.c 2005-09-20 13:11:38.786384250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_iphash.c 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,379 @@
|
@@ -0,0 +1,379 @@
|
||||||
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
||||||
+ *
|
+ *
|
||||||
@ -3395,9 +3395,9 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.12.5-ipset
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_ipmap.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_ipmap.c
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/ip_set_ipmap.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ip_set_ipmap.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_ipmap.c 2005-09-20 13:11:38.802385250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_ipmap.c 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,313 @@
|
@@ -0,0 +1,313 @@
|
||||||
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
||||||
+ * Patrick Schaaf <bof@bof.de>
|
+ * Patrick Schaaf <bof@bof.de>
|
||||||
@ -3712,9 +3712,9 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.12.5-ipset/
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_iptree.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_iptree.c
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/ip_set_iptree.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ip_set_iptree.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_iptree.c 2005-09-20 13:11:38.802385250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_iptree.c 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,510 @@
|
@@ -0,0 +1,510 @@
|
||||||
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
||||||
+ *
|
+ *
|
||||||
@ -4226,9 +4226,9 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.12.5-ipset
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_macipmap.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_macipmap.c
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/ip_set_macipmap.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ip_set_macipmap.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_macipmap.c 2005-09-20 13:11:38.802385250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_macipmap.c 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,338 @@
|
@@ -0,0 +1,338 @@
|
||||||
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
||||||
+ * Patrick Schaaf <bof@bof.de>
|
+ * Patrick Schaaf <bof@bof.de>
|
||||||
@ -4568,9 +4568,9 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.12.5-ips
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_nethash.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_nethash.c
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/ip_set_nethash.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ip_set_nethash.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_nethash.c 2005-09-20 13:11:38.802385250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_nethash.c 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,449 @@
|
@@ -0,0 +1,449 @@
|
||||||
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
||||||
+ *
|
+ *
|
||||||
@ -5021,9 +5021,9 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.12.5-ipse
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_portmap.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_portmap.c
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/ip_set_portmap.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ip_set_portmap.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/ip_set_portmap.c 2005-09-20 13:11:38.802385250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ip_set_portmap.c 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,325 @@
|
@@ -0,0 +1,325 @@
|
||||||
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
||||||
+ *
|
+ *
|
||||||
@ -5350,9 +5350,9 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.12.5-ipse
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ipt_set.c linux-2.6.12.5-ipset/net/ipv4/netfilter/ipt_set.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ipt_set.c linux-2.6.16-owrt/net/ipv4/netfilter/ipt_set.c
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/ipt_set.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ipt_set.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/ipt_set.c 2005-09-20 13:11:38.802385250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ipt_set.c 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,112 @@
|
@@ -0,0 +1,112 @@
|
||||||
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
||||||
+ * Patrick Schaaf <bof@bof.de>
|
+ * Patrick Schaaf <bof@bof.de>
|
||||||
@ -5466,9 +5466,9 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ipt_set.c linux-2.6.12.5-ipset/net/i
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ipt_SET.c linux-2.6.12.5-ipset/net/ipv4/netfilter/ipt_SET.c
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ipt_SET.c linux-2.6.16-owrt/net/ipv4/netfilter/ipt_SET.c
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/ipt_SET.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.16/net/ipv4/netfilter/ipt_SET.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/ipt_SET.c 2005-09-20 13:11:38.802385250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ipt_SET.c 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -0,0 +1,128 @@
|
@@ -0,0 +1,128 @@
|
||||||
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
|
||||||
+ * Patrick Schaaf <bof@bof.de>
|
+ * Patrick Schaaf <bof@bof.de>
|
||||||
@ -5598,10 +5598,10 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/ipt_SET.c linux-2.6.12.5-ipset/net/i
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/Kconfig linux-2.6.12.5-ipset/net/ipv4/netfilter/Kconfig
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/Kconfig linux-2.6.16-owrt/net/ipv4/netfilter/Kconfig
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/Kconfig 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.16/net/ipv4/netfilter/Kconfig 2006-03-20 12:52:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/Kconfig 2005-09-20 13:11:38.802385250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/Kconfig 2006-03-20 12:53:59.000000000 +0100
|
||||||
@@ -692,5 +692,106 @@
|
@@ -623,5 +623,106 @@
|
||||||
Allows altering the ARP packet payload: source and destination
|
Allows altering the ARP packet payload: source and destination
|
||||||
hardware and network addresses.
|
hardware and network addresses.
|
||||||
|
|
||||||
@ -5708,21 +5708,21 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/Kconfig linux-2.6.12.5-ipset/net/ipv
|
|||||||
+
|
+
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
diff -Nur linux-2.6.12.5/net/ipv4/netfilter/Makefile linux-2.6.12.5-ipset/net/ipv4/netfilter/Makefile
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/Makefile linux-2.6.16-owrt/net/ipv4/netfilter/Makefile
|
||||||
--- linux-2.6.12.5/net/ipv4/netfilter/Makefile 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.16/net/ipv4/netfilter/Makefile 2006-03-20 12:52:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-ipset/net/ipv4/netfilter/Makefile 2005-09-20 13:11:38.818386250 +0200
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/Makefile 2006-03-20 12:56:30.000000000 +0100
|
||||||
@@ -39,6 +39,7 @@
|
@@ -47,6 +47,7 @@
|
||||||
|
|
||||||
|
# matches
|
||||||
obj-$(CONFIG_IP_NF_MATCH_HASHLIMIT) += ipt_hashlimit.o
|
obj-$(CONFIG_IP_NF_MATCH_HASHLIMIT) += ipt_hashlimit.o
|
||||||
obj-$(CONFIG_IP_NF_MATCH_SCTP) += ipt_sctp.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
|
|
||||||
+obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
|
+obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
|
||||||
obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o
|
obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o
|
||||||
obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o
|
obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
|
||||||
@@ -77,6 +78,16 @@
|
obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o
|
||||||
|
@@ -74,6 +75,17 @@
|
||||||
|
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
|
||||||
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
|
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
|
||||||
obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o
|
obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o
|
||||||
obj-$(CONFIG_IP_NF_TARGET_NOTRACK) += ipt_NOTRACK.o
|
|
||||||
+obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o
|
+obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o
|
||||||
+
|
+
|
||||||
+# sets
|
+# sets
|
||||||
@ -5733,6 +5733,7 @@ diff -Nur linux-2.6.12.5/net/ipv4/netfilter/Makefile linux-2.6.12.5-ipset/net/ip
|
|||||||
+obj-$(CONFIG_IP_NF_SET_IPHASH) += ip_set_iphash.o
|
+obj-$(CONFIG_IP_NF_SET_IPHASH) += ip_set_iphash.o
|
||||||
+obj-$(CONFIG_IP_NF_SET_NETHASH) += ip_set_nethash.o
|
+obj-$(CONFIG_IP_NF_SET_NETHASH) += ip_set_nethash.o
|
||||||
+obj-$(CONFIG_IP_NF_SET_IPTREE) += ip_set_iptree.o
|
+obj-$(CONFIG_IP_NF_SET_IPTREE) += ip_set_iptree.o
|
||||||
|
+
|
||||||
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
|
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
|
||||||
|
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
|
||||||
|
|
||||||
# generic ARP tables
|
|
||||||
|
@ -1,150 +1,6 @@
|
|||||||
diff -Nrub linux-2.6.14/drivers/net/Kconfig linux-2.6.14-imq/drivers/net/Kconfig
|
diff -Nur linux-2.6.16/drivers/net/imq.c linux-2.6.16-owrt/drivers/net/imq.c
|
||||||
--- linux-2.6.14/drivers/net/Kconfig 2005-10-28 00:02:08.000000000 +0000
|
--- linux-2.6.16/drivers/net/imq.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/drivers/net/Kconfig 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/drivers/net/imq.c 2006-03-20 12:59:23.000000000 +0100
|
||||||
@@ -82,6 +82,129 @@
|
|
||||||
To compile this driver as a module, choose M here: the module
|
|
||||||
will be called eql. If unsure, say N.
|
|
||||||
|
|
||||||
+config IMQ
|
|
||||||
+ tristate "IMQ (intermediate queueing device) support"
|
|
||||||
+ depends on NETDEVICES && NETFILTER
|
|
||||||
+ ---help---
|
|
||||||
+ The IMQ device(s) is used as placeholder for QoS queueing disciplines.
|
|
||||||
+ Every packet entering/leaving the IP stack can be directed through
|
|
||||||
+ the IMQ device where it's enqueued/dequeued to the attached qdisc.
|
|
||||||
+ This allows you to treat network devices as classes and distribute
|
|
||||||
+ bandwidth among them. Iptables is used to specify through which IMQ
|
|
||||||
+ device, if any, packets travel.
|
|
||||||
+
|
|
||||||
+ More information at: http://www.linuximq.net/
|
|
||||||
+
|
|
||||||
+ To compile this driver as a module, choose M here: the module
|
|
||||||
+ will be called imq. If unsure, say N.
|
|
||||||
+
|
|
||||||
+choice
|
|
||||||
+ prompt "IMQ behavior (PRE/POSTROUTING)"
|
|
||||||
+ depends on IMQ
|
|
||||||
+ default IMQ_BEHAVIOR_BA
|
|
||||||
+ help
|
|
||||||
+
|
|
||||||
+ This settings defines how IMQ behaves in respect to its
|
|
||||||
+ hooking in PREROUTING and POSTROUTING.
|
|
||||||
+
|
|
||||||
+ IMQ can work in any of the following ways:
|
|
||||||
+
|
|
||||||
+ PREROUTING | POSTROUTING
|
|
||||||
+ -----------------|-------------------
|
|
||||||
+ #1 After NAT | After NAT
|
|
||||||
+ #2 After NAT | Before NAT
|
|
||||||
+ #3 Before NAT | After NAT
|
|
||||||
+ #4 Before NAT | Before NAT
|
|
||||||
+
|
|
||||||
+ The default behavior is to hook before NAT on PREROUTING
|
|
||||||
+ and after NAT on POSTROUTING (#3).
|
|
||||||
+
|
|
||||||
+ This settings are specially usefull when trying to use IMQ
|
|
||||||
+ to shape NATed clients.
|
|
||||||
+
|
|
||||||
+ More information can be found at: www.linuximq.net
|
|
||||||
+
|
|
||||||
+ If not sure leave the default settings alone.
|
|
||||||
+
|
|
||||||
+config IMQ_BEHAVIOR_AA
|
|
||||||
+ bool "IMQ AA"
|
|
||||||
+ help
|
|
||||||
+ This settings defines how IMQ behaves in respect to its
|
|
||||||
+ hooking in PREROUTING and POSTROUTING.
|
|
||||||
+
|
|
||||||
+ Choosing this option will make IMQ hook like this:
|
|
||||||
+
|
|
||||||
+ PREROUTING: After NAT
|
|
||||||
+ POSTROUTING: After NAT
|
|
||||||
+
|
|
||||||
+ More information can be found at: www.linuximq.net
|
|
||||||
+
|
|
||||||
+ If not sure leave the default settings alone.
|
|
||||||
+
|
|
||||||
+config IMQ_BEHAVIOR_AB
|
|
||||||
+ bool "IMQ AB"
|
|
||||||
+ help
|
|
||||||
+ This settings defines how IMQ behaves in respect to its
|
|
||||||
+ hooking in PREROUTING and POSTROUTING.
|
|
||||||
+
|
|
||||||
+ Choosing this option will make IMQ hook like this:
|
|
||||||
+
|
|
||||||
+ PREROUTING: After NAT
|
|
||||||
+ POSTROUTING: Before NAT
|
|
||||||
+
|
|
||||||
+ More information can be found at: www.linuximq.net
|
|
||||||
+
|
|
||||||
+ If not sure leave the default settings alone.
|
|
||||||
+
|
|
||||||
+config IMQ_BEHAVIOR_BA
|
|
||||||
+ bool "IMQ BA"
|
|
||||||
+ help
|
|
||||||
+ This settings defines how IMQ behaves in respect to its
|
|
||||||
+ hooking in PREROUTING and POSTROUTING.
|
|
||||||
+
|
|
||||||
+ Choosing this option will make IMQ hook like this:
|
|
||||||
+
|
|
||||||
+ PREROUTING: Before NAT
|
|
||||||
+ POSTROUTING: After NAT
|
|
||||||
+
|
|
||||||
+ More information can be found at: www.linuximq.net
|
|
||||||
+
|
|
||||||
+ If not sure leave the default settings alone.
|
|
||||||
+
|
|
||||||
+config IMQ_BEHAVIOR_BB
|
|
||||||
+ bool "IMQ BB"
|
|
||||||
+ help
|
|
||||||
+ This settings defines how IMQ behaves in respect to its
|
|
||||||
+ hooking in PREROUTING and POSTROUTING.
|
|
||||||
+
|
|
||||||
+ Choosing this option will make IMQ hook like this:
|
|
||||||
+
|
|
||||||
+ PREROUTING: Before NAT
|
|
||||||
+ POSTROUTING: Before NAT
|
|
||||||
+
|
|
||||||
+ More information can be found at: www.linuximq.net
|
|
||||||
+
|
|
||||||
+ If not sure leave the default settings alone.
|
|
||||||
+
|
|
||||||
+endchoice
|
|
||||||
+
|
|
||||||
+config IMQ_NUM_DEVS
|
|
||||||
+
|
|
||||||
+ int "Number of IMQ devices"
|
|
||||||
+ range 2 8
|
|
||||||
+ depends on IMQ
|
|
||||||
+ default "2"
|
|
||||||
+ help
|
|
||||||
+
|
|
||||||
+ This settings defines how many IMQ devices will be
|
|
||||||
+ created.
|
|
||||||
+
|
|
||||||
+ The default value is 2.
|
|
||||||
+
|
|
||||||
+ More information can be found at: www.linuximq.net
|
|
||||||
+
|
|
||||||
+ If not sure leave the default settings alone.
|
|
||||||
+
|
|
||||||
config TUN
|
|
||||||
tristate "Universal TUN/TAP device driver support"
|
|
||||||
select CRC32
|
|
||||||
diff -Nrub linux-2.6.14/drivers/net/Makefile linux-2.6.14-imq/drivers/net/Makefile
|
|
||||||
--- linux-2.6.14/drivers/net/Makefile 2005-10-28 00:02:08.000000000 +0000
|
|
||||||
+++ linux-2.6.14-imq/drivers/net/Makefile 2005-12-16 16:28:05.000000000 +0000
|
|
||||||
@@ -119,6 +119,7 @@
|
|
||||||
endif
|
|
||||||
|
|
||||||
obj-$(CONFIG_DUMMY) += dummy.o
|
|
||||||
+obj-$(CONFIG_IMQ) += imq.o
|
|
||||||
obj-$(CONFIG_DE600) += de600.o
|
|
||||||
obj-$(CONFIG_DE620) += de620.o
|
|
||||||
obj-$(CONFIG_LANCE) += lance.o
|
|
||||||
diff -Nrub linux-2.6.14/drivers/net/imq.c linux-2.6.14-imq/drivers/net/imq.c
|
|
||||||
--- linux-2.6.14/drivers/net/imq.c 1970-01-01 00:00:00.000000000 +0000
|
|
||||||
+++ linux-2.6.14-imq/drivers/net/imq.c 2005-12-16 16:49:02.000000000 +0000
|
|
||||||
@@ -0,0 +1,403 @@
|
@@ -0,0 +1,403 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Pseudo-driver for the intermediate queue device.
|
+ * Pseudo-driver for the intermediate queue device.
|
||||||
@ -549,9 +405,153 @@ diff -Nrub linux-2.6.14/drivers/net/imq.c linux-2.6.14-imq/drivers/net/imq.c
|
|||||||
+MODULE_AUTHOR("http://www.linuximq.net");
|
+MODULE_AUTHOR("http://www.linuximq.net");
|
||||||
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
|
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
diff -Nrub linux-2.6.14/include/linux/imq.h linux-2.6.14-imq/include/linux/imq.h
|
diff -Nur linux-2.6.16/drivers/net/Kconfig linux-2.6.16-owrt/drivers/net/Kconfig
|
||||||
--- linux-2.6.14/include/linux/imq.h 1970-01-01 00:00:00.000000000 +0000
|
--- linux-2.6.16/drivers/net/Kconfig 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/include/linux/imq.h 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/drivers/net/Kconfig 2006-03-20 12:59:23.000000000 +0100
|
||||||
|
@@ -93,6 +93,129 @@
|
||||||
|
To compile this driver as a module, choose M here: the module
|
||||||
|
will be called eql. If unsure, say N.
|
||||||
|
|
||||||
|
+config IMQ
|
||||||
|
+ tristate "IMQ (intermediate queueing device) support"
|
||||||
|
+ depends on NETDEVICES && NETFILTER
|
||||||
|
+ ---help---
|
||||||
|
+ The IMQ device(s) is used as placeholder for QoS queueing disciplines.
|
||||||
|
+ Every packet entering/leaving the IP stack can be directed through
|
||||||
|
+ the IMQ device where it's enqueued/dequeued to the attached qdisc.
|
||||||
|
+ This allows you to treat network devices as classes and distribute
|
||||||
|
+ bandwidth among them. Iptables is used to specify through which IMQ
|
||||||
|
+ device, if any, packets travel.
|
||||||
|
+
|
||||||
|
+ More information at: http://www.linuximq.net/
|
||||||
|
+
|
||||||
|
+ To compile this driver as a module, choose M here: the module
|
||||||
|
+ will be called imq. If unsure, say N.
|
||||||
|
+
|
||||||
|
+choice
|
||||||
|
+ prompt "IMQ behavior (PRE/POSTROUTING)"
|
||||||
|
+ depends on IMQ
|
||||||
|
+ default IMQ_BEHAVIOR_BA
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ This settings defines how IMQ behaves in respect to its
|
||||||
|
+ hooking in PREROUTING and POSTROUTING.
|
||||||
|
+
|
||||||
|
+ IMQ can work in any of the following ways:
|
||||||
|
+
|
||||||
|
+ PREROUTING | POSTROUTING
|
||||||
|
+ -----------------|-------------------
|
||||||
|
+ #1 After NAT | After NAT
|
||||||
|
+ #2 After NAT | Before NAT
|
||||||
|
+ #3 Before NAT | After NAT
|
||||||
|
+ #4 Before NAT | Before NAT
|
||||||
|
+
|
||||||
|
+ The default behavior is to hook before NAT on PREROUTING
|
||||||
|
+ and after NAT on POSTROUTING (#3).
|
||||||
|
+
|
||||||
|
+ This settings are specially usefull when trying to use IMQ
|
||||||
|
+ to shape NATed clients.
|
||||||
|
+
|
||||||
|
+ More information can be found at: www.linuximq.net
|
||||||
|
+
|
||||||
|
+ If not sure leave the default settings alone.
|
||||||
|
+
|
||||||
|
+config IMQ_BEHAVIOR_AA
|
||||||
|
+ bool "IMQ AA"
|
||||||
|
+ help
|
||||||
|
+ This settings defines how IMQ behaves in respect to its
|
||||||
|
+ hooking in PREROUTING and POSTROUTING.
|
||||||
|
+
|
||||||
|
+ Choosing this option will make IMQ hook like this:
|
||||||
|
+
|
||||||
|
+ PREROUTING: After NAT
|
||||||
|
+ POSTROUTING: After NAT
|
||||||
|
+
|
||||||
|
+ More information can be found at: www.linuximq.net
|
||||||
|
+
|
||||||
|
+ If not sure leave the default settings alone.
|
||||||
|
+
|
||||||
|
+config IMQ_BEHAVIOR_AB
|
||||||
|
+ bool "IMQ AB"
|
||||||
|
+ help
|
||||||
|
+ This settings defines how IMQ behaves in respect to its
|
||||||
|
+ hooking in PREROUTING and POSTROUTING.
|
||||||
|
+
|
||||||
|
+ Choosing this option will make IMQ hook like this:
|
||||||
|
+
|
||||||
|
+ PREROUTING: After NAT
|
||||||
|
+ POSTROUTING: Before NAT
|
||||||
|
+
|
||||||
|
+ More information can be found at: www.linuximq.net
|
||||||
|
+
|
||||||
|
+ If not sure leave the default settings alone.
|
||||||
|
+
|
||||||
|
+config IMQ_BEHAVIOR_BA
|
||||||
|
+ bool "IMQ BA"
|
||||||
|
+ help
|
||||||
|
+ This settings defines how IMQ behaves in respect to its
|
||||||
|
+ hooking in PREROUTING and POSTROUTING.
|
||||||
|
+
|
||||||
|
+ Choosing this option will make IMQ hook like this:
|
||||||
|
+
|
||||||
|
+ PREROUTING: Before NAT
|
||||||
|
+ POSTROUTING: After NAT
|
||||||
|
+
|
||||||
|
+ More information can be found at: www.linuximq.net
|
||||||
|
+
|
||||||
|
+ If not sure leave the default settings alone.
|
||||||
|
+
|
||||||
|
+config IMQ_BEHAVIOR_BB
|
||||||
|
+ bool "IMQ BB"
|
||||||
|
+ help
|
||||||
|
+ This settings defines how IMQ behaves in respect to its
|
||||||
|
+ hooking in PREROUTING and POSTROUTING.
|
||||||
|
+
|
||||||
|
+ Choosing this option will make IMQ hook like this:
|
||||||
|
+
|
||||||
|
+ PREROUTING: Before NAT
|
||||||
|
+ POSTROUTING: Before NAT
|
||||||
|
+
|
||||||
|
+ More information can be found at: www.linuximq.net
|
||||||
|
+
|
||||||
|
+ If not sure leave the default settings alone.
|
||||||
|
+
|
||||||
|
+endchoice
|
||||||
|
+
|
||||||
|
+config IMQ_NUM_DEVS
|
||||||
|
+
|
||||||
|
+ int "Number of IMQ devices"
|
||||||
|
+ range 2 8
|
||||||
|
+ depends on IMQ
|
||||||
|
+ default "2"
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ This settings defines how many IMQ devices will be
|
||||||
|
+ created.
|
||||||
|
+
|
||||||
|
+ The default value is 2.
|
||||||
|
+
|
||||||
|
+ More information can be found at: www.linuximq.net
|
||||||
|
+
|
||||||
|
+ If not sure leave the default settings alone.
|
||||||
|
+
|
||||||
|
config TUN
|
||||||
|
tristate "Universal TUN/TAP device driver support"
|
||||||
|
select CRC32
|
||||||
|
diff -Nur linux-2.6.16/drivers/net/Makefile linux-2.6.16-owrt/drivers/net/Makefile
|
||||||
|
--- linux-2.6.16/drivers/net/Makefile 2006-03-20 06:53:29.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/drivers/net/Makefile 2006-03-20 13:00:13.000000000 +0100
|
||||||
|
@@ -125,6 +125,7 @@
|
||||||
|
endif
|
||||||
|
|
||||||
|
obj-$(CONFIG_DUMMY) += dummy.o
|
||||||
|
+obj-$(CONFIG_IMQ) += imq.o
|
||||||
|
obj-$(CONFIG_IFB) += ifb.o
|
||||||
|
obj-$(CONFIG_DE600) += de600.o
|
||||||
|
obj-$(CONFIG_DE620) += de620.o
|
||||||
|
diff -Nur linux-2.6.16/include/linux/imq.h linux-2.6.16-owrt/include/linux/imq.h
|
||||||
|
--- linux-2.6.16/include/linux/imq.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/include/linux/imq.h 2006-03-20 12:59:23.000000000 +0100
|
||||||
@@ -0,0 +1,9 @@
|
@@ -0,0 +1,9 @@
|
||||||
+#ifndef _IMQ_H
|
+#ifndef _IMQ_H
|
||||||
+#define _IMQ_H
|
+#define _IMQ_H
|
||||||
@ -562,9 +562,9 @@ diff -Nrub linux-2.6.14/include/linux/imq.h linux-2.6.14-imq/include/linux/imq.h
|
|||||||
+#define IMQ_F_ENQUEUE 0x80
|
+#define IMQ_F_ENQUEUE 0x80
|
||||||
+
|
+
|
||||||
+#endif /* _IMQ_H */
|
+#endif /* _IMQ_H */
|
||||||
diff -Nrub linux-2.6.14/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.14-imq/include/linux/netfilter_ipv4/ipt_IMQ.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.16-owrt/include/linux/netfilter_ipv4/ipt_IMQ.h
|
||||||
--- linux-2.6.14/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 00:00:00.000000000 +0000
|
--- linux-2.6.16/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv4/ipt_IMQ.h 2006-03-20 12:59:23.000000000 +0100
|
||||||
@@ -0,0 +1,8 @@
|
@@ -0,0 +1,8 @@
|
||||||
+#ifndef _IPT_IMQ_H
|
+#ifndef _IPT_IMQ_H
|
||||||
+#define _IPT_IMQ_H
|
+#define _IPT_IMQ_H
|
||||||
@ -574,9 +574,9 @@ diff -Nrub linux-2.6.14/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.14-imq/
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif /* _IPT_IMQ_H */
|
+#endif /* _IPT_IMQ_H */
|
||||||
diff -Nrub linux-2.6.14/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.14-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
|
diff -Nur linux-2.6.16/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.16-owrt/include/linux/netfilter_ipv6/ip6t_IMQ.h
|
||||||
--- linux-2.6.14/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 00:00:00.000000000 +0000
|
--- linux-2.6.16/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/include/linux/netfilter_ipv6/ip6t_IMQ.h 2006-03-20 12:59:23.000000000 +0100
|
||||||
@@ -0,0 +1,8 @@
|
@@ -0,0 +1,8 @@
|
||||||
+#ifndef _IP6T_IMQ_H
|
+#ifndef _IP6T_IMQ_H
|
||||||
+#define _IP6T_IMQ_H
|
+#define _IP6T_IMQ_H
|
||||||
@ -586,12 +586,12 @@ diff -Nrub linux-2.6.14/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.14-imq
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif /* _IP6T_IMQ_H */
|
+#endif /* _IP6T_IMQ_H */
|
||||||
diff -Nrub linux-2.6.14/include/linux/skbuff.h linux-2.6.14-imq/include/linux/skbuff.h
|
diff -Nur linux-2.6.16/include/linux/skbuff.h linux-2.6.16-owrt/include/linux/skbuff.h
|
||||||
--- linux-2.6.14/include/linux/skbuff.h 2005-10-28 00:02:08.000000000 +0000
|
--- linux-2.6.16/include/linux/skbuff.h 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/include/linux/skbuff.h 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/include/linux/skbuff.h 2006-03-20 12:59:23.000000000 +0100
|
||||||
@@ -271,6 +271,10 @@
|
@@ -275,6 +275,10 @@
|
||||||
#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
|
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
|
||||||
__u8 ipvs_property:1;
|
struct sk_buff *nfct_reasm;
|
||||||
#endif
|
#endif
|
||||||
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
|
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
|
||||||
+ unsigned char imq_flags;
|
+ unsigned char imq_flags;
|
||||||
@ -600,12 +600,12 @@ diff -Nrub linux-2.6.14/include/linux/skbuff.h linux-2.6.14-imq/include/linux/sk
|
|||||||
#ifdef CONFIG_BRIDGE_NETFILTER
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
||||||
struct nf_bridge_info *nf_bridge;
|
struct nf_bridge_info *nf_bridge;
|
||||||
#endif
|
#endif
|
||||||
diff -Nrub linux-2.6.14/net/core/skbuff.c linux-2.6.14-imq/net/core/skbuff.c
|
diff -Nur linux-2.6.16/net/core/skbuff.c linux-2.6.16-owrt/net/core/skbuff.c
|
||||||
--- linux-2.6.14/net/core/skbuff.c 2005-10-28 00:02:08.000000000 +0000
|
--- linux-2.6.16/net/core/skbuff.c 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/net/core/skbuff.c 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/net/core/skbuff.c 2006-03-20 12:59:23.000000000 +0100
|
||||||
@@ -413,6 +413,10 @@
|
@@ -425,6 +425,10 @@
|
||||||
#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
|
C(nfct_reasm);
|
||||||
C(ipvs_property);
|
nf_conntrack_get_reasm(skb->nfct_reasm);
|
||||||
#endif
|
#endif
|
||||||
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
|
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
|
||||||
+ C(imq_flags);
|
+ C(imq_flags);
|
||||||
@ -614,7 +614,7 @@ diff -Nrub linux-2.6.14/net/core/skbuff.c linux-2.6.14-imq/net/core/skbuff.c
|
|||||||
#ifdef CONFIG_BRIDGE_NETFILTER
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
||||||
C(nf_bridge);
|
C(nf_bridge);
|
||||||
nf_bridge_get(skb->nf_bridge);
|
nf_bridge_get(skb->nf_bridge);
|
||||||
@@ -473,6 +477,10 @@
|
@@ -489,6 +493,10 @@
|
||||||
#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
|
#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
|
||||||
new->ipvs_property = old->ipvs_property;
|
new->ipvs_property = old->ipvs_property;
|
||||||
#endif
|
#endif
|
||||||
@ -625,41 +625,9 @@ diff -Nrub linux-2.6.14/net/core/skbuff.c linux-2.6.14-imq/net/core/skbuff.c
|
|||||||
#ifdef CONFIG_BRIDGE_NETFILTER
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
||||||
new->nf_bridge = old->nf_bridge;
|
new->nf_bridge = old->nf_bridge;
|
||||||
nf_bridge_get(old->nf_bridge);
|
nf_bridge_get(old->nf_bridge);
|
||||||
diff -Nrub linux-2.6.14/net/ipv4/netfilter/Kconfig linux-2.6.14-imq/net/ipv4/netfilter/Kconfig
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/ipt_IMQ.c linux-2.6.16-owrt/net/ipv4/netfilter/ipt_IMQ.c
|
||||||
--- linux-2.6.14/net/ipv4/netfilter/Kconfig 2005-10-28 00:02:08.000000000 +0000
|
--- linux-2.6.16/net/ipv4/netfilter/ipt_IMQ.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/net/ipv4/netfilter/Kconfig 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/ipt_IMQ.c 2006-03-20 12:59:23.000000000 +0100
|
||||||
@@ -489,6 +489,17 @@
|
|
||||||
|
|
||||||
To compile it as a module, choose M here. If unsure, say N.
|
|
||||||
|
|
||||||
+config IP_NF_TARGET_IMQ
|
|
||||||
+ tristate "IMQ target support"
|
|
||||||
+ depends on IP_NF_MANGLE
|
|
||||||
+ help
|
|
||||||
+ This option adds a `IMQ' target which is used to specify if and
|
|
||||||
+ to which IMQ device packets should get enqueued/dequeued.
|
|
||||||
+
|
|
||||||
+ For more information visit: http://www.linuximq.net/
|
|
||||||
+
|
|
||||||
+ To compile it as a module, choose M here. If unsure, say N.
|
|
||||||
+
|
|
||||||
config IP_NF_TARGET_LOG
|
|
||||||
tristate "LOG target support"
|
|
||||||
depends on IP_NF_IPTABLES
|
|
||||||
diff -Nrub linux-2.6.14/net/ipv4/netfilter/Makefile linux-2.6.14-imq/net/ipv4/netfilter/Makefile
|
|
||||||
--- linux-2.6.14/net/ipv4/netfilter/Makefile 2005-10-28 00:02:08.000000000 +0000
|
|
||||||
+++ linux-2.6.14-imq/net/ipv4/netfilter/Makefile 2005-12-16 16:28:05.000000000 +0000
|
|
||||||
@@ -80,6 +80,7 @@
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o
|
|
||||||
+obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
|
|
||||||
diff -Nrub linux-2.6.14/net/ipv4/netfilter/ipt_IMQ.c linux-2.6.14-imq/net/ipv4/netfilter/ipt_IMQ.c
|
|
||||||
--- linux-2.6.14/net/ipv4/netfilter/ipt_IMQ.c 1970-01-01 00:00:00.000000000 +0000
|
|
||||||
+++ linux-2.6.14-imq/net/ipv4/netfilter/ipt_IMQ.c 2005-12-16 16:28:05.000000000 +0000
|
|
||||||
@@ -0,0 +1,80 @@
|
@@ -0,0 +1,80 @@
|
||||||
+/*
|
+/*
|
||||||
+ * This target marks packets to be enqueued to an imq device
|
+ * This target marks packets to be enqueued to an imq device
|
||||||
@ -741,39 +709,41 @@ diff -Nrub linux-2.6.14/net/ipv4/netfilter/ipt_IMQ.c linux-2.6.14-imq/net/ipv4/n
|
|||||||
+MODULE_AUTHOR("http://www.linuximq.net");
|
+MODULE_AUTHOR("http://www.linuximq.net");
|
||||||
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
|
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
diff -Nrub linux-2.6.14/net/ipv6/netfilter/Kconfig linux-2.6.14-imq/net/ipv6/netfilter/Kconfig
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/Kconfig linux-2.6.16-owrt/net/ipv4/netfilter/Kconfig
|
||||||
--- linux-2.6.14/net/ipv6/netfilter/Kconfig 2005-10-28 00:02:08.000000000 +0000
|
--- linux-2.6.16/net/ipv4/netfilter/Kconfig 2006-03-20 12:58:53.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/net/ipv6/netfilter/Kconfig 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/Kconfig 2006-03-20 12:59:23.000000000 +0100
|
||||||
@@ -190,6 +190,15 @@
|
@@ -351,6 +351,17 @@
|
||||||
|
|
||||||
To compile it as a module, choose M here. If unsure, say N.
|
To compile it as a module, choose M here. If unsure, say N.
|
||||||
|
|
||||||
+config IP6_NF_TARGET_IMQ
|
+config IP_NF_TARGET_IMQ
|
||||||
+ tristate "IMQ target support"
|
+ tristate "IMQ target support"
|
||||||
+ depends on IP6_NF_MANGLE
|
+ depends on IP_NF_MANGLE
|
||||||
+ help
|
+ help
|
||||||
+ This option adds a `IMQ' target which is used to specify if and
|
+ This option adds a `IMQ' target which is used to specify if and
|
||||||
+ to which imq device packets should get enqueued/dequeued.
|
+ to which IMQ device packets should get enqueued/dequeued.
|
||||||
+
|
+
|
||||||
+ To compile it as a module, choose M here. If unsure, say N.
|
+ For more information visit: http://www.linuximq.net/
|
||||||
+
|
+
|
||||||
config IP6_NF_TARGET_LOG
|
+ To compile it as a module, choose M here. If unsure, say N.
|
||||||
|
+
|
||||||
|
config IP_NF_TARGET_LOG
|
||||||
tristate "LOG target support"
|
tristate "LOG target support"
|
||||||
depends on IP6_NF_FILTER
|
depends on IP_NF_IPTABLES
|
||||||
diff -Nrub linux-2.6.14/net/ipv6/netfilter/Makefile linux-2.6.14-imq/net/ipv6/netfilter/Makefile
|
diff -Nur linux-2.6.16/net/ipv4/netfilter/Makefile linux-2.6.16-owrt/net/ipv4/netfilter/Makefile
|
||||||
--- linux-2.6.14/net/ipv6/netfilter/Makefile 2005-10-28 00:02:08.000000000 +0000
|
--- linux-2.6.16/net/ipv4/netfilter/Makefile 2006-03-20 12:58:53.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/net/ipv6/netfilter/Makefile 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/net/ipv4/netfilter/Makefile 2006-03-20 13:01:12.000000000 +0100
|
||||||
@@ -6,6 +6,7 @@
|
@@ -67,6 +67,7 @@
|
||||||
obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
|
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
|
||||||
obj-$(CONFIG_IP6_NF_MATCH_LIMIT) += ip6t_limit.o
|
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
|
||||||
obj-$(CONFIG_IP6_NF_MATCH_MARK) += ip6t_mark.o
|
obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o
|
||||||
+obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
|
+obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
|
||||||
obj-$(CONFIG_IP6_NF_MATCH_LENGTH) += ip6t_length.o
|
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
|
||||||
obj-$(CONFIG_IP6_NF_MATCH_MAC) += ip6t_mac.o
|
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
|
||||||
obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt.o
|
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
|
||||||
diff -Nrub linux-2.6.14/net/ipv6/netfilter/ip6t_IMQ.c linux-2.6.14-imq/net/ipv6/netfilter/ip6t_IMQ.c
|
diff -Nur linux-2.6.16/net/ipv6/netfilter/ip6t_IMQ.c linux-2.6.16-owrt/net/ipv6/netfilter/ip6t_IMQ.c
|
||||||
--- linux-2.6.14/net/ipv6/netfilter/ip6t_IMQ.c 1970-01-01 00:00:00.000000000 +0000
|
--- linux-2.6.16/net/ipv6/netfilter/ip6t_IMQ.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/net/ipv6/netfilter/ip6t_IMQ.c 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/net/ipv6/netfilter/ip6t_IMQ.c 2006-03-20 12:59:23.000000000 +0100
|
||||||
@@ -0,0 +1,80 @@
|
@@ -0,0 +1,80 @@
|
||||||
+/*
|
+/*
|
||||||
+ * This target marks packets to be enqueued to an imq device
|
+ * This target marks packets to be enqueued to an imq device
|
||||||
@ -855,9 +825,39 @@ diff -Nrub linux-2.6.14/net/ipv6/netfilter/ip6t_IMQ.c linux-2.6.14-imq/net/ipv6/
|
|||||||
+MODULE_AUTHOR("http://www.linuximq.net");
|
+MODULE_AUTHOR("http://www.linuximq.net");
|
||||||
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
|
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
diff -Nrub linux-2.6.14/net/sched/sch_generic.c linux-2.6.14-imq/net/sched/sch_generic.c
|
diff -Nur linux-2.6.16/net/ipv6/netfilter/Kconfig linux-2.6.16-owrt/net/ipv6/netfilter/Kconfig
|
||||||
--- linux-2.6.14/net/sched/sch_generic.c 2005-10-28 00:02:08.000000000 +0000
|
--- linux-2.6.16/net/ipv6/netfilter/Kconfig 2006-03-20 06:53:29.000000000 +0100
|
||||||
+++ linux-2.6.14-imq/net/sched/sch_generic.c 2005-12-16 16:28:05.000000000 +0000
|
+++ linux-2.6.16-owrt/net/ipv6/netfilter/Kconfig 2006-03-20 12:59:23.000000000 +0100
|
||||||
|
@@ -154,6 +154,15 @@
|
||||||
|
|
||||||
|
To compile it as a module, choose M here. If unsure, say N.
|
||||||
|
|
||||||
|
+config IP6_NF_TARGET_IMQ
|
||||||
|
+ tristate "IMQ target support"
|
||||||
|
+ depends on IP6_NF_MANGLE
|
||||||
|
+ help
|
||||||
|
+ This option adds a `IMQ' target which is used to specify if and
|
||||||
|
+ to which imq device packets should get enqueued/dequeued.
|
||||||
|
+
|
||||||
|
+ To compile it as a module, choose M here. If unsure, say N.
|
||||||
|
+
|
||||||
|
config IP6_NF_TARGET_LOG
|
||||||
|
tristate "LOG target support"
|
||||||
|
depends on IP6_NF_FILTER
|
||||||
|
diff -Nur linux-2.6.16/net/ipv6/netfilter/Makefile linux-2.6.16-owrt/net/ipv6/netfilter/Makefile
|
||||||
|
--- linux-2.6.16/net/ipv6/netfilter/Makefile 2006-03-20 06:53:29.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/net/ipv6/netfilter/Makefile 2006-03-20 13:02:14.000000000 +0100
|
||||||
|
@@ -4,6 +4,7 @@
|
||||||
|
|
||||||
|
# Link order matters here.
|
||||||
|
obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
|
||||||
|
+obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
|
||||||
|
obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt.o
|
||||||
|
obj-$(CONFIG_IP6_NF_MATCH_OPTS) += ip6t_hbh.o ip6t_dst.o
|
||||||
|
obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += ip6t_ipv6header.o
|
||||||
|
diff -Nur linux-2.6.16/net/sched/sch_generic.c linux-2.6.16-owrt/net/sched/sch_generic.c
|
||||||
|
--- linux-2.6.16/net/sched/sch_generic.c 2006-03-20 06:53:29.000000000 +0100
|
||||||
|
+++ linux-2.6.16-owrt/net/sched/sch_generic.c 2006-03-20 12:59:23.000000000 +0100
|
||||||
@@ -29,6 +29,9 @@
|
@@ -29,6 +29,9 @@
|
||||||
#include <linux/netdevice.h>
|
#include <linux/netdevice.h>
|
||||||
#include <linux/skbuff.h>
|
#include <linux/skbuff.h>
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.15.6
|
LINUX_VERSION:=2.6.16
|
||||||
LINUX_RELEASE:=1
|
LINUX_RELEASE:=1
|
||||||
LINUX_KERNEL_MD5SUM:=2ea7c865d6c09a02cbe6ce5fddcd02ca
|
LINUX_KERNEL_MD5SUM:=9a91b2719949ff0856b40bc467fd47be
|
||||||
|
|
||||||
include ../rules.mk
|
include ../rules.mk
|
||||||
include ./config
|
include ./config
|
||||||
|
Loading…
Reference in New Issue
Block a user