mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-10 17:43:10 +02:00
add my 2.6.15-rc5 port (yay) with devfs. The PCI subsystem is broken on Broadcom boards, we are working on it. Also upgrade iptables to 1.3.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2683 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
9d5362a82a
commit
8a3332a9b6
@ -3,11 +3,11 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=iptables
|
PKG_NAME:=iptables
|
||||||
PKG_VERSION:=1.3.3
|
PKG_VERSION:=1.3.4
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
PKG_MD5SUM:=86d88455520cfdc56fd7ae27897a80a4
|
PKG_MD5SUM:=fdff8abe890807968226b0c374335305
|
||||||
|
|
||||||
PKG_SOURCE_URL:=http://www.netfilter.org/files \
|
PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
|
||||||
ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
|
ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
|
||||||
ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
|
ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
|
||||||
ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
|
ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
|
||||||
|
@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk
|
|||||||
include ../rules.mk
|
include ../rules.mk
|
||||||
|
|
||||||
KERNEL:=2.6
|
KERNEL:=2.6
|
||||||
LINUX_VERSION:=2.6.12.5
|
LINUX_VERSION:=2.6.15-rc5
|
||||||
LINUX_KERNEL_MD5SUM:=076f0dc714112c764c790fbaef19e228
|
LINUX_KERNEL_MD5SUM:=1b430bfd22f4094bf1bdc1a5ceb6b6a2
|
||||||
LINUX_SITE=http://www.fi.kernel.org/pub/linux/kernel/v2.6 \
|
LINUX_SITE=http://www.fi.kernel.org/pub/linux/kernel/v2.6/testing \
|
||||||
http://www.fr.kernel.org/pub/linux/kernel/v2.6 \
|
http://www.fr.kernel.org/pub/linux/kernel/v2.6/testing \
|
||||||
http://www.kernel.org/pub/linux/kernel/v2.6 \
|
http://www.kernel.org/pub/linux/kernel/v2.6/testing \
|
||||||
http://www.de.kernel.org/pub/linux/kernel/v2.6
|
http://www.de.kernel.org/pub/linux/kernel/v2.6/testing
|
||||||
MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
|
MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
|
||||||
LINUX_KCONFIG:=./config/$(BOARD)
|
LINUX_KCONFIG:=./config/$(BOARD)
|
||||||
LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-2.6-$(BOARD)
|
LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-2.6-$(BOARD)
|
||||||
@ -79,9 +79,9 @@ $(eval $(call KMOD_template,PPP,ppp,\
|
|||||||
$(MODULES_DIR)/kernel/drivers/net/slhc.ko \
|
$(MODULES_DIR)/kernel/drivers/net/slhc.ko \
|
||||||
,CONFIG_PPP))
|
,CONFIG_PPP))
|
||||||
|
|
||||||
$(eval $(call KMOD_template,MPPE,mppe,\
|
#$(eval $(call KMOD_template,MPPE,mppe,\
|
||||||
$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.ko \
|
# $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.ko \
|
||||||
,CONFIG_PPP_MPPE_MPPC))
|
#,CONFIG_PPP_MPPE_MPPC))
|
||||||
|
|
||||||
$(eval $(call KMOD_template,PPPOATM,pppoatm,\
|
$(eval $(call KMOD_template,PPPOATM,pppoatm,\
|
||||||
$(MODULES_DIR)/kernel/net/atm/pppoatm.ko \
|
$(MODULES_DIR)/kernel/net/atm/pppoatm.ko \
|
||||||
@ -338,9 +338,9 @@ $(eval $(call KMOD_template,USB_ACM,usb-acm,\
|
|||||||
$(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \
|
$(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \
|
||||||
,CONFIG_USB_ACM))
|
,CONFIG_USB_ACM))
|
||||||
|
|
||||||
$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\
|
#$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\
|
||||||
$(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \
|
# $(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \
|
||||||
,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio))
|
#,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio))
|
||||||
|
|
||||||
$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
|
$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
|
||||||
$(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \
|
$(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/bcmsrom.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/bcmsrom.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/bcmsrom.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/bcmsrom.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/bcmsrom.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/bcmsrom.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/bcmsrom.c 2005-11-07 01:12:51.811809000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/bcmsrom.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,685 @@
|
@@ -0,0 +1,685 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc useful routines to access NIC SROM
|
+ * Misc useful routines to access NIC SROM
|
||||||
@ -687,9 +687,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/bcmsrom.c linux-2.6.12.5-br
|
|||||||
+ return (rc);
|
+ return (rc);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/bcmutils.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/bcmutils.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/bcmutils.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/bcmutils.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/bcmutils.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/bcmutils.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/bcmutils.c 2005-11-07 01:12:51.815809250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/bcmutils.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,691 @@
|
@@ -0,0 +1,691 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc useful OS-independent routines.
|
+ * Misc useful OS-independent routines.
|
||||||
@ -1382,9 +1382,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/bcmutils.c linux-2.6.12.5-b
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/hnddma.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/hnddma.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/hnddma.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/hnddma.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/hnddma.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/hnddma.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/hnddma.c 2005-11-07 01:12:51.815809250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/hnddma.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,763 @@
|
@@ -0,0 +1,763 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Generic Broadcom Home Networking Division (HND) DMA module.
|
+ * Generic Broadcom Home Networking Division (HND) DMA module.
|
||||||
@ -2149,9 +2149,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/hnddma.c linux-2.6.12.5-brc
|
|||||||
+{
|
+{
|
||||||
+ return (NTXDACTIVE(di->txin, di->txout));
|
+ return (NTXDACTIVE(di->txin, di->txout));
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/linux_osl.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/linux_osl.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/linux_osl.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/linux_osl.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/linux_osl.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/linux_osl.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/linux_osl.c 2005-11-07 01:12:51.815809250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/linux_osl.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,420 @@
|
@@ -0,0 +1,420 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Linux OS Independent Layer
|
+ * Linux OS Independent Layer
|
||||||
@ -2573,9 +2573,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/linux_osl.c linux-2.6.12.5-
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/Makefile linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/Makefile
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/Makefile linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/Makefile
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/Makefile 2005-11-19 14:16:38.941631500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/Makefile 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,7 @@
|
@@ -0,0 +1,7 @@
|
||||||
+#
|
+#
|
||||||
+# Makefile for the BCM47xx specific kernel interface routines
|
+# Makefile for the BCM47xx specific kernel interface routines
|
||||||
@ -2584,9 +2584,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/Makefile linux-2.6.12.5-brc
|
|||||||
+
|
+
|
||||||
+obj-y := sbutils.o linux_osl.o bcmsrom.o bcmutils.o sbmips.o sbpci.o hnddma.o
|
+obj-y := sbutils.o linux_osl.o bcmsrom.o bcmutils.o sbmips.o sbpci.o hnddma.o
|
||||||
+#obj-y := nvram.o nvram_linux.o
|
+#obj-y := nvram.o nvram_linux.o
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/nvram.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/nvram.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/nvram.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/nvram.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/nvram.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/nvram.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/nvram.c 2005-11-19 02:28:26.438059500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/nvram.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,321 @@
|
@@ -0,0 +1,321 @@
|
||||||
+/*
|
+/*
|
||||||
+ * NVRAM variable manipulation (common)
|
+ * NVRAM variable manipulation (common)
|
||||||
@ -2909,9 +2909,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/nvram.c linux-2.6.12.5-brcm
|
|||||||
+{
|
+{
|
||||||
+ BCMINIT(nvram_free)();
|
+ BCMINIT(nvram_free)();
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/nvram_linux.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/nvram_linux.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/nvram_linux.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/nvram_linux.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/nvram_linux.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/nvram_linux.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/nvram_linux.c 2005-11-19 02:28:26.438059500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/nvram_linux.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,633 @@
|
@@ -0,0 +1,633 @@
|
||||||
+/*
|
+/*
|
||||||
+ * NVRAM variable manipulation (Linux kernel half)
|
+ * NVRAM variable manipulation (Linux kernel half)
|
||||||
@ -3546,9 +3546,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/nvram_linux.c linux-2.6.12.
|
|||||||
+
|
+
|
||||||
+module_init(dev_nvram_init);
|
+module_init(dev_nvram_init);
|
||||||
+module_exit(dev_nvram_exit);
|
+module_exit(dev_nvram_exit);
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbmips.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbmips.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/sbmips.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/sbmips.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbmips.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/sbmips.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbmips.c 2005-11-07 01:12:51.819809500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/sbmips.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,950 @@
|
@@ -0,0 +1,950 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM47XX Sonics SiliconBackplane MIPS core routines
|
+ * BCM47XX Sonics SiliconBackplane MIPS core routines
|
||||||
@ -4500,9 +4500,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbmips.c linux-2.6.12.5-brc
|
|||||||
+
|
+
|
||||||
+ return ret;
|
+ return ret;
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbpci.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbpci.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/sbpci.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/sbpci.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbpci.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/sbpci.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbpci.c 2005-11-07 01:12:51.819809500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/sbpci.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,530 @@
|
@@ -0,0 +1,530 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Low-Level PCI and SB support for BCM47xx
|
+ * Low-Level PCI and SB support for BCM47xx
|
||||||
@ -5034,9 +5034,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbpci.c linux-2.6.12.5-brcm
|
|||||||
+
|
+
|
||||||
+ sb_setcoreidx(sbh, coreidx);
|
+ sb_setcoreidx(sbh, coreidx);
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbutils.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbutils.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/sbutils.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/sbutils.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbutils.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/broadcom/sbutils.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbutils.c 2005-11-07 01:12:51.823809750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/broadcom/sbutils.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,1895 @@
|
@@ -0,0 +1,1895 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc utility routines for accessing chip-specific features
|
+ * Misc utility routines for accessing chip-specific features
|
||||||
@ -6933,9 +6933,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbutils.c linux-2.6.12.5-br
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcm4710.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcm4710.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcm4710.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcm4710.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcm4710.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcm4710.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcm4710.h 2005-11-07 01:12:51.823809750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcm4710.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,90 @@
|
@@ -0,0 +1,90 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM4710 address space map and definitions
|
+ * BCM4710 address space map and definitions
|
||||||
@ -7027,9 +7027,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcm4710.h linux-2.6.12.5-brc
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+#endif /* _bcm4710_h_ */
|
+#endif /* _bcm4710_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmdevs.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmdevs.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmdevs.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmdevs.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmdevs.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmdevs.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmdevs.h 2005-11-07 01:12:51.823809750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmdevs.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,238 @@
|
@@ -0,0 +1,238 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Broadcom device-specific manifest constants.
|
+ * Broadcom device-specific manifest constants.
|
||||||
@ -7269,9 +7269,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmdevs.h linux-2.6.12.5-brc
|
|||||||
+#define CT4702AP_BOARD 0x0447
|
+#define CT4702AP_BOARD 0x0447
|
||||||
+
|
+
|
||||||
+#endif /* _BCMDEVS_H */
|
+#endif /* _BCMDEVS_H */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmendian.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmendian.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmendian.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmendian.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmendian.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmendian.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmendian.h 2005-11-07 01:12:51.823809750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmendian.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,125 @@
|
@@ -0,0 +1,125 @@
|
||||||
+/*******************************************************************************
|
+/*******************************************************************************
|
||||||
+ * $Id$
|
+ * $Id$
|
||||||
@ -7398,9 +7398,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmendian.h linux-2.6.12.5-b
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#endif /* _BCMENDIAN_H_ */
|
+#endif /* _BCMENDIAN_H_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenet47xx.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenet47xx.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmenet47xx.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmenet47xx.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenet47xx.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmenet47xx.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenet47xx.h 2005-11-07 01:12:51.823809750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmenet47xx.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,229 @@
|
@@ -0,0 +1,229 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Hardware-specific definitions for
|
+ * Hardware-specific definitions for
|
||||||
@ -7631,9 +7631,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenet47xx.h linux-2.6.12.5
|
|||||||
+#include <bcmenetrxh.h>
|
+#include <bcmenetrxh.h>
|
||||||
+
|
+
|
||||||
+#endif /* _bcmenet_47xx_h_ */
|
+#endif /* _bcmenet_47xx_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenetmib.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenetmib.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmenetmib.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmenetmib.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenetmib.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmenetmib.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenetmib.h 2005-11-07 01:12:51.823809750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmenetmib.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,81 @@
|
@@ -0,0 +1,81 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Hardware-specific MIB definition for
|
+ * Hardware-specific MIB definition for
|
||||||
@ -7716,9 +7716,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenetmib.h linux-2.6.12.5-
|
|||||||
+} bcmenetmib_t;
|
+} bcmenetmib_t;
|
||||||
+
|
+
|
||||||
+#endif /* _bcmenetmib_h_ */
|
+#endif /* _bcmenetmib_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenetrxh.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenetrxh.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmenetrxh.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmenetrxh.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenetrxh.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmenetrxh.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenetrxh.h 2005-11-07 01:12:51.827810000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmenetrxh.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,43 @@
|
@@ -0,0 +1,43 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Hardware-specific Receive Data Header for the
|
+ * Hardware-specific Receive Data Header for the
|
||||||
@ -7763,9 +7763,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenetrxh.h linux-2.6.12.5-
|
|||||||
+#define RXF_OV ((uint16)1 << 0) /* fifo overflow */
|
+#define RXF_OV ((uint16)1 << 0) /* fifo overflow */
|
||||||
+
|
+
|
||||||
+#endif /* _bcmenetrxh_h_ */
|
+#endif /* _bcmenetrxh_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmnvram.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmnvram.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmnvram.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmnvram.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmnvram.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmnvram.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmnvram.h 2005-11-07 01:12:51.827810000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmnvram.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,131 @@
|
@@ -0,0 +1,131 @@
|
||||||
+/*
|
+/*
|
||||||
+ * NVRAM variable manipulation
|
+ * NVRAM variable manipulation
|
||||||
@ -7898,9 +7898,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmnvram.h linux-2.6.12.5-br
|
|||||||
+#define NVRAM_LAST_LOC (0xc0000000 - NVRAM_SPACE)
|
+#define NVRAM_LAST_LOC (0xc0000000 - NVRAM_SPACE)
|
||||||
+
|
+
|
||||||
+#endif /* _bcmnvram_h_ */
|
+#endif /* _bcmnvram_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmsrom.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmsrom.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmsrom.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmsrom.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmsrom.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmsrom.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmsrom.h 2005-11-07 01:12:51.827810000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmsrom.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,24 @@
|
@@ -0,0 +1,24 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc useful routines to access NIC srom
|
+ * Misc useful routines to access NIC srom
|
||||||
@ -7926,9 +7926,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmsrom.h linux-2.6.12.5-brc
|
|||||||
+extern int srom_parsecis(uint8 *cis, char **vars, int *count);
|
+extern int srom_parsecis(uint8 *cis, char **vars, int *count);
|
||||||
+
|
+
|
||||||
+#endif /* _bcmsrom_h_ */
|
+#endif /* _bcmsrom_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmutils.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmutils.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmutils.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmutils.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmutils.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/bcmutils.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmutils.h 2005-11-07 01:12:51.827810000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bcmutils.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,136 @@
|
@@ -0,0 +1,136 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc useful os-independent macros and functions.
|
+ * Misc useful os-independent macros and functions.
|
||||||
@ -8066,9 +8066,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmutils.h linux-2.6.12.5-br
|
|||||||
+#define bcmdumplog(buf, size) *buf = '\0'
|
+#define bcmdumplog(buf, size) *buf = '\0'
|
||||||
+
|
+
|
||||||
+#endif /* _bcmutils_h_ */
|
+#endif /* _bcmutils_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bitfuncs.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bitfuncs.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/bitfuncs.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bitfuncs.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bitfuncs.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/bitfuncs.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bitfuncs.h 2005-11-07 01:12:51.827810000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/bitfuncs.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,85 @@
|
@@ -0,0 +1,85 @@
|
||||||
+/*
|
+/*
|
||||||
+ * bit manipulation utility functions
|
+ * bit manipulation utility functions
|
||||||
@ -8155,9 +8155,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bitfuncs.h linux-2.6.12.5-br
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+#endif /* _BITFUNCS_H */
|
+#endif /* _BITFUNCS_H */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/epivers.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/epivers.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/epivers.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/epivers.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/epivers.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/epivers.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/epivers.h 2005-11-07 01:12:51.827810000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/epivers.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,69 @@
|
@@ -0,0 +1,69 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright 2001-2003, Broadcom Corporation
|
+ * Copyright 2001-2003, Broadcom Corporation
|
||||||
@ -8228,9 +8228,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/epivers.h linux-2.6.12.5-brc
|
|||||||
+#define EPI_ROUTER_VERSION_STR "1.1.2.0"
|
+#define EPI_ROUTER_VERSION_STR "1.1.2.0"
|
||||||
+
|
+
|
||||||
+#endif /* _epivers_h_ */
|
+#endif /* _epivers_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/epivers.h.in linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/epivers.h.in
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/epivers.h.in linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/epivers.h.in
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/epivers.h.in 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/epivers.h.in 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/epivers.h.in 2005-11-07 01:12:51.827810000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/epivers.h.in 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,69 @@
|
@@ -0,0 +1,69 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright 2001-2003, Broadcom Corporation
|
+ * Copyright 2001-2003, Broadcom Corporation
|
||||||
@ -8301,9 +8301,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/epivers.h.in linux-2.6.12.5-
|
|||||||
+#define EPI_ROUTER_VERSION_STR "@EPI_ROUTER_VERSION_STR@"
|
+#define EPI_ROUTER_VERSION_STR "@EPI_ROUTER_VERSION_STR@"
|
||||||
+
|
+
|
||||||
+#endif /* _epivers_h_ */
|
+#endif /* _epivers_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/etsockio.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/etsockio.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/etsockio.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/etsockio.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/etsockio.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/etsockio.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/etsockio.h 2005-11-07 01:12:51.827810000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/etsockio.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,60 @@
|
@@ -0,0 +1,60 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Driver-specific socket ioctls
|
+ * Driver-specific socket ioctls
|
||||||
@ -8365,9 +8365,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/etsockio.h linux-2.6.12.5-br
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/flash.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/flash.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/flash.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/flash.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/flash.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/flash.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/flash.h 2005-11-07 01:12:51.827810000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/flash.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,184 @@
|
@@ -0,0 +1,184 @@
|
||||||
+/*
|
+/*
|
||||||
+ * flash.h: Common definitions for flash access.
|
+ * flash.h: Common definitions for flash access.
|
||||||
@ -8553,9 +8553,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/flash.h linux-2.6.12.5-brcm/
|
|||||||
+extern flash_desc_t flashes[];
|
+extern flash_desc_t flashes[];
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/flashutl.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/flashutl.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/flashutl.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/flashutl.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/flashutl.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/flashutl.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/flashutl.h 2005-11-07 01:12:51.831810250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/flashutl.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,34 @@
|
@@ -0,0 +1,34 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM47XX FLASH driver interface
|
+ * BCM47XX FLASH driver interface
|
||||||
@ -8591,9 +8591,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/flashutl.h linux-2.6.12.5-br
|
|||||||
+extern flash_cmds_t* flashutl_cmd;
|
+extern flash_cmds_t* flashutl_cmd;
|
||||||
+
|
+
|
||||||
+#endif /* _flashutl_h_ */
|
+#endif /* _flashutl_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/hnddma.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/hnddma.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/hnddma.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/hnddma.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/hnddma.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/hnddma.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/hnddma.h 2005-11-07 01:12:51.831810250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/hnddma.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,181 @@
|
@@ -0,0 +1,181 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Generic Broadcom Home Networking Division (HND) DMA engine definitions.
|
+ * Generic Broadcom Home Networking Division (HND) DMA engine definitions.
|
||||||
@ -8776,9 +8776,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/hnddma.h linux-2.6.12.5-brcm
|
|||||||
+extern uint dma_txactive(di_t *di);
|
+extern uint dma_txactive(di_t *di);
|
||||||
+
|
+
|
||||||
+#endif /* _hnddma_h_ */
|
+#endif /* _hnddma_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/hndmips.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/hndmips.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/hndmips.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/hndmips.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/hndmips.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/hndmips.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/hndmips.h 2005-11-07 01:12:51.831810250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/hndmips.h 2005-12-13 14:59:52.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
|
||||||
@ -8796,9 +8796,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/hndmips.h linux-2.6.12.5-brc
|
|||||||
+ */
|
+ */
|
||||||
+
|
+
|
||||||
+#include "sbmips.h"
|
+#include "sbmips.h"
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/linux_osl.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/linux_osl.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/linux_osl.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/linux_osl.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/linux_osl.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/linux_osl.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/linux_osl.h 2005-11-07 01:12:51.831810250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/linux_osl.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,313 @@
|
@@ -0,0 +1,313 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Linux OS Independent Layer
|
+ * Linux OS Independent Layer
|
||||||
@ -9113,9 +9113,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/linux_osl.h linux-2.6.12.5-b
|
|||||||
+#endif /* BINOSL */
|
+#endif /* BINOSL */
|
||||||
+
|
+
|
||||||
+#endif /* _linux_osl_h_ */
|
+#endif /* _linux_osl_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/linuxver.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/linuxver.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/linuxver.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/linuxver.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/linuxver.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/linuxver.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/linuxver.h 2005-11-07 01:12:51.831810250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/linuxver.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,326 @@
|
@@ -0,0 +1,326 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Linux-specific abstractions to gain some independence from linux kernel versions.
|
+ * Linux-specific abstractions to gain some independence from linux kernel versions.
|
||||||
@ -9443,9 +9443,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/linuxver.h linux-2.6.12.5-br
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+#endif /* _linuxver_h_ */
|
+#endif /* _linuxver_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/nvports.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/nvports.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/nvports.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/nvports.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/nvports.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/nvports.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/nvports.h 2005-11-07 01:12:51.831810250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/nvports.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,62 @@
|
@@ -0,0 +1,62 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Broadcom Home Gateway Reference Design
|
+ * Broadcom Home Gateway Reference Design
|
||||||
@ -9509,9 +9509,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/nvports.h linux-2.6.12.5-brc
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/osl.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/osl.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/osl.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/osl.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/osl.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/osl.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/osl.h 2005-11-07 01:12:51.835810500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/osl.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,38 @@
|
@@ -0,0 +1,38 @@
|
||||||
+/*
|
+/*
|
||||||
+ * OS Independent Layer
|
+ * OS Independent Layer
|
||||||
@ -9551,9 +9551,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/osl.h linux-2.6.12.5-brcm/ar
|
|||||||
+#define SET_REG(r, mask, val) W_REG((r), ((R_REG(r) & ~(mask)) | (val)))
|
+#define SET_REG(r, mask, val) W_REG((r), ((R_REG(r) & ~(mask)) | (val)))
|
||||||
+
|
+
|
||||||
+#endif /* _osl_h_ */
|
+#endif /* _osl_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/pcicfg.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/pcicfg.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/pcicfg.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/pcicfg.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/pcicfg.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/pcicfg.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/pcicfg.h 2005-11-07 01:12:51.835810500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/pcicfg.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,362 @@
|
@@ -0,0 +1,362 @@
|
||||||
+/*
|
+/*
|
||||||
+ * pcicfg.h: PCI configuration constants and structures.
|
+ * pcicfg.h: PCI configuration constants and structures.
|
||||||
@ -9917,9 +9917,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/pcicfg.h linux-2.6.12.5-brcm
|
|||||||
+#define SPROM_CRC_RANGE 64 /* crc cover range in 16-bit */
|
+#define SPROM_CRC_RANGE 64 /* crc cover range in 16-bit */
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/proto/802.11.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/proto/802.11.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/proto/802.11.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/proto/802.11.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/proto/802.11.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/proto/802.11.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/proto/802.11.h 2005-11-07 01:12:51.835810500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/proto/802.11.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,679 @@
|
@@ -0,0 +1,679 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright 2001-2003, Broadcom Corporation
|
+ * Copyright 2001-2003, Broadcom Corporation
|
||||||
@ -10600,9 +10600,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/proto/802.11.h linux-2.6.12.
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+#endif /* _802_11_H_ */
|
+#endif /* _802_11_H_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/proto/ethernet.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/proto/ethernet.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/proto/ethernet.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/proto/ethernet.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/proto/ethernet.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/proto/ethernet.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/proto/ethernet.h 2005-11-07 01:12:51.835810500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/proto/ethernet.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,145 @@
|
@@ -0,0 +1,145 @@
|
||||||
+/*******************************************************************************
|
+/*******************************************************************************
|
||||||
+ * $Id$
|
+ * $Id$
|
||||||
@ -10749,9 +10749,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/proto/ethernet.h linux-2.6.1
|
|||||||
+#undef PACKED
|
+#undef PACKED
|
||||||
+
|
+
|
||||||
+#endif /* _NET_ETHERNET_H_ */
|
+#endif /* _NET_ETHERNET_H_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/rts/crc.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/rts/crc.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/rts/crc.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/rts/crc.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/rts/crc.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/rts/crc.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/rts/crc.h 2005-11-07 01:12:51.835810500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/rts/crc.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,69 @@
|
@@ -0,0 +1,69 @@
|
||||||
+/*******************************************************************************
|
+/*******************************************************************************
|
||||||
+ * $Id$
|
+ * $Id$
|
||||||
@ -10822,9 +10822,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/rts/crc.h linux-2.6.12.5-brc
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+#endif /* _RTS_CRC_H_ */
|
+#endif /* _RTS_CRC_H_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/s5.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/s5.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/s5.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/s5.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/s5.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/s5.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/s5.h 2005-11-07 01:12:51.835810500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/s5.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,103 @@
|
@@ -0,0 +1,103 @@
|
||||||
+#ifndef _S5_H_
|
+#ifndef _S5_H_
|
||||||
+#define _S5_H_
|
+#define _S5_H_
|
||||||
@ -10929,9 +10929,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/s5.h linux-2.6.12.5-brcm/arc
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+#endif /*!_S5_H_ */
|
+#endif /*!_S5_H_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbchipc.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbchipc.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbchipc.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbchipc.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbchipc.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbchipc.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbchipc.h 2005-11-07 01:12:51.839810750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbchipc.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,281 @@
|
@@ -0,0 +1,281 @@
|
||||||
+/*
|
+/*
|
||||||
+ * SiliconBackplane Chipcommon core hardware definitions.
|
+ * SiliconBackplane Chipcommon core hardware definitions.
|
||||||
@ -11214,9 +11214,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbchipc.h linux-2.6.12.5-brc
|
|||||||
+#define SFLASH_AT_ID_SHIFT 3
|
+#define SFLASH_AT_ID_SHIFT 3
|
||||||
+
|
+
|
||||||
+#endif /* _SBCHIPC_H */
|
+#endif /* _SBCHIPC_H */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbconfig.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbconfig.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbconfig.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbconfig.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbconfig.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbconfig.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbconfig.h 2005-11-07 01:12:51.839810750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbconfig.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,296 @@
|
@@ -0,0 +1,296 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Broadcom SiliconBackplane hardware register definitions.
|
+ * Broadcom SiliconBackplane hardware register definitions.
|
||||||
@ -11514,9 +11514,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbconfig.h linux-2.6.12.5-br
|
|||||||
+#define SB_ROBO 0x81C /* robo switch core */
|
+#define SB_ROBO 0x81C /* robo switch core */
|
||||||
+
|
+
|
||||||
+#endif /* _SBCONFIG_H */
|
+#endif /* _SBCONFIG_H */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbextif.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbextif.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbextif.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbextif.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbextif.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbextif.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbextif.h 2005-11-07 01:12:51.839810750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbextif.h 2005-12-13 14:59:52.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
|
||||||
@ -11760,9 +11760,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbextif.h linux-2.6.12.5-brc
|
|||||||
+#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 -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbmemc.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbmemc.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbmemc.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbmemc.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbmemc.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbmemc.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbmemc.h 2005-11-07 01:12:51.839810750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbmemc.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,144 @@
|
@@ -0,0 +1,144 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM47XX Sonics SiliconBackplane DDR/SDRAM controller core hardware definitions.
|
+ * BCM47XX Sonics SiliconBackplane DDR/SDRAM controller core hardware definitions.
|
||||||
@ -11908,9 +11908,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbmemc.h linux-2.6.12.5-brcm
|
|||||||
+#define MEMC_CONFIG_DDR 0x00000001
|
+#define MEMC_CONFIG_DDR 0x00000001
|
||||||
+
|
+
|
||||||
+#endif /* _SBMEMC_H */
|
+#endif /* _SBMEMC_H */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbmips.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbmips.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbmips.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbmips.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbmips.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbmips.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbmips.h 2005-11-07 01:12:51.839810750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbmips.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,56 @@
|
@@ -0,0 +1,56 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Broadcom SiliconBackplane MIPS definitions
|
+ * Broadcom SiliconBackplane MIPS definitions
|
||||||
@ -11968,9 +11968,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbmips.h linux-2.6.12.5-brcm
|
|||||||
+#endif /* _LANGUAGE_ASSEMBLY */
|
+#endif /* _LANGUAGE_ASSEMBLY */
|
||||||
+
|
+
|
||||||
+#endif /* _SBMIPS_H */
|
+#endif /* _SBMIPS_H */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbpci.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbpci.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbpci.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbpci.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbpci.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbpci.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbpci.h 2005-11-07 01:12:51.839810750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbpci.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,113 @@
|
@@ -0,0 +1,113 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM47XX Sonics SiliconBackplane PCI core hardware definitions.
|
+ * BCM47XX Sonics SiliconBackplane PCI core hardware definitions.
|
||||||
@ -12085,9 +12085,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbpci.h linux-2.6.12.5-brcm/
|
|||||||
+#endif /* !_LANGUAGE_ASSEMBLY */
|
+#endif /* !_LANGUAGE_ASSEMBLY */
|
||||||
+
|
+
|
||||||
+#endif /* _SBPCI_H */
|
+#endif /* _SBPCI_H */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbpcmcia.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbpcmcia.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbpcmcia.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbpcmcia.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbpcmcia.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbpcmcia.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbpcmcia.h 2005-11-07 01:12:51.839810750 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbpcmcia.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,131 @@
|
@@ -0,0 +1,131 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BCM43XX Sonics SiliconBackplane PCMCIA core hardware definitions.
|
+ * BCM43XX Sonics SiliconBackplane PCMCIA core hardware definitions.
|
||||||
@ -12220,9 +12220,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbpcmcia.h linux-2.6.12.5-br
|
|||||||
+#define HNBU_LED 0x09 /* LED set */
|
+#define HNBU_LED 0x09 /* LED set */
|
||||||
+
|
+
|
||||||
+#endif /* _SBPCMCIA_H */
|
+#endif /* _SBPCMCIA_H */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbsdram.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbsdram.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbsdram.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbsdram.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbsdram.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbsdram.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbsdram.h 2005-11-07 01:12:51.843811000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbsdram.h 2005-12-13 14:59:52.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.
|
||||||
@ -12299,9 +12299,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbsdram.h linux-2.6.12.5-brc
|
|||||||
+#define MEM8MX16X2 0xc29 /* 32 MB */
|
+#define MEM8MX16X2 0xc29 /* 32 MB */
|
||||||
+
|
+
|
||||||
+#endif /* _SBSDRAM_H */
|
+#endif /* _SBSDRAM_H */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbutils.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbutils.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbutils.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbutils.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbutils.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/sbutils.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbutils.h 2005-11-07 01:12:51.843811000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/sbutils.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,90 @@
|
@@ -0,0 +1,90 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Misc utility routines for accessing chip-specific features
|
+ * Misc utility routines for accessing chip-specific features
|
||||||
@ -12393,9 +12393,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbutils.h linux-2.6.12.5-brc
|
|||||||
+#define CLK_DYNAMIC 2 /* enable dynamic power control */
|
+#define CLK_DYNAMIC 2 /* enable dynamic power control */
|
||||||
+
|
+
|
||||||
+#endif /* _sbutils_h_ */
|
+#endif /* _sbutils_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/trxhdr.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/trxhdr.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/trxhdr.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/trxhdr.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/trxhdr.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/trxhdr.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/trxhdr.h 2005-11-07 01:12:51.843811000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/trxhdr.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,31 @@
|
@@ -0,0 +1,31 @@
|
||||||
+/*
|
+/*
|
||||||
+ * TRX image file header format.
|
+ * TRX image file header format.
|
||||||
@ -12428,9 +12428,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/trxhdr.h linux-2.6.12.5-brcm
|
|||||||
+
|
+
|
||||||
+/* Compatibility */
|
+/* Compatibility */
|
||||||
+typedef struct trx_header TRXHDR, *PTRXHDR;
|
+typedef struct trx_header TRXHDR, *PTRXHDR;
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/typedefs.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/typedefs.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/typedefs.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/typedefs.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/typedefs.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/typedefs.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/typedefs.h 2005-11-07 01:12:51.843811000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/typedefs.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,162 @@
|
@@ -0,0 +1,162 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright 2001-2003, Broadcom Corporation
|
+ * Copyright 2001-2003, Broadcom Corporation
|
||||||
@ -12594,9 +12594,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/typedefs.h linux-2.6.12.5-br
|
|||||||
+#endif /* INLINE */
|
+#endif /* INLINE */
|
||||||
+
|
+
|
||||||
+#endif /* _TYPEDEFS_H_ */
|
+#endif /* _TYPEDEFS_H_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/wlioctl.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/wlioctl.h
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/include/wlioctl.h linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/wlioctl.h
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/include/wlioctl.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/include/wlioctl.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/wlioctl.h 2005-11-07 01:12:51.843811000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/include/wlioctl.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,690 @@
|
@@ -0,0 +1,690 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Custom OID/ioctl definitions for
|
+ * Custom OID/ioctl definitions for
|
||||||
@ -13288,9 +13288,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/wlioctl.h linux-2.6.12.5-brc
|
|||||||
+#undef PACKED
|
+#undef PACKED
|
||||||
+
|
+
|
||||||
+#endif /* _wlioctl_h_ */
|
+#endif /* _wlioctl_h_ */
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/int-handler.S linux-2.6.12.5-brcm/arch/mips/bcm947xx/int-handler.S
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/int-handler.S linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/int-handler.S
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/int-handler.S 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/int-handler.S 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/int-handler.S 2005-11-07 01:12:51.843811000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/int-handler.S 2005-12-13 14:59:52.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)
|
||||||
@ -13340,9 +13340,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/int-handler.S linux-2.6.12.5-brcm/ar
|
|||||||
+ nop
|
+ nop
|
||||||
+
|
+
|
||||||
+ END(bcm47xx_irq_handler)
|
+ END(bcm47xx_irq_handler)
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/irq.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/irq.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/irq.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/irq.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/irq.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/irq.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/irq.c 2005-11-19 02:16:15.531125500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/irq.c 2005-12-13 14:59:52.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)
|
||||||
@ -13411,9 +13411,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/irq.c linux-2.6.12.5-brcm/arch/mips/
|
|||||||
+ 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 -Nur linux-2.6.12.5/arch/mips/bcm947xx/Makefile linux-2.6.12.5-brcm/arch/mips/bcm947xx/Makefile
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/Makefile linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/Makefile
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/Makefile 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/Makefile 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/Makefile 2005-11-07 01:12:51.811809000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/Makefile 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,6 @@
|
@@ -0,0 +1,6 @@
|
||||||
+#
|
+#
|
||||||
+# Makefile for the BCM47xx specific kernel interface routines
|
+# Makefile for the BCM47xx specific kernel interface routines
|
||||||
@ -13421,9 +13421,9 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/Makefile linux-2.6.12.5-brcm/arch/mi
|
|||||||
+#
|
+#
|
||||||
+
|
+
|
||||||
+obj-y := irq.o int-handler.o prom.o setup.o time.o
|
+obj-y := irq.o int-handler.o prom.o setup.o time.o
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/prom.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/prom.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/prom.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/prom.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/prom.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/prom.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/prom.c 2005-11-07 01:12:51.847811250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/prom.c 2005-12-13 14:59:52.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)
|
||||||
@ -13484,10 +13484,10 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/prom.c linux-2.6.12.5-brcm/arch/mips
|
|||||||
+{
|
+{
|
||||||
+ return 0;
|
+ return 0;
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/setup.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/setup.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/setup.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/setup.c
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/setup.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/setup.c 2005-11-29 01:23:30.667381000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/setup.c 2005-12-13 15:47:49.000000000 +0100
|
||||||
@@ -0,0 +1,112 @@
|
@@ -0,0 +1,108 @@
|
||||||
+/*
|
+/*
|
||||||
+ * 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>
|
||||||
@ -13580,7 +13580,7 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/setup.c linux-2.6.12.5-brcm/arch/mip
|
|||||||
+ while (1);
|
+ while (1);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+static int __init bcm47xx_init(void)
|
+void __init plat_setup(void)
|
||||||
+{
|
+{
|
||||||
+
|
+
|
||||||
+ sbh = sb_kattach();
|
+ sbh = sb_kattach();
|
||||||
@ -13595,14 +13595,10 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/setup.c linux-2.6.12.5-brcm/arch/mip
|
|||||||
+
|
+
|
||||||
+ board_time_init = bcm47xx_time_init;
|
+ board_time_init = bcm47xx_time_init;
|
||||||
+ board_timer_setup = bcm47xx_timer_setup;
|
+ board_timer_setup = bcm47xx_timer_setup;
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
+}
|
||||||
+
|
diff -Nur linux-2.6.15-rc5/arch/mips/bcm947xx/time.c linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/time.c
|
||||||
+early_initcall(bcm47xx_init);
|
--- linux-2.6.15-rc5/arch/mips/bcm947xx/time.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/time.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/time.c
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/bcm947xx/time.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
--- linux-2.6.12.5/arch/mips/bcm947xx/time.c 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/time.c 2005-11-07 01:12:51.847811250 +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)
|
||||||
@ -13663,10 +13659,10 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/time.c linux-2.6.12.5-brcm/arch/mips
|
|||||||
+ /* Enable the timer interrupt */
|
+ /* Enable the timer interrupt */
|
||||||
+ setup_irq(7, irq);
|
+ setup_irq(7, irq);
|
||||||
+}
|
+}
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/Kconfig linux-2.6.12.5-brcm/arch/mips/Kconfig
|
diff -Nur linux-2.6.15-rc5/arch/mips/Kconfig linux-2.6.15-rc5-openwrt/arch/mips/Kconfig
|
||||||
--- linux-2.6.12.5/arch/mips/Kconfig 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.15-rc5/arch/mips/Kconfig 2005-12-04 06:10:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/Kconfig 2005-11-07 01:12:51.811809000 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/Kconfig 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -40,6 +40,15 @@
|
@@ -244,6 +244,17 @@
|
||||||
Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
|
Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
|
||||||
Olivetti M700-10 workstations.
|
Olivetti M700-10 workstations.
|
||||||
|
|
||||||
@ -13675,28 +13671,21 @@ diff -Nur linux-2.6.12.5/arch/mips/Kconfig linux-2.6.12.5-brcm/arch/mips/Kconfig
|
|||||||
+ select DMA_NONCOHERENT
|
+ select DMA_NONCOHERENT
|
||||||
+ select HW_HAS_PCI
|
+ select HW_HAS_PCI
|
||||||
+ select IRQ_CPU
|
+ select IRQ_CPU
|
||||||
+ select CPU_LITTLE_ENDIAN
|
+ select SYS_HAS_CPU_MIPS32_R1
|
||||||
|
+ select SYS_SUPPORTS_32BIT_KERNEL
|
||||||
|
+ select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||||
+ help
|
+ help
|
||||||
+ Support for BCM947xx based boards
|
+ Support for BCM947xx based boards
|
||||||
+
|
+
|
||||||
config ACER_PICA_61
|
config LASAT
|
||||||
bool "Support for Acer PICA 1 chipset (EXPERIMENTAL)"
|
bool "Support for LASAT Networks platforms"
|
||||||
depends on MACH_JAZZ && EXPERIMENTAL
|
select DMA_NONCOHERENT
|
||||||
@@ -974,7 +983,7 @@
|
diff -Nur linux-2.6.15-rc5/arch/mips/kernel/cpu-probe.c linux-2.6.15-rc5-openwrt/arch/mips/kernel/cpu-probe.c
|
||||||
|
--- linux-2.6.15-rc5/arch/mips/kernel/cpu-probe.c 2005-12-04 06:10:42.000000000 +0100
|
||||||
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/kernel/cpu-probe.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
|
@@ -656,6 +656,28 @@
|
||||||
|
}
|
||||||
|
|
||||||
config CPU_LITTLE_ENDIAN
|
|
||||||
bool "Generate little endian code"
|
|
||||||
- default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 || MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || MIPS_IVR || SOC_AU1X00 || NEC_OSPREY || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || ZAO_CAPCELLA
|
|
||||||
+ default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 || MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || MIPS_IVR || SOC_AU1X00 || NEC_OSPREY || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || ZAO_CAPCELLA || BCM947XX
|
|
||||||
default n if MIPS_EV64120 || MIPS_EV96100 || MOMENCO_OCELOT || MOMENCO_OCELOT_G || SGI_IP22 || SGI_IP27 || SGI_IP32 || TOSHIBA_JMR3927
|
|
||||||
help
|
|
||||||
Some MIPS machines can be configured for either little or big endian
|
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/kernel/cpu-probe.c linux-2.6.12.5-brcm/arch/mips/kernel/cpu-probe.c
|
|
||||||
--- linux-2.6.12.5/arch/mips/kernel/cpu-probe.c 2005-08-15 02:20:18.000000000 +0200
|
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/kernel/cpu-probe.c 2005-11-07 01:12:51.847811250 +0100
|
|
||||||
@@ -555,6 +555,28 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
|
+static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
|
||||||
+{
|
+{
|
||||||
@ -13706,13 +13695,13 @@ diff -Nur linux-2.6.12.5/arch/mips/kernel/cpu-probe.c linux-2.6.12.5-brcm/arch/m
|
|||||||
+ c->cputype = CPU_BCM3302;
|
+ c->cputype = CPU_BCM3302;
|
||||||
+ c->isa_level = MIPS_CPU_ISA_M32;
|
+ c->isa_level = MIPS_CPU_ISA_M32;
|
||||||
+ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
|
+ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
|
||||||
+ MIPS_CPU_4KTLB | 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_M32;
|
||||||
+ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
|
+ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
|
||||||
+ MIPS_CPU_4KTLB | MIPS_CPU_COUNTER;
|
+ MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER;
|
||||||
+ break;
|
+ break;
|
||||||
+ default:
|
+ default:
|
||||||
+ c->cputype = CPU_UNKNOWN;
|
+ c->cputype = CPU_UNKNOWN;
|
||||||
@ -13723,21 +13712,20 @@ diff -Nur linux-2.6.12.5/arch/mips/kernel/cpu-probe.c linux-2.6.12.5-brcm/arch/m
|
|||||||
__init void cpu_probe(void)
|
__init void cpu_probe(void)
|
||||||
{
|
{
|
||||||
struct cpuinfo_mips *c = ¤t_cpu_data;
|
struct cpuinfo_mips *c = ¤t_cpu_data;
|
||||||
@@ -577,7 +599,9 @@
|
@@ -678,6 +700,9 @@
|
||||||
case PRID_COMP_SIBYTE:
|
case PRID_COMP_SIBYTE:
|
||||||
cpu_probe_sibyte(c);
|
cpu_probe_sibyte(c);
|
||||||
break;
|
break;
|
||||||
-
|
|
||||||
+ case PRID_COMP_BROADCOM:
|
+ case PRID_COMP_BROADCOM:
|
||||||
+ cpu_probe_broadcom(c);
|
+ cpu_probe_broadcom(c);
|
||||||
+ break;
|
+ break;
|
||||||
case PRID_COMP_SANDCRAFT:
|
case PRID_COMP_SANDCRAFT:
|
||||||
cpu_probe_sandcraft(c);
|
cpu_probe_sandcraft(c);
|
||||||
break;
|
break;
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/kernel/head.S linux-2.6.12.5-brcm/arch/mips/kernel/head.S
|
diff -Nur linux-2.6.15-rc5/arch/mips/kernel/head.S linux-2.6.15-rc5-openwrt/arch/mips/kernel/head.S
|
||||||
--- linux-2.6.12.5/arch/mips/kernel/head.S 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.15-rc5/arch/mips/kernel/head.S 2005-12-04 06:10:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/kernel/head.S 2005-11-07 01:12:51.847811250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/kernel/head.S 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -122,6 +122,14 @@
|
@@ -107,6 +107,14 @@
|
||||||
#endif
|
#endif
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
@ -13752,42 +13740,23 @@ diff -Nur linux-2.6.12.5/arch/mips/kernel/head.S linux-2.6.12.5-brcm/arch/mips/k
|
|||||||
/*
|
/*
|
||||||
* 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 -Nur linux-2.6.12.5/arch/mips/kernel/proc.c linux-2.6.12.5-brcm/arch/mips/kernel/proc.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/kernel/proc.c linux-2.6.15-rc5-openwrt/arch/mips/kernel/proc.c
|
||||||
--- linux-2.6.12.5/arch/mips/kernel/proc.c 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.15-rc5/arch/mips/kernel/proc.c 2005-12-04 06:10:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/kernel/proc.c 2005-11-07 01:12:51.847811250 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/kernel/proc.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -75,7 +75,9 @@
|
@@ -82,6 +82,8 @@
|
||||||
[CPU_VR4133] "NEC VR4133",
|
[CPU_VR4181] = "NEC VR4181",
|
||||||
[CPU_VR4181] "NEC VR4181",
|
[CPU_VR4181A] = "NEC VR4181A",
|
||||||
[CPU_VR4181A] "NEC VR4181A",
|
[CPU_SR71000] = "Sandcraft SR71000",
|
||||||
- [CPU_SR71000] "Sandcraft SR71000"
|
+ [CPU_BCM3302] = "Broadcom BCM3302",
|
||||||
+ [CPU_SR71000] "Sandcraft SR71000",
|
+ [CPU_BCM4710] = "Broadcom BCM4710",
|
||||||
+ [CPU_BCM3302] "Broadcom BCM3302",
|
[CPU_PR4450] = "Philips PR4450",
|
||||||
+ [CPU_BCM4710] "Broadcom BCM4710"
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
diff -Nur linux-2.6.15-rc5/arch/mips/Makefile linux-2.6.15-rc5-openwrt/arch/mips/Makefile
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/Makefile linux-2.6.12.5-brcm/arch/mips/Makefile
|
--- linux-2.6.15-rc5/arch/mips/Makefile 2005-12-04 06:10:42.000000000 +0100
|
||||||
--- linux-2.6.12.5/arch/mips/Makefile 2005-08-15 02:20:18.000000000 +0200
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/Makefile 2005-12-13 14:59:52.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/Makefile 2005-11-07 01:12:51.811809000 +0100
|
@@ -689,6 +689,13 @@
|
||||||
@@ -79,7 +79,7 @@
|
load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000
|
||||||
cflags-y += -I $(TOPDIR)/include/asm/gcc
|
|
||||||
cflags-y += -G 0 -mno-abicalls -fno-pic -pipe
|
|
||||||
cflags-y += $(call cc-option, -finline-limit=100000)
|
|
||||||
-LDFLAGS_vmlinux += -G 0 -static -n
|
|
||||||
+LDFLAGS_vmlinux += -G 0 -static -n -nostdlib
|
|
||||||
MODFLAGS += -mlong-calls
|
|
||||||
|
|
||||||
cflags-$(CONFIG_SB1XXX_CORELIS) += -mno-sched-prolog -fno-omit-frame-pointer
|
|
||||||
@@ -170,6 +170,7 @@
|
|
||||||
cflags-$(CONFIG_CPU_MIPS32) += \
|
|
||||||
$(call set_gccflags,mips32,mips32,r4600,mips3,mips2) \
|
|
||||||
-Wa,--trap
|
|
||||||
+cflags-$(CONFIG_CPU_MIPS32) += -Wa,--trap
|
|
||||||
|
|
||||||
cflags-$(CONFIG_CPU_MIPS64) += \
|
|
||||||
$(call set_gccflags,mips64,mips64,r4600,mips3,mips2) \
|
|
||||||
@@ -618,6 +619,14 @@
|
|
||||||
load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000
|
|
||||||
|
|
||||||
#
|
#
|
||||||
+# Broadcom BCM47XX boards
|
+# Broadcom BCM47XX boards
|
||||||
@ -13796,15 +13765,14 @@ diff -Nur linux-2.6.12.5/arch/mips/Makefile linux-2.6.12.5-brcm/arch/mips/Makefi
|
|||||||
+cflags-$(CONFIG_BCM947XX) += -Iarch/mips/bcm947xx/include
|
+cflags-$(CONFIG_BCM947XX) += -Iarch/mips/bcm947xx/include
|
||||||
+load-$(CONFIG_BCM947XX) := 0xffffffff80001000
|
+load-$(CONFIG_BCM947XX) := 0xffffffff80001000
|
||||||
+
|
+
|
||||||
+
|
|
||||||
+#
|
+#
|
||||||
# SNI RM200 PCI
|
# SNI RM200 PCI
|
||||||
#
|
#
|
||||||
core-$(CONFIG_SNI_RM200_PCI) += arch/mips/sni/
|
core-$(CONFIG_SNI_RM200_PCI) += arch/mips/sni/
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/mm/tlbex.c linux-2.6.12.5-brcm/arch/mips/mm/tlbex.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/mm/tlbex.c linux-2.6.15-rc5-openwrt/arch/mips/mm/tlbex.c
|
||||||
--- linux-2.6.12.5/arch/mips/mm/tlbex.c 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.15-rc5/arch/mips/mm/tlbex.c 2005-12-04 06:10:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/mm/tlbex.c 2005-11-07 01:12:51.851811500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/mm/tlbex.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -851,6 +851,8 @@
|
@@ -858,6 +858,8 @@
|
||||||
case CPU_4KSC:
|
case CPU_4KSC:
|
||||||
case CPU_20KC:
|
case CPU_20KC:
|
||||||
case CPU_25KF:
|
case CPU_25KF:
|
||||||
@ -13813,9 +13781,9 @@ diff -Nur linux-2.6.12.5/arch/mips/mm/tlbex.c linux-2.6.12.5-brcm/arch/mips/mm/t
|
|||||||
tlbw(p);
|
tlbw(p);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/pci/fixup-bcm47xx.c linux-2.6.12.5-brcm/arch/mips/pci/fixup-bcm47xx.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/pci/fixup-bcm47xx.c linux-2.6.15-rc5-openwrt/arch/mips/pci/fixup-bcm47xx.c
|
||||||
--- linux-2.6.12.5/arch/mips/pci/fixup-bcm47xx.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/pci/fixup-bcm47xx.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/pci/fixup-bcm47xx.c 2005-11-07 01:12:51.851811500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/pci/fixup-bcm47xx.c 2005-12-13 15:04:21.000000000 +0100
|
||||||
@@ -0,0 +1,23 @@
|
@@ -0,0 +1,23 @@
|
||||||
+#include <linux/init.h>
|
+#include <linux/init.h>
|
||||||
+#include <linux/pci.h>
|
+#include <linux/pci.h>
|
||||||
@ -13837,23 +13805,23 @@ diff -Nur linux-2.6.12.5/arch/mips/pci/fixup-bcm47xx.c linux-2.6.12.5-brcm/arch/
|
|||||||
+ return irq + 2;
|
+ return irq + 2;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+struct pci_fixup pcibios_fixups[] __initdata = {
|
+struct pci_fixup pcibios_fixups[] = {
|
||||||
+ { 0 }
|
+ { 0 }
|
||||||
+};
|
+};
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/pci/Makefile linux-2.6.12.5-brcm/arch/mips/pci/Makefile
|
diff -Nur linux-2.6.15-rc5/arch/mips/pci/Makefile linux-2.6.15-rc5-openwrt/arch/mips/pci/Makefile
|
||||||
--- linux-2.6.12.5/arch/mips/pci/Makefile 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.15-rc5/arch/mips/pci/Makefile 2005-12-04 06:10:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/pci/Makefile 2005-11-07 01:12:51.851811500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/pci/Makefile 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -18,6 +18,7 @@
|
@@ -18,6 +18,7 @@
|
||||||
obj-$(CONFIG_MIPS_TX3927) += ops-jmr3927.o
|
obj-$(CONFIG_MIPS_TX3927) += ops-tx3927.o
|
||||||
obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o
|
obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o
|
||||||
obj-$(CONFIG_NEC_CMBVR4133) += fixup-vr4133.o
|
obj-$(CONFIG_NEC_CMBVR4133) += fixup-vr4133.o
|
||||||
+obj-$(CONFIG_BCM947XX) += ops-sb.o fixup-bcm47xx.o pci-bcm47xx.o
|
+obj-$(CONFIG_BCM947XX) += ops-sb.o fixup-bcm47xx.o pci-bcm47xx.o
|
||||||
|
|
||||||
#
|
#
|
||||||
# These are still pretty much in the old state, watch, go blind.
|
# These are still pretty much in the old state, watch, go blind.
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/pci/ops-sb.c linux-2.6.12.5-brcm/arch/mips/pci/ops-sb.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/pci/ops-sb.c linux-2.6.15-rc5-openwrt/arch/mips/pci/ops-sb.c
|
||||||
--- linux-2.6.12.5/arch/mips/pci/ops-sb.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/pci/ops-sb.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/pci/ops-sb.c 2005-11-07 01:12:51.851811500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/pci/ops-sb.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,44 @@
|
@@ -0,0 +1,44 @@
|
||||||
+#include <linux/kernel.h>
|
+#include <linux/kernel.h>
|
||||||
+#include <linux/init.h>
|
+#include <linux/init.h>
|
||||||
@ -13899,9 +13867,9 @@ diff -Nur linux-2.6.12.5/arch/mips/pci/ops-sb.c linux-2.6.12.5-brcm/arch/mips/pc
|
|||||||
+ .read = sb_pci_read_config,
|
+ .read = sb_pci_read_config,
|
||||||
+ .write = sb_pci_write_config,
|
+ .write = sb_pci_write_config,
|
||||||
+};
|
+};
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/pci/pci-bcm47xx.c linux-2.6.12.5-brcm/arch/mips/pci/pci-bcm47xx.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/pci/pci-bcm47xx.c linux-2.6.15-rc5-openwrt/arch/mips/pci/pci-bcm47xx.c
|
||||||
--- linux-2.6.12.5/arch/mips/pci/pci-bcm47xx.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.15-rc5/arch/mips/pci/pci-bcm47xx.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/pci/pci-bcm47xx.c 2005-11-07 01:12:51.851811500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/pci/pci-bcm47xx.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -0,0 +1,61 @@
|
@@ -0,0 +1,61 @@
|
||||||
+#include <linux/init.h>
|
+#include <linux/init.h>
|
||||||
+#include <linux/pci.h>
|
+#include <linux/pci.h>
|
||||||
@ -13964,10 +13932,10 @@ diff -Nur linux-2.6.12.5/arch/mips/pci/pci-bcm47xx.c linux-2.6.12.5-brcm/arch/mi
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+early_initcall(bcm47xx_pci_init);
|
+early_initcall(bcm47xx_pci_init);
|
||||||
diff -Nur linux-2.6.12.5/arch/mips/pci/pci.c linux-2.6.12.5-brcm/arch/mips/pci/pci.c
|
diff -Nur linux-2.6.15-rc5/arch/mips/pci/pci.c linux-2.6.15-rc5-openwrt/arch/mips/pci/pci.c
|
||||||
--- linux-2.6.12.5/arch/mips/pci/pci.c 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.15-rc5/arch/mips/pci/pci.c 2005-12-04 06:10:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/arch/mips/pci/pci.c 2005-11-07 01:12:51.851811500 +0100
|
+++ linux-2.6.15-rc5-openwrt/arch/mips/pci/pci.c 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -238,7 +238,8 @@
|
@@ -243,7 +243,8 @@
|
||||||
if (dev->resource[i].flags & IORESOURCE_IO)
|
if (dev->resource[i].flags & IORESOURCE_IO)
|
||||||
offset = hose->io_offset;
|
offset = hose->io_offset;
|
||||||
else if (dev->resource[i].flags & IORESOURCE_MEM)
|
else if (dev->resource[i].flags & IORESOURCE_MEM)
|
||||||
@ -13977,10 +13945,10 @@ diff -Nur linux-2.6.12.5/arch/mips/pci/pci.c linux-2.6.12.5-brcm/arch/mips/pci/p
|
|||||||
|
|
||||||
dev->resource[i].start += offset;
|
dev->resource[i].start += offset;
|
||||||
dev->resource[i].end += offset;
|
dev->resource[i].end += offset;
|
||||||
diff -Nur linux-2.6.12.5/include/asm-mips/bootinfo.h linux-2.6.12.5-brcm/include/asm-mips/bootinfo.h
|
diff -Nur linux-2.6.15-rc5/include/asm-mips/bootinfo.h linux-2.6.15-rc5-openwrt/include/asm-mips/bootinfo.h
|
||||||
--- linux-2.6.12.5/include/asm-mips/bootinfo.h 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.15-rc5/include/asm-mips/bootinfo.h 2005-12-04 06:10:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/include/asm-mips/bootinfo.h 2005-11-07 01:12:51.851811500 +0100
|
+++ linux-2.6.15-rc5-openwrt/include/asm-mips/bootinfo.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -213,6 +213,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 */
|
||||||
|
|
||||||
@ -13993,10 +13961,10 @@ diff -Nur linux-2.6.12.5/include/asm-mips/bootinfo.h linux-2.6.12.5-brcm/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.12.5/include/asm-mips/cpu.h linux-2.6.12.5-brcm/include/asm-mips/cpu.h
|
diff -Nur linux-2.6.15-rc5/include/asm-mips/cpu.h linux-2.6.15-rc5-openwrt/include/asm-mips/cpu.h
|
||||||
--- linux-2.6.12.5/include/asm-mips/cpu.h 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.15-rc5/include/asm-mips/cpu.h 2005-12-04 06:10:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/include/asm-mips/cpu.h 2005-11-07 01:12:51.851811500 +0100
|
+++ linux-2.6.15-rc5-openwrt/include/asm-mips/cpu.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -87,6 +87,13 @@
|
@@ -102,6 +102,13 @@
|
||||||
#define PRID_IMP_SR71000 0x0400
|
#define PRID_IMP_SR71000 0x0400
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -14010,42 +13978,20 @@ diff -Nur linux-2.6.12.5/include/asm-mips/cpu.h linux-2.6.12.5-brcm/include/asm-
|
|||||||
* Definitions for 7:0 on legacy processors
|
* Definitions for 7:0 on legacy processors
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -177,7 +184,9 @@
|
@@ -196,7 +203,9 @@
|
||||||
#define CPU_VR4133 56
|
#define CPU_34K 60
|
||||||
#define CPU_AU1550 57
|
#define CPU_PR4450 61
|
||||||
#define CPU_24K 58
|
#define CPU_SB1A 62
|
||||||
-#define CPU_LAST 58
|
-#define CPU_LAST 62
|
||||||
+#define CPU_BCM3302 59
|
+#define CPU_BCM3302 63
|
||||||
+#define CPU_BCM4710 60
|
+#define CPU_BCM4710 64
|
||||||
+#define CPU_LAST 60
|
+#define CPU_LAST 64
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ISA Level encodings
|
* ISA Level encodings
|
||||||
diff -Nur linux-2.6.12.5/include/asm-mips/mipsregs.h linux-2.6.12.5-brcm/include/asm-mips/mipsregs.h
|
diff -Nur linux-2.6.15-rc5/include/linux/init.h linux-2.6.15-rc5-openwrt/include/linux/init.h
|
||||||
--- linux-2.6.12.5/include/asm-mips/mipsregs.h 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.15-rc5/include/linux/init.h 2005-12-04 06:10:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/include/asm-mips/mipsregs.h 2005-11-07 01:12:51.855811750 +0100
|
+++ linux-2.6.15-rc5-openwrt/include/linux/init.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -790,10 +790,18 @@
|
|
||||||
#define read_c0_config1() __read_32bit_c0_register($16, 1)
|
|
||||||
#define read_c0_config2() __read_32bit_c0_register($16, 2)
|
|
||||||
#define read_c0_config3() __read_32bit_c0_register($16, 3)
|
|
||||||
+#define read_c0_config4() __read_32bit_c0_register($16, 4)
|
|
||||||
+#define read_c0_config5() __read_32bit_c0_register($16, 5)
|
|
||||||
+#define read_c0_config6() __read_32bit_c0_register($16, 6)
|
|
||||||
+#define read_c0_config7() __read_32bit_c0_register($16, 7)
|
|
||||||
#define write_c0_config(val) __write_32bit_c0_register($16, 0, val)
|
|
||||||
#define write_c0_config1(val) __write_32bit_c0_register($16, 1, val)
|
|
||||||
#define write_c0_config2(val) __write_32bit_c0_register($16, 2, val)
|
|
||||||
#define write_c0_config3(val) __write_32bit_c0_register($16, 3, val)
|
|
||||||
+#define write_c0_config4(val) __write_32bit_c0_register($16, 4, val)
|
|
||||||
+#define write_c0_config5(val) __write_32bit_c0_register($16, 5, val)
|
|
||||||
+#define write_c0_config6(val) __write_32bit_c0_register($16, 6, val)
|
|
||||||
+#define write_c0_config7(val) __write_32bit_c0_register($16, 7, val)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The WatchLo register. There may be upto 8 of them.
|
|
||||||
diff -Nur linux-2.6.12.5/include/linux/init.h linux-2.6.12.5-brcm/include/linux/init.h
|
|
||||||
--- linux-2.6.12.5/include/linux/init.h 2005-08-15 02:20:18.000000000 +0200
|
|
||||||
+++ linux-2.6.12.5-brcm/include/linux/init.h 2005-11-07 01:12:51.855811750 +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
|
||||||
@ -14055,10 +14001,10 @@ diff -Nur linux-2.6.12.5/include/linux/init.h linux-2.6.12.5-brcm/include/linux/
|
|||||||
#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.12.5/include/linux/pci_ids.h linux-2.6.12.5-brcm/include/linux/pci_ids.h
|
diff -Nur linux-2.6.15-rc5/include/linux/pci_ids.h linux-2.6.15-rc5-openwrt/include/linux/pci_ids.h
|
||||||
--- linux-2.6.12.5/include/linux/pci_ids.h 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.15-rc5/include/linux/pci_ids.h 2005-12-04 06:10:42.000000000 +0100
|
||||||
+++ linux-2.6.12.5-brcm/include/linux/pci_ids.h 2005-11-07 01:12:51.855811750 +0100
|
+++ linux-2.6.15-rc5-openwrt/include/linux/pci_ids.h 2005-12-13 14:59:52.000000000 +0100
|
||||||
@@ -2110,6 +2110,7 @@
|
@@ -1835,6 +1835,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
|
||||||
|
@ -0,0 +1,219 @@
|
|||||||
|
diff -ur linux-2.6.15-rc5/drivers/mtd/mtd_blkdevs.c linux-2.6.15-rc5-openwrt/drivers/mtd/mtd_blkdevs.c
|
||||||
|
--- linux-2.6.15-rc5/drivers/mtd/mtd_blkdevs.c 2005-12-04 06:10:42.000000000 +0100
|
||||||
|
+++ linux-2.6.15-rc5-openwrt/drivers/mtd/mtd_blkdevs.c 2005-12-15 07:53:20.000000000 +0100
|
||||||
|
@@ -21,6 +21,9 @@
|
||||||
|
#include <linux/init.h>
|
||||||
|
#include <asm/semaphore.h>
|
||||||
|
#include <asm/uaccess.h>
|
||||||
|
+#ifdef CONFIG_DEVFS_FS
|
||||||
|
+#include <linux/devfs_fs_kernel.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
static LIST_HEAD(blktrans_majors);
|
||||||
|
|
||||||
|
@@ -302,6 +305,11 @@
|
||||||
|
snprintf(gd->disk_name, sizeof(gd->disk_name),
|
||||||
|
"%s%d", tr->name, new->devnum);
|
||||||
|
|
||||||
|
+#ifdef CONFIG_DEVFS_FS
|
||||||
|
+ snprintf(gd->devfs_name, sizeof(gd->devfs_name),
|
||||||
|
+ "%s/%c", tr->name, (tr->part_bits?'a':'0') + new->devnum);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/* 2.5 has capacity in units of 512 bytes while still
|
||||||
|
having BLOCK_SIZE_BITS set to 10. Just to keep us amused. */
|
||||||
|
set_capacity(gd, (new->size * new->blksize) >> 9);
|
||||||
|
@@ -418,6 +426,10 @@
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef CONFIG_DEVFS_FS
|
||||||
|
+ devfs_mk_dir(tr->name);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
INIT_LIST_HEAD(&tr->devs);
|
||||||
|
list_add(&tr->list, &blktrans_majors);
|
||||||
|
|
||||||
|
@@ -450,6 +462,10 @@
|
||||||
|
tr->remove_dev(dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef CONFIG_DEVFS_FS
|
||||||
|
+ devfs_remove(tr->name);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
blk_cleanup_queue(tr->blkcore_priv->rq);
|
||||||
|
unregister_blkdev(tr->major, tr->name);
|
||||||
|
|
||||||
|
diff -ur linux-2.6.15-rc5/drivers/mtd/mtdchar.c linux-2.6.15-rc5-openwrt/drivers/mtd/mtdchar.c
|
||||||
|
--- linux-2.6.15-rc5/drivers/mtd/mtdchar.c 2005-12-04 06:10:42.000000000 +0100
|
||||||
|
+++ linux-2.6.15-rc5-openwrt/drivers/mtd/mtdchar.c 2005-12-15 07:49:15.000000000 +0100
|
||||||
|
@@ -6,7 +6,6 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/config.h>
|
||||||
|
-#include <linux/device.h>
|
||||||
|
#include <linux/fs.h>
|
||||||
|
#include <linux/init.h>
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
@@ -19,19 +18,33 @@
|
||||||
|
|
||||||
|
#include <asm/uaccess.h>
|
||||||
|
|
||||||
|
+#ifdef CONFIG_DEVFS_FS
|
||||||
|
+#include <linux/devfs_fs_kernel.h>
|
||||||
|
+#else
|
||||||
|
+#include <linux/device.h>
|
||||||
|
+
|
||||||
|
static struct class *mtd_class;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
static void mtd_notify_add(struct mtd_info* mtd)
|
||||||
|
{
|
||||||
|
if (!mtd)
|
||||||
|
return;
|
||||||
|
|
||||||
|
+#ifdef CONFIG_DEVFS_FS
|
||||||
|
+ devfs_mk_cdev(MKDEV(MTD_CHAR_MAJOR, mtd->index*2),
|
||||||
|
+ S_IFCHR | S_IRUGO | S_IWUGO, "mtd/%d", mtd->index);
|
||||||
|
+
|
||||||
|
+ devfs_mk_cdev(MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),
|
||||||
|
+ S_IFCHR | S_IRUGO, "mtd/%dro", mtd->index);
|
||||||
|
+#else
|
||||||
|
class_device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2),
|
||||||
|
NULL, "mtd%d", mtd->index);
|
||||||
|
|
||||||
|
class_device_create(mtd_class, NULL,
|
||||||
|
MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),
|
||||||
|
NULL, "mtd%dro", mtd->index);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static void mtd_notify_remove(struct mtd_info* mtd)
|
||||||
|
@@ -39,8 +52,13 @@
|
||||||
|
if (!mtd)
|
||||||
|
return;
|
||||||
|
|
||||||
|
+#ifdef CONFIG_DEVFS_FS
|
||||||
|
+ devfs_remove("mtd/%d", mtd->index);
|
||||||
|
+ devfs_remove("mtd/%dro", mtd->index);
|
||||||
|
+#else
|
||||||
|
class_device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2));
|
||||||
|
class_device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1));
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct mtd_notifier notifier = {
|
||||||
|
@@ -48,6 +66,22 @@
|
||||||
|
.remove = mtd_notify_remove,
|
||||||
|
};
|
||||||
|
|
||||||
|
+#ifdef CONFIG_DEVFS_FS
|
||||||
|
+ static inline void mtdchar_devfs_init(void)
|
||||||
|
+ {
|
||||||
|
+ devfs_mk_dir("mtd");
|
||||||
|
+ register_mtd_user(¬ifier);
|
||||||
|
+ }
|
||||||
|
+ static inline void mtdchar_devfs_exit(void)
|
||||||
|
+ {
|
||||||
|
+ unregister_mtd_user(¬ifier);
|
||||||
|
+ devfs_remove("mtd");
|
||||||
|
+ }
|
||||||
|
+ #else /* !DEVFS */
|
||||||
|
+ #define mtdchar_devfs_init() do { } while(0)
|
||||||
|
+ #define mtdchar_devfs_exit() do { } while(0)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* We use file->private_data to store a pointer to the MTDdevice.
|
||||||
|
* Since alighment is at least 32 bits, we have 2 bits free for OTP
|
||||||
|
@@ -643,6 +677,9 @@
|
||||||
|
return -EAGAIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef CONFIG_DEVFS_FS
|
||||||
|
+ mtdchar_devfs_init();
|
||||||
|
+#else
|
||||||
|
mtd_class = class_create(THIS_MODULE, "mtd");
|
||||||
|
|
||||||
|
if (IS_ERR(mtd_class)) {
|
||||||
|
@@ -652,13 +689,19 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
register_mtd_user(¬ifier);
|
||||||
|
+#endif
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void __exit cleanup_mtdchar(void)
|
||||||
|
{
|
||||||
|
+
|
||||||
|
+#ifdef CONFIG_DEVFS_FS
|
||||||
|
+ mtdchar_devfs_exit();
|
||||||
|
+#else
|
||||||
|
unregister_mtd_user(¬ifier);
|
||||||
|
class_destroy(mtd_class);
|
||||||
|
+#endif
|
||||||
|
unregister_chrdev(MTD_CHAR_MAJOR, "mtd");
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -ur linux-2.6.15-rc5/fs/Kconfig linux-2.6.15-rc5-openwrt/fs/Kconfig
|
||||||
|
--- linux-2.6.15-rc5/fs/Kconfig 2005-12-04 06:10:42.000000000 +0100
|
||||||
|
+++ linux-2.6.15-rc5-openwrt/fs/Kconfig 2005-12-15 07:44:01.000000000 +0100
|
||||||
|
@@ -772,6 +772,56 @@
|
||||||
|
help
|
||||||
|
Exports the dump image of crashed kernel in ELF format.
|
||||||
|
|
||||||
|
+config DEVFS_FS
|
||||||
|
+ bool "/dev file system support (OBSOLETE)"
|
||||||
|
+ depends on EXPERIMENTAL
|
||||||
|
+ help
|
||||||
|
+ This is support for devfs, a virtual file system (like /proc) which
|
||||||
|
+ provides the file system interface to device drivers, normally found
|
||||||
|
+ in /dev. Devfs does not depend on major and minor number
|
||||||
|
+ allocations. Device drivers register entries in /dev which then
|
||||||
|
+ appear automatically, which means that the system administrator does
|
||||||
|
+ not have to create character and block special device files in the
|
||||||
|
+ /dev directory using the mknod command (or MAKEDEV script) anymore.
|
||||||
|
+
|
||||||
|
+ This is work in progress. If you want to use this, you *must* read
|
||||||
|
+ the material in <file:Documentation/filesystems/devfs/>, especially
|
||||||
|
+ the file README there.
|
||||||
|
+
|
||||||
|
+ Note that devfs no longer manages /dev/pts! If you are using UNIX98
|
||||||
|
+ ptys, you will also need to mount the /dev/pts filesystem (devpts).
|
||||||
|
+
|
||||||
|
+ Note that devfs has been obsoleted by udev,
|
||||||
|
+ <http://www.kernel.org/pub/linux/utils/kernel/hotplug/>.
|
||||||
|
+ It has been stripped down to a bare minimum and is only provided for
|
||||||
|
+ legacy installations that use its naming scheme which is
|
||||||
|
+ unfortunately different from the names normal Linux installations
|
||||||
|
+ use.
|
||||||
|
+
|
||||||
|
+ If unsure, say N.
|
||||||
|
+
|
||||||
|
+config DEVFS_MOUNT
|
||||||
|
+ bool "Automatically mount at boot"
|
||||||
|
+ depends on DEVFS_FS
|
||||||
|
+ help
|
||||||
|
+ This option appears if you have CONFIG_DEVFS_FS enabled. Setting
|
||||||
|
+ this to 'Y' will make the kernel automatically mount devfs onto /dev
|
||||||
|
+ when the system is booted, before the init thread is started.
|
||||||
|
+ You can override this with the "devfs=nomount" boot option.
|
||||||
|
+
|
||||||
|
+ If unsure, say N.
|
||||||
|
+
|
||||||
|
+config DEVFS_DEBUG
|
||||||
|
+ bool "Debug devfs"
|
||||||
|
+ depends on DEVFS_FS
|
||||||
|
+ help
|
||||||
|
+ If you say Y here, then the /dev file system code will generate
|
||||||
|
+ debugging messages. See the file
|
||||||
|
+ <file:Documentation/filesystems/devfs/boot-options> for more
|
||||||
|
+ details.
|
||||||
|
+
|
||||||
|
+ If unsure, say N.
|
||||||
|
+
|
||||||
|
config SYSFS
|
||||||
|
bool "sysfs file system support" if EMBEDDED
|
||||||
|
default y
|
@ -0,0 +1,807 @@
|
|||||||
|
diff -ur linux-2.6.15-rc5/drivers/net/b44.c linux-2.6.15-rc5-openwrt/drivers/net/b44.c
|
||||||
|
--- linux-2.6.15-rc5/drivers/net/b44.c 2005-12-04 06:10:42.000000000 +0100
|
||||||
|
+++ linux-2.6.15-rc5-openwrt/drivers/net/b44.c 2005-08-15 02:20:18.000000000 +0200
|
||||||
|
@@ -18,7 +18,7 @@
|
||||||
|
#include <linux/pci.h>
|
||||||
|
#include <linux/delay.h>
|
||||||
|
#include <linux/init.h>
|
||||||
|
-#include <linux/dma-mapping.h>
|
||||||
|
+#include <linux/version.h>
|
||||||
|
|
||||||
|
#include <asm/uaccess.h>
|
||||||
|
#include <asm/io.h>
|
||||||
|
@@ -28,8 +28,8 @@
|
||||||
|
|
||||||
|
#define DRV_MODULE_NAME "b44"
|
||||||
|
#define PFX DRV_MODULE_NAME ": "
|
||||||
|
-#define DRV_MODULE_VERSION "0.97"
|
||||||
|
-#define DRV_MODULE_RELDATE "Nov 30, 2005"
|
||||||
|
+#define DRV_MODULE_VERSION "0.95"
|
||||||
|
+#define DRV_MODULE_RELDATE "Aug 3, 2004"
|
||||||
|
|
||||||
|
#define B44_DEF_MSG_ENABLE \
|
||||||
|
(NETIF_MSG_DRV | \
|
||||||
|
@@ -101,35 +101,10 @@
|
||||||
|
static void b44_halt(struct b44 *);
|
||||||
|
static void b44_init_rings(struct b44 *);
|
||||||
|
static void b44_init_hw(struct b44 *);
|
||||||
|
-
|
||||||
|
-static int dma_desc_align_mask;
|
||||||
|
-static int dma_desc_sync_size;
|
||||||
|
-
|
||||||
|
-static const char b44_gstrings[][ETH_GSTRING_LEN] = {
|
||||||
|
-#define _B44(x...) # x,
|
||||||
|
-B44_STAT_REG_DECLARE
|
||||||
|
-#undef _B44
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-static inline void b44_sync_dma_desc_for_device(struct pci_dev *pdev,
|
||||||
|
- dma_addr_t dma_base,
|
||||||
|
- unsigned long offset,
|
||||||
|
- enum dma_data_direction dir)
|
||||||
|
-{
|
||||||
|
- dma_sync_single_range_for_device(&pdev->dev, dma_base,
|
||||||
|
- offset & dma_desc_align_mask,
|
||||||
|
- dma_desc_sync_size, dir);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-static inline void b44_sync_dma_desc_for_cpu(struct pci_dev *pdev,
|
||||||
|
- dma_addr_t dma_base,
|
||||||
|
- unsigned long offset,
|
||||||
|
- enum dma_data_direction dir)
|
||||||
|
-{
|
||||||
|
- dma_sync_single_range_for_cpu(&pdev->dev, dma_base,
|
||||||
|
- offset & dma_desc_align_mask,
|
||||||
|
- dma_desc_sync_size, dir);
|
||||||
|
-}
|
||||||
|
+static int b44_poll(struct net_device *dev, int *budget);
|
||||||
|
+#ifdef CONFIG_NET_POLL_CONTROLLER
|
||||||
|
+static void b44_poll_controller(struct net_device *dev);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
static inline unsigned long br32(const struct b44 *bp, unsigned long reg)
|
||||||
|
{
|
||||||
|
@@ -503,10 +478,7 @@
|
||||||
|
for (reg = B44_TX_GOOD_O; reg <= B44_TX_PAUSE; reg += 4UL) {
|
||||||
|
*val++ += br32(bp, reg);
|
||||||
|
}
|
||||||
|
-
|
||||||
|
- /* Pad */
|
||||||
|
- reg += 8*4UL;
|
||||||
|
-
|
||||||
|
+ val = &bp->hw_stats.rx_good_octets;
|
||||||
|
for (reg = B44_RX_GOOD_O; reg <= B44_RX_NPAUSE; reg += 4UL) {
|
||||||
|
*val++ += br32(bp, reg);
|
||||||
|
}
|
||||||
|
@@ -657,7 +629,7 @@
|
||||||
|
|
||||||
|
/* Hardware bug work-around, the chip is unable to do PCI DMA
|
||||||
|
to/from anything above 1GB :-( */
|
||||||
|
- if (mapping + RX_PKT_BUF_SZ > B44_DMA_MASK) {
|
||||||
|
+ if(mapping+RX_PKT_BUF_SZ > B44_DMA_MASK) {
|
||||||
|
/* Sigh... */
|
||||||
|
pci_unmap_single(bp->pdev, mapping, RX_PKT_BUF_SZ,PCI_DMA_FROMDEVICE);
|
||||||
|
dev_kfree_skb_any(skb);
|
||||||
|
@@ -667,7 +639,7 @@
|
||||||
|
mapping = pci_map_single(bp->pdev, skb->data,
|
||||||
|
RX_PKT_BUF_SZ,
|
||||||
|
PCI_DMA_FROMDEVICE);
|
||||||
|
- if (mapping + RX_PKT_BUF_SZ > B44_DMA_MASK) {
|
||||||
|
+ if(mapping+RX_PKT_BUF_SZ > B44_DMA_MASK) {
|
||||||
|
pci_unmap_single(bp->pdev, mapping, RX_PKT_BUF_SZ,PCI_DMA_FROMDEVICE);
|
||||||
|
dev_kfree_skb_any(skb);
|
||||||
|
return -ENOMEM;
|
||||||
|
@@ -696,11 +668,6 @@
|
||||||
|
dp->ctrl = cpu_to_le32(ctrl);
|
||||||
|
dp->addr = cpu_to_le32((u32) mapping + bp->rx_offset + bp->dma_offset);
|
||||||
|
|
||||||
|
- if (bp->flags & B44_FLAG_RX_RING_HACK)
|
||||||
|
- b44_sync_dma_desc_for_device(bp->pdev, bp->rx_ring_dma,
|
||||||
|
- dest_idx * sizeof(dp),
|
||||||
|
- DMA_BIDIRECTIONAL);
|
||||||
|
-
|
||||||
|
return RX_PKT_BUF_SZ;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -725,11 +692,6 @@
|
||||||
|
pci_unmap_addr_set(dest_map, mapping,
|
||||||
|
pci_unmap_addr(src_map, mapping));
|
||||||
|
|
||||||
|
- if (bp->flags & B44_FLAG_RX_RING_HACK)
|
||||||
|
- b44_sync_dma_desc_for_cpu(bp->pdev, bp->rx_ring_dma,
|
||||||
|
- src_idx * sizeof(src_desc),
|
||||||
|
- DMA_BIDIRECTIONAL);
|
||||||
|
-
|
||||||
|
ctrl = src_desc->ctrl;
|
||||||
|
if (dest_idx == (B44_RX_RING_SIZE - 1))
|
||||||
|
ctrl |= cpu_to_le32(DESC_CTRL_EOT);
|
||||||
|
@@ -738,14 +700,8 @@
|
||||||
|
|
||||||
|
dest_desc->ctrl = ctrl;
|
||||||
|
dest_desc->addr = src_desc->addr;
|
||||||
|
-
|
||||||
|
src_map->skb = NULL;
|
||||||
|
|
||||||
|
- if (bp->flags & B44_FLAG_RX_RING_HACK)
|
||||||
|
- b44_sync_dma_desc_for_device(bp->pdev, bp->rx_ring_dma,
|
||||||
|
- dest_idx * sizeof(dest_desc),
|
||||||
|
- DMA_BIDIRECTIONAL);
|
||||||
|
-
|
||||||
|
pci_dma_sync_single_for_device(bp->pdev, src_desc->addr,
|
||||||
|
RX_PKT_BUF_SZ,
|
||||||
|
PCI_DMA_FROMDEVICE);
|
||||||
|
@@ -894,10 +850,11 @@
|
||||||
|
{
|
||||||
|
struct net_device *dev = dev_id;
|
||||||
|
struct b44 *bp = netdev_priv(dev);
|
||||||
|
+ unsigned long flags;
|
||||||
|
u32 istat, imask;
|
||||||
|
int handled = 0;
|
||||||
|
|
||||||
|
- spin_lock(&bp->lock);
|
||||||
|
+ spin_lock_irqsave(&bp->lock, flags);
|
||||||
|
|
||||||
|
istat = br32(bp, B44_ISTAT);
|
||||||
|
imask = br32(bp, B44_IMASK);
|
||||||
|
@@ -908,12 +865,6 @@
|
||||||
|
istat &= imask;
|
||||||
|
if (istat) {
|
||||||
|
handled = 1;
|
||||||
|
-
|
||||||
|
- if (unlikely(!netif_running(dev))) {
|
||||||
|
- printk(KERN_INFO "%s: late interrupt.\n", dev->name);
|
||||||
|
- goto irq_ack;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
if (netif_rx_schedule_prep(dev)) {
|
||||||
|
/* NOTE: These writes are posted by the readback of
|
||||||
|
* the ISTAT register below.
|
||||||
|
@@ -926,11 +877,10 @@
|
||||||
|
dev->name);
|
||||||
|
}
|
||||||
|
|
||||||
|
-irq_ack:
|
||||||
|
bw32(bp, B44_ISTAT, istat);
|
||||||
|
br32(bp, B44_ISTAT);
|
||||||
|
}
|
||||||
|
- spin_unlock(&bp->lock);
|
||||||
|
+ spin_unlock_irqrestore(&bp->lock, flags);
|
||||||
|
return IRQ_RETVAL(handled);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -958,7 +908,6 @@
|
||||||
|
{
|
||||||
|
struct b44 *bp = netdev_priv(dev);
|
||||||
|
struct sk_buff *bounce_skb;
|
||||||
|
- int rc = NETDEV_TX_OK;
|
||||||
|
dma_addr_t mapping;
|
||||||
|
u32 len, entry, ctrl;
|
||||||
|
|
||||||
|
@@ -968,28 +917,29 @@
|
||||||
|
/* This is a hard error, log it. */
|
||||||
|
if (unlikely(TX_BUFFS_AVAIL(bp) < 1)) {
|
||||||
|
netif_stop_queue(dev);
|
||||||
|
+ spin_unlock_irq(&bp->lock);
|
||||||
|
printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
|
||||||
|
dev->name);
|
||||||
|
- goto err_out;
|
||||||
|
+ return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
mapping = pci_map_single(bp->pdev, skb->data, len, PCI_DMA_TODEVICE);
|
||||||
|
- if (mapping + len > B44_DMA_MASK) {
|
||||||
|
+ if(mapping+len > B44_DMA_MASK) {
|
||||||
|
/* Chip can't handle DMA to/from >1GB, use bounce buffer */
|
||||||
|
pci_unmap_single(bp->pdev, mapping, len, PCI_DMA_TODEVICE);
|
||||||
|
|
||||||
|
bounce_skb = __dev_alloc_skb(TX_PKT_BUF_SZ,
|
||||||
|
GFP_ATOMIC|GFP_DMA);
|
||||||
|
if (!bounce_skb)
|
||||||
|
- goto err_out;
|
||||||
|
+ return NETDEV_TX_BUSY;
|
||||||
|
|
||||||
|
mapping = pci_map_single(bp->pdev, bounce_skb->data,
|
||||||
|
len, PCI_DMA_TODEVICE);
|
||||||
|
- if (mapping + len > B44_DMA_MASK) {
|
||||||
|
+ if(mapping+len > B44_DMA_MASK) {
|
||||||
|
pci_unmap_single(bp->pdev, mapping,
|
||||||
|
len, PCI_DMA_TODEVICE);
|
||||||
|
dev_kfree_skb_any(bounce_skb);
|
||||||
|
- goto err_out;
|
||||||
|
+ return NETDEV_TX_BUSY;
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy(skb_put(bounce_skb, len), skb->data, skb->len);
|
||||||
|
@@ -1009,11 +959,6 @@
|
||||||
|
bp->tx_ring[entry].ctrl = cpu_to_le32(ctrl);
|
||||||
|
bp->tx_ring[entry].addr = cpu_to_le32((u32) mapping+bp->dma_offset);
|
||||||
|
|
||||||
|
- if (bp->flags & B44_FLAG_TX_RING_HACK)
|
||||||
|
- b44_sync_dma_desc_for_device(bp->pdev, bp->tx_ring_dma,
|
||||||
|
- entry * sizeof(bp->tx_ring[0]),
|
||||||
|
- DMA_TO_DEVICE);
|
||||||
|
-
|
||||||
|
entry = NEXT_TX(entry);
|
||||||
|
|
||||||
|
bp->tx_prod = entry;
|
||||||
|
@@ -1029,16 +974,11 @@
|
||||||
|
if (TX_BUFFS_AVAIL(bp) < 1)
|
||||||
|
netif_stop_queue(dev);
|
||||||
|
|
||||||
|
- dev->trans_start = jiffies;
|
||||||
|
-
|
||||||
|
-out_unlock:
|
||||||
|
spin_unlock_irq(&bp->lock);
|
||||||
|
|
||||||
|
- return rc;
|
||||||
|
+ dev->trans_start = jiffies;
|
||||||
|
|
||||||
|
-err_out:
|
||||||
|
- rc = NETDEV_TX_BUSY;
|
||||||
|
- goto out_unlock;
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int b44_change_mtu(struct net_device *dev, int new_mtu)
|
||||||
|
@@ -1112,7 +1052,8 @@
|
||||||
|
*
|
||||||
|
* The chip has been shut down and the driver detached from
|
||||||
|
* the networking, so no interrupts or new tx packets will
|
||||||
|
- * end up in the driver.
|
||||||
|
+ * end up in the driver. bp->lock is not held and we are not
|
||||||
|
+ * in an interrupt context and thus may sleep.
|
||||||
|
*/
|
||||||
|
static void b44_init_rings(struct b44 *bp)
|
||||||
|
{
|
||||||
|
@@ -1123,16 +1064,6 @@
|
||||||
|
memset(bp->rx_ring, 0, B44_RX_RING_BYTES);
|
||||||
|
memset(bp->tx_ring, 0, B44_TX_RING_BYTES);
|
||||||
|
|
||||||
|
- if (bp->flags & B44_FLAG_RX_RING_HACK)
|
||||||
|
- dma_sync_single_for_device(&bp->pdev->dev, bp->rx_ring_dma,
|
||||||
|
- DMA_TABLE_BYTES,
|
||||||
|
- PCI_DMA_BIDIRECTIONAL);
|
||||||
|
-
|
||||||
|
- if (bp->flags & B44_FLAG_TX_RING_HACK)
|
||||||
|
- dma_sync_single_for_device(&bp->pdev->dev, bp->tx_ring_dma,
|
||||||
|
- DMA_TABLE_BYTES,
|
||||||
|
- PCI_DMA_TODEVICE);
|
||||||
|
-
|
||||||
|
for (i = 0; i < bp->rx_pending; i++) {
|
||||||
|
if (b44_alloc_rx_skb(bp, -1, i) < 0)
|
||||||
|
break;
|
||||||
|
@@ -1145,33 +1076,23 @@
|
||||||
|
*/
|
||||||
|
static void b44_free_consistent(struct b44 *bp)
|
||||||
|
{
|
||||||
|
- kfree(bp->rx_buffers);
|
||||||
|
- bp->rx_buffers = NULL;
|
||||||
|
- kfree(bp->tx_buffers);
|
||||||
|
- bp->tx_buffers = NULL;
|
||||||
|
+ if (bp->rx_buffers) {
|
||||||
|
+ kfree(bp->rx_buffers);
|
||||||
|
+ bp->rx_buffers = NULL;
|
||||||
|
+ }
|
||||||
|
+ if (bp->tx_buffers) {
|
||||||
|
+ kfree(bp->tx_buffers);
|
||||||
|
+ bp->tx_buffers = NULL;
|
||||||
|
+ }
|
||||||
|
if (bp->rx_ring) {
|
||||||
|
- if (bp->flags & B44_FLAG_RX_RING_HACK) {
|
||||||
|
- dma_unmap_single(&bp->pdev->dev, bp->rx_ring_dma,
|
||||||
|
- DMA_TABLE_BYTES,
|
||||||
|
- DMA_BIDIRECTIONAL);
|
||||||
|
- kfree(bp->rx_ring);
|
||||||
|
- } else
|
||||||
|
- pci_free_consistent(bp->pdev, DMA_TABLE_BYTES,
|
||||||
|
- bp->rx_ring, bp->rx_ring_dma);
|
||||||
|
+ pci_free_consistent(bp->pdev, DMA_TABLE_BYTES,
|
||||||
|
+ bp->rx_ring, bp->rx_ring_dma);
|
||||||
|
bp->rx_ring = NULL;
|
||||||
|
- bp->flags &= ~B44_FLAG_RX_RING_HACK;
|
||||||
|
}
|
||||||
|
if (bp->tx_ring) {
|
||||||
|
- if (bp->flags & B44_FLAG_TX_RING_HACK) {
|
||||||
|
- dma_unmap_single(&bp->pdev->dev, bp->tx_ring_dma,
|
||||||
|
- DMA_TABLE_BYTES,
|
||||||
|
- DMA_TO_DEVICE);
|
||||||
|
- kfree(bp->tx_ring);
|
||||||
|
- } else
|
||||||
|
- pci_free_consistent(bp->pdev, DMA_TABLE_BYTES,
|
||||||
|
- bp->tx_ring, bp->tx_ring_dma);
|
||||||
|
+ pci_free_consistent(bp->pdev, DMA_TABLE_BYTES,
|
||||||
|
+ bp->tx_ring, bp->tx_ring_dma);
|
||||||
|
bp->tx_ring = NULL;
|
||||||
|
- bp->flags &= ~B44_FLAG_TX_RING_HACK;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1184,67 +1105,25 @@
|
||||||
|
int size;
|
||||||
|
|
||||||
|
size = B44_RX_RING_SIZE * sizeof(struct ring_info);
|
||||||
|
- bp->rx_buffers = kzalloc(size, GFP_KERNEL);
|
||||||
|
+ bp->rx_buffers = kmalloc(size, GFP_KERNEL);
|
||||||
|
if (!bp->rx_buffers)
|
||||||
|
goto out_err;
|
||||||
|
+ memset(bp->rx_buffers, 0, size);
|
||||||
|
|
||||||
|
size = B44_TX_RING_SIZE * sizeof(struct ring_info);
|
||||||
|
- bp->tx_buffers = kzalloc(size, GFP_KERNEL);
|
||||||
|
+ bp->tx_buffers = kmalloc(size, GFP_KERNEL);
|
||||||
|
if (!bp->tx_buffers)
|
||||||
|
goto out_err;
|
||||||
|
+ memset(bp->tx_buffers, 0, size);
|
||||||
|
|
||||||
|
size = DMA_TABLE_BYTES;
|
||||||
|
bp->rx_ring = pci_alloc_consistent(bp->pdev, size, &bp->rx_ring_dma);
|
||||||
|
- if (!bp->rx_ring) {
|
||||||
|
- /* Allocation may have failed due to pci_alloc_consistent
|
||||||
|
- insisting on use of GFP_DMA, which is more restrictive
|
||||||
|
- than necessary... */
|
||||||
|
- struct dma_desc *rx_ring;
|
||||||
|
- dma_addr_t rx_ring_dma;
|
||||||
|
-
|
||||||
|
- rx_ring = kzalloc(size, GFP_KERNEL);
|
||||||
|
- if (!rx_ring)
|
||||||
|
- goto out_err;
|
||||||
|
-
|
||||||
|
- rx_ring_dma = dma_map_single(&bp->pdev->dev, rx_ring,
|
||||||
|
- DMA_TABLE_BYTES,
|
||||||
|
- DMA_BIDIRECTIONAL);
|
||||||
|
-
|
||||||
|
- if (rx_ring_dma + size > B44_DMA_MASK) {
|
||||||
|
- kfree(rx_ring);
|
||||||
|
- goto out_err;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- bp->rx_ring = rx_ring;
|
||||||
|
- bp->rx_ring_dma = rx_ring_dma;
|
||||||
|
- bp->flags |= B44_FLAG_RX_RING_HACK;
|
||||||
|
- }
|
||||||
|
+ if (!bp->rx_ring)
|
||||||
|
+ goto out_err;
|
||||||
|
|
||||||
|
bp->tx_ring = pci_alloc_consistent(bp->pdev, size, &bp->tx_ring_dma);
|
||||||
|
- if (!bp->tx_ring) {
|
||||||
|
- /* Allocation may have failed due to pci_alloc_consistent
|
||||||
|
- insisting on use of GFP_DMA, which is more restrictive
|
||||||
|
- than necessary... */
|
||||||
|
- struct dma_desc *tx_ring;
|
||||||
|
- dma_addr_t tx_ring_dma;
|
||||||
|
-
|
||||||
|
- tx_ring = kzalloc(size, GFP_KERNEL);
|
||||||
|
- if (!tx_ring)
|
||||||
|
- goto out_err;
|
||||||
|
-
|
||||||
|
- tx_ring_dma = dma_map_single(&bp->pdev->dev, tx_ring,
|
||||||
|
- DMA_TABLE_BYTES,
|
||||||
|
- DMA_TO_DEVICE);
|
||||||
|
-
|
||||||
|
- if (tx_ring_dma + size > B44_DMA_MASK) {
|
||||||
|
- kfree(tx_ring);
|
||||||
|
- goto out_err;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- bp->tx_ring = tx_ring;
|
||||||
|
- bp->tx_ring_dma = tx_ring_dma;
|
||||||
|
- bp->flags |= B44_FLAG_TX_RING_HACK;
|
||||||
|
- }
|
||||||
|
+ if (!bp->tx_ring)
|
||||||
|
+ goto out_err;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
@@ -1394,21 +1273,19 @@
|
||||||
|
|
||||||
|
err = b44_alloc_consistent(bp);
|
||||||
|
if (err)
|
||||||
|
- goto out;
|
||||||
|
+ return err;
|
||||||
|
+
|
||||||
|
+ err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
|
||||||
|
+ if (err)
|
||||||
|
+ goto err_out_free;
|
||||||
|
+
|
||||||
|
+ spin_lock_irq(&bp->lock);
|
||||||
|
|
||||||
|
b44_init_rings(bp);
|
||||||
|
b44_init_hw(bp);
|
||||||
|
+ bp->flags |= B44_FLAG_INIT_COMPLETE;
|
||||||
|
|
||||||
|
- netif_carrier_off(dev);
|
||||||
|
- b44_check_phy(bp);
|
||||||
|
-
|
||||||
|
- err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
|
||||||
|
- if (unlikely(err < 0)) {
|
||||||
|
- b44_chip_reset(bp);
|
||||||
|
- b44_free_rings(bp);
|
||||||
|
- b44_free_consistent(bp);
|
||||||
|
- goto out;
|
||||||
|
- }
|
||||||
|
+ spin_unlock_irq(&bp->lock);
|
||||||
|
|
||||||
|
init_timer(&bp->timer);
|
||||||
|
bp->timer.expires = jiffies + HZ;
|
||||||
|
@@ -1417,8 +1294,11 @@
|
||||||
|
add_timer(&bp->timer);
|
||||||
|
|
||||||
|
b44_enable_ints(bp);
|
||||||
|
- netif_start_queue(dev);
|
||||||
|
-out:
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+err_out_free:
|
||||||
|
+ b44_free_consistent(bp);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1453,8 +1333,6 @@
|
||||||
|
|
||||||
|
netif_stop_queue(dev);
|
||||||
|
|
||||||
|
- netif_poll_disable(dev);
|
||||||
|
-
|
||||||
|
del_timer_sync(&bp->timer);
|
||||||
|
|
||||||
|
spin_lock_irq(&bp->lock);
|
||||||
|
@@ -1464,14 +1342,13 @@
|
||||||
|
#endif
|
||||||
|
b44_halt(bp);
|
||||||
|
b44_free_rings(bp);
|
||||||
|
+ bp->flags &= ~B44_FLAG_INIT_COMPLETE;
|
||||||
|
netif_carrier_off(bp->dev);
|
||||||
|
|
||||||
|
spin_unlock_irq(&bp->lock);
|
||||||
|
|
||||||
|
free_irq(dev->irq, dev);
|
||||||
|
|
||||||
|
- netif_poll_enable(dev);
|
||||||
|
-
|
||||||
|
b44_free_consistent(bp);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
@@ -1536,6 +1413,8 @@
|
||||||
|
{
|
||||||
|
struct b44 *bp = netdev_priv(dev);
|
||||||
|
u32 val;
|
||||||
|
+ int i=0;
|
||||||
|
+ unsigned char zero[6] = {0,0,0,0,0,0};
|
||||||
|
|
||||||
|
val = br32(bp, B44_RXCONFIG);
|
||||||
|
val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI);
|
||||||
|
@@ -1543,17 +1422,14 @@
|
||||||
|
val |= RXCONFIG_PROMISC;
|
||||||
|
bw32(bp, B44_RXCONFIG, val);
|
||||||
|
} else {
|
||||||
|
- unsigned char zero[6] = {0, 0, 0, 0, 0, 0};
|
||||||
|
- int i = 0;
|
||||||
|
-
|
||||||
|
__b44_set_mac_addr(bp);
|
||||||
|
|
||||||
|
if (dev->flags & IFF_ALLMULTI)
|
||||||
|
val |= RXCONFIG_ALLMULTI;
|
||||||
|
else
|
||||||
|
- i = __b44_load_mcast(bp, dev);
|
||||||
|
+ i=__b44_load_mcast(bp, dev);
|
||||||
|
|
||||||
|
- for (; i < 64; i++) {
|
||||||
|
+ for(;i<64;i++) {
|
||||||
|
__b44_cam_write(bp, zero, i);
|
||||||
|
}
|
||||||
|
bw32(bp, B44_RXCONFIG, val);
|
||||||
|
@@ -1617,7 +1493,7 @@
|
||||||
|
{
|
||||||
|
struct b44 *bp = netdev_priv(dev);
|
||||||
|
|
||||||
|
- if (!netif_running(dev))
|
||||||
|
+ if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
|
||||||
|
return -EAGAIN;
|
||||||
|
cmd->supported = (SUPPORTED_Autoneg);
|
||||||
|
cmd->supported |= (SUPPORTED_100baseT_Half |
|
||||||
|
@@ -1628,14 +1504,14 @@
|
||||||
|
|
||||||
|
cmd->advertising = 0;
|
||||||
|
if (bp->flags & B44_FLAG_ADV_10HALF)
|
||||||
|
- cmd->advertising |= ADVERTISED_10baseT_Half;
|
||||||
|
+ cmd->advertising |= ADVERTISE_10HALF;
|
||||||
|
if (bp->flags & B44_FLAG_ADV_10FULL)
|
||||||
|
- cmd->advertising |= ADVERTISED_10baseT_Full;
|
||||||
|
+ cmd->advertising |= ADVERTISE_10FULL;
|
||||||
|
if (bp->flags & B44_FLAG_ADV_100HALF)
|
||||||
|
- cmd->advertising |= ADVERTISED_100baseT_Half;
|
||||||
|
+ cmd->advertising |= ADVERTISE_100HALF;
|
||||||
|
if (bp->flags & B44_FLAG_ADV_100FULL)
|
||||||
|
- cmd->advertising |= ADVERTISED_100baseT_Full;
|
||||||
|
- cmd->advertising |= ADVERTISED_Pause | ADVERTISED_Asym_Pause;
|
||||||
|
+ cmd->advertising |= ADVERTISE_100FULL;
|
||||||
|
+ cmd->advertising |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
|
||||||
|
cmd->speed = (bp->flags & B44_FLAG_100_BASE_T) ?
|
||||||
|
SPEED_100 : SPEED_10;
|
||||||
|
cmd->duplex = (bp->flags & B44_FLAG_FULL_DUPLEX) ?
|
||||||
|
@@ -1655,7 +1531,7 @@
|
||||||
|
{
|
||||||
|
struct b44 *bp = netdev_priv(dev);
|
||||||
|
|
||||||
|
- if (!netif_running(dev))
|
||||||
|
+ if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
|
||||||
|
return -EAGAIN;
|
||||||
|
|
||||||
|
/* We do not support gigabit. */
|
||||||
|
@@ -1785,37 +1661,6 @@
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static void b44_get_strings(struct net_device *dev, u32 stringset, u8 *data)
|
||||||
|
-{
|
||||||
|
- switch(stringset) {
|
||||||
|
- case ETH_SS_STATS:
|
||||||
|
- memcpy(data, *b44_gstrings, sizeof(b44_gstrings));
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-static int b44_get_stats_count(struct net_device *dev)
|
||||||
|
-{
|
||||||
|
- return ARRAY_SIZE(b44_gstrings);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-static void b44_get_ethtool_stats(struct net_device *dev,
|
||||||
|
- struct ethtool_stats *stats, u64 *data)
|
||||||
|
-{
|
||||||
|
- struct b44 *bp = netdev_priv(dev);
|
||||||
|
- u32 *val = &bp->hw_stats.tx_good_octets;
|
||||||
|
- u32 i;
|
||||||
|
-
|
||||||
|
- spin_lock_irq(&bp->lock);
|
||||||
|
-
|
||||||
|
- b44_stats_update(bp);
|
||||||
|
-
|
||||||
|
- for (i = 0; i < ARRAY_SIZE(b44_gstrings); i++)
|
||||||
|
- *data++ = *val++;
|
||||||
|
-
|
||||||
|
- spin_unlock_irq(&bp->lock);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
static struct ethtool_ops b44_ethtool_ops = {
|
||||||
|
.get_drvinfo = b44_get_drvinfo,
|
||||||
|
.get_settings = b44_get_settings,
|
||||||
|
@@ -1828,25 +1673,18 @@
|
||||||
|
.set_pauseparam = b44_set_pauseparam,
|
||||||
|
.get_msglevel = b44_get_msglevel,
|
||||||
|
.set_msglevel = b44_set_msglevel,
|
||||||
|
- .get_strings = b44_get_strings,
|
||||||
|
- .get_stats_count = b44_get_stats_count,
|
||||||
|
- .get_ethtool_stats = b44_get_ethtool_stats,
|
||||||
|
- .get_perm_addr = ethtool_op_get_perm_addr,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
||||||
|
{
|
||||||
|
struct mii_ioctl_data *data = if_mii(ifr);
|
||||||
|
struct b44 *bp = netdev_priv(dev);
|
||||||
|
- int err = -EINVAL;
|
||||||
|
-
|
||||||
|
- if (!netif_running(dev))
|
||||||
|
- goto out;
|
||||||
|
+ int err;
|
||||||
|
|
||||||
|
spin_lock_irq(&bp->lock);
|
||||||
|
err = generic_mii_ioctl(&bp->mii_if, data, cmd, NULL);
|
||||||
|
spin_unlock_irq(&bp->lock);
|
||||||
|
-out:
|
||||||
|
+
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1877,7 +1715,6 @@
|
||||||
|
bp->dev->dev_addr[3] = eeprom[80];
|
||||||
|
bp->dev->dev_addr[4] = eeprom[83];
|
||||||
|
bp->dev->dev_addr[5] = eeprom[82];
|
||||||
|
- memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len);
|
||||||
|
|
||||||
|
bp->phy_addr = eeprom[90] & 0x1f;
|
||||||
|
|
||||||
|
@@ -1942,9 +1779,9 @@
|
||||||
|
|
||||||
|
err = pci_set_consistent_dma_mask(pdev, (u64) B44_DMA_MASK);
|
||||||
|
if (err) {
|
||||||
|
- printk(KERN_ERR PFX "No usable DMA configuration, "
|
||||||
|
- "aborting.\n");
|
||||||
|
- goto err_out_free_res;
|
||||||
|
+ printk(KERN_ERR PFX "No usable DMA configuration, "
|
||||||
|
+ "aborting.\n");
|
||||||
|
+ goto err_out_free_res;
|
||||||
|
}
|
||||||
|
|
||||||
|
b44reg_base = pci_resource_start(pdev, 0);
|
||||||
|
@@ -1966,8 +1803,10 @@
|
||||||
|
bp = netdev_priv(dev);
|
||||||
|
bp->pdev = pdev;
|
||||||
|
bp->dev = dev;
|
||||||
|
-
|
||||||
|
- bp->msg_enable = netif_msg_init(b44_debug, B44_DEF_MSG_ENABLE);
|
||||||
|
+ if (b44_debug >= 0)
|
||||||
|
+ bp->msg_enable = (1 << b44_debug) - 1;
|
||||||
|
+ else
|
||||||
|
+ bp->msg_enable = B44_DEF_MSG_ENABLE;
|
||||||
|
|
||||||
|
spin_lock_init(&bp->lock);
|
||||||
|
|
||||||
|
@@ -2057,14 +1896,17 @@
|
||||||
|
static void __devexit b44_remove_one(struct pci_dev *pdev)
|
||||||
|
{
|
||||||
|
struct net_device *dev = pci_get_drvdata(pdev);
|
||||||
|
- struct b44 *bp = netdev_priv(dev);
|
||||||
|
|
||||||
|
- unregister_netdev(dev);
|
||||||
|
- iounmap(bp->regs);
|
||||||
|
- free_netdev(dev);
|
||||||
|
- pci_release_regions(pdev);
|
||||||
|
- pci_disable_device(pdev);
|
||||||
|
- pci_set_drvdata(pdev, NULL);
|
||||||
|
+ if (dev) {
|
||||||
|
+ struct b44 *bp = netdev_priv(dev);
|
||||||
|
+
|
||||||
|
+ unregister_netdev(dev);
|
||||||
|
+ iounmap(bp->regs);
|
||||||
|
+ free_netdev(dev);
|
||||||
|
+ pci_release_regions(pdev);
|
||||||
|
+ pci_disable_device(pdev);
|
||||||
|
+ pci_set_drvdata(pdev, NULL);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
static int b44_suspend(struct pci_dev *pdev, pm_message_t state)
|
||||||
|
@@ -2085,9 +1927,6 @@
|
||||||
|
b44_free_rings(bp);
|
||||||
|
|
||||||
|
spin_unlock_irq(&bp->lock);
|
||||||
|
-
|
||||||
|
- free_irq(dev->irq, dev);
|
||||||
|
- pci_disable_device(pdev);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2097,15 +1936,10 @@
|
||||||
|
struct b44 *bp = netdev_priv(dev);
|
||||||
|
|
||||||
|
pci_restore_state(pdev);
|
||||||
|
- pci_enable_device(pdev);
|
||||||
|
- pci_set_master(pdev);
|
||||||
|
|
||||||
|
if (!netif_running(dev))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
- if (request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev))
|
||||||
|
- printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);
|
||||||
|
-
|
||||||
|
spin_lock_irq(&bp->lock);
|
||||||
|
|
||||||
|
b44_init_rings(bp);
|
||||||
|
@@ -2117,7 +1951,6 @@
|
||||||
|
add_timer(&bp->timer);
|
||||||
|
|
||||||
|
b44_enable_ints(bp);
|
||||||
|
- netif_wake_queue(dev);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2132,12 +1965,6 @@
|
||||||
|
|
||||||
|
static int __init b44_init(void)
|
||||||
|
{
|
||||||
|
- unsigned int dma_desc_align_size = dma_get_cache_alignment();
|
||||||
|
-
|
||||||
|
- /* Setup paramaters for syncing RX/TX DMA descriptors */
|
||||||
|
- dma_desc_align_mask = ~(dma_desc_align_size - 1);
|
||||||
|
- dma_desc_sync_size = max(dma_desc_align_size, sizeof(struct dma_desc));
|
||||||
|
-
|
||||||
|
return pci_module_init(&b44_driver);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -ur linux-2.6.15-rc5/drivers/net/b44.h linux-2.6.15-rc5-openwrt/drivers/net/b44.h
|
||||||
|
--- linux-2.6.15-rc5/drivers/net/b44.h 2005-12-04 06:10:42.000000000 +0100
|
||||||
|
+++ linux-2.6.15-rc5-openwrt/drivers/net/b44.h 2005-08-15 02:20:18.000000000 +0200
|
||||||
|
@@ -346,63 +346,29 @@
|
||||||
|
|
||||||
|
#define B44_MCAST_TABLE_SIZE 32
|
||||||
|
|
||||||
|
-#define B44_STAT_REG_DECLARE \
|
||||||
|
- _B44(tx_good_octets) \
|
||||||
|
- _B44(tx_good_pkts) \
|
||||||
|
- _B44(tx_octets) \
|
||||||
|
- _B44(tx_pkts) \
|
||||||
|
- _B44(tx_broadcast_pkts) \
|
||||||
|
- _B44(tx_multicast_pkts) \
|
||||||
|
- _B44(tx_len_64) \
|
||||||
|
- _B44(tx_len_65_to_127) \
|
||||||
|
- _B44(tx_len_128_to_255) \
|
||||||
|
- _B44(tx_len_256_to_511) \
|
||||||
|
- _B44(tx_len_512_to_1023) \
|
||||||
|
- _B44(tx_len_1024_to_max) \
|
||||||
|
- _B44(tx_jabber_pkts) \
|
||||||
|
- _B44(tx_oversize_pkts) \
|
||||||
|
- _B44(tx_fragment_pkts) \
|
||||||
|
- _B44(tx_underruns) \
|
||||||
|
- _B44(tx_total_cols) \
|
||||||
|
- _B44(tx_single_cols) \
|
||||||
|
- _B44(tx_multiple_cols) \
|
||||||
|
- _B44(tx_excessive_cols) \
|
||||||
|
- _B44(tx_late_cols) \
|
||||||
|
- _B44(tx_defered) \
|
||||||
|
- _B44(tx_carrier_lost) \
|
||||||
|
- _B44(tx_pause_pkts) \
|
||||||
|
- _B44(rx_good_octets) \
|
||||||
|
- _B44(rx_good_pkts) \
|
||||||
|
- _B44(rx_octets) \
|
||||||
|
- _B44(rx_pkts) \
|
||||||
|
- _B44(rx_broadcast_pkts) \
|
||||||
|
- _B44(rx_multicast_pkts) \
|
||||||
|
- _B44(rx_len_64) \
|
||||||
|
- _B44(rx_len_65_to_127) \
|
||||||
|
- _B44(rx_len_128_to_255) \
|
||||||
|
- _B44(rx_len_256_to_511) \
|
||||||
|
- _B44(rx_len_512_to_1023) \
|
||||||
|
- _B44(rx_len_1024_to_max) \
|
||||||
|
- _B44(rx_jabber_pkts) \
|
||||||
|
- _B44(rx_oversize_pkts) \
|
||||||
|
- _B44(rx_fragment_pkts) \
|
||||||
|
- _B44(rx_missed_pkts) \
|
||||||
|
- _B44(rx_crc_align_errs) \
|
||||||
|
- _B44(rx_undersize) \
|
||||||
|
- _B44(rx_crc_errs) \
|
||||||
|
- _B44(rx_align_errs) \
|
||||||
|
- _B44(rx_symbol_errs) \
|
||||||
|
- _B44(rx_pause_pkts) \
|
||||||
|
- _B44(rx_nonpause_pkts)
|
||||||
|
-
|
||||||
|
/* SW copy of device statistics, kept up to date by periodic timer
|
||||||
|
- * which probes HW values. Check b44_stats_update if you mess with
|
||||||
|
- * the layout
|
||||||
|
+ * which probes HW values. Must have same relative layout as HW
|
||||||
|
+ * register above, because b44_stats_update depends upon this.
|
||||||
|
*/
|
||||||
|
struct b44_hw_stats {
|
||||||
|
-#define _B44(x) u32 x;
|
||||||
|
-B44_STAT_REG_DECLARE
|
||||||
|
-#undef _B44
|
||||||
|
+ u32 tx_good_octets, tx_good_pkts, tx_octets;
|
||||||
|
+ u32 tx_pkts, tx_broadcast_pkts, tx_multicast_pkts;
|
||||||
|
+ u32 tx_len_64, tx_len_65_to_127, tx_len_128_to_255;
|
||||||
|
+ u32 tx_len_256_to_511, tx_len_512_to_1023, tx_len_1024_to_max;
|
||||||
|
+ u32 tx_jabber_pkts, tx_oversize_pkts, tx_fragment_pkts;
|
||||||
|
+ u32 tx_underruns, tx_total_cols, tx_single_cols;
|
||||||
|
+ u32 tx_multiple_cols, tx_excessive_cols, tx_late_cols;
|
||||||
|
+ u32 tx_defered, tx_carrier_lost, tx_pause_pkts;
|
||||||
|
+ u32 __pad1[8];
|
||||||
|
+
|
||||||
|
+ u32 rx_good_octets, rx_good_pkts, rx_octets;
|
||||||
|
+ u32 rx_pkts, rx_broadcast_pkts, rx_multicast_pkts;
|
||||||
|
+ u32 rx_len_64, rx_len_65_to_127, rx_len_128_to_255;
|
||||||
|
+ u32 rx_len_256_to_511, rx_len_512_to_1023, rx_len_1024_to_max;
|
||||||
|
+ u32 rx_jabber_pkts, rx_oversize_pkts, rx_fragment_pkts;
|
||||||
|
+ u32 rx_missed_pkts, rx_crc_align_errs, rx_undersize;
|
||||||
|
+ u32 rx_crc_errs, rx_align_errs, rx_symbol_errs;
|
||||||
|
+ u32 rx_pause_pkts, rx_nonpause_pkts;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct b44 {
|
||||||
|
@@ -420,6 +386,7 @@
|
||||||
|
|
||||||
|
u32 dma_offset;
|
||||||
|
u32 flags;
|
||||||
|
+#define B44_FLAG_INIT_COMPLETE 0x00000001
|
||||||
|
#define B44_FLAG_BUGGY_TXPTR 0x00000002
|
||||||
|
#define B44_FLAG_REORDER_BUG 0x00000004
|
||||||
|
#define B44_FLAG_PAUSE_AUTO 0x00008000
|
||||||
|
@@ -433,8 +400,6 @@
|
||||||
|
#define B44_FLAG_ADV_100HALF 0x04000000
|
||||||
|
#define B44_FLAG_ADV_100FULL 0x08000000
|
||||||
|
#define B44_FLAG_INTERNAL_PHY 0x10000000
|
||||||
|
-#define B44_FLAG_RX_RING_HACK 0x20000000
|
||||||
|
-#define B44_FLAG_TX_RING_HACK 0x40000000
|
||||||
|
|
||||||
|
u32 rx_offset;
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
diff -ur linux-2.6.14.3/drivers/net/b44.c linux-2.6.14.3-openwrt/drivers/net/b44.c
|
||||||
--- linux-2.6.12.5/drivers/net/b44.c 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.14.3/drivers/net/b44.c 2005-11-24 23:10:21.000000000 +0100
|
||||||
+++ linux-2.6.12.5-b44/drivers/net/b44.c 2005-09-16 22:19:33.841633800 +0200
|
+++ linux-2.6.14.3-openwrt/drivers/net/b44.c 2005-12-08 13:24:35.000000000 +0100
|
||||||
@@ -1,7 +1,8 @@
|
@@ -1,7 +1,8 @@
|
||||||
-/* b44.c: Broadcom 4400 device driver.
|
-/* b44.c: Broadcom 4400 device driver.
|
||||||
+/* b44.c: Broadcom 4400/47xx device driver.
|
+/* b44.c: Broadcom 4400/47xx device driver.
|
||||||
@ -615,7 +615,7 @@ diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int b44_open(struct net_device *dev)
|
static int b44_open(struct net_device *dev)
|
||||||
@@ -1416,11 +1460,11 @@
|
@@ -1419,11 +1463,11 @@
|
||||||
int i=0;
|
int i=0;
|
||||||
unsigned char zero[6] = {0,0,0,0,0,0};
|
unsigned char zero[6] = {0,0,0,0,0,0};
|
||||||
|
|
||||||
@ -629,7 +629,7 @@ diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
|||||||
} else {
|
} else {
|
||||||
__b44_set_mac_addr(bp);
|
__b44_set_mac_addr(bp);
|
||||||
|
|
||||||
@@ -1432,9 +1476,9 @@
|
@@ -1435,9 +1479,9 @@
|
||||||
for(;i<64;i++) {
|
for(;i<64;i++) {
|
||||||
__b44_cam_write(bp, zero, i);
|
__b44_cam_write(bp, zero, i);
|
||||||
}
|
}
|
||||||
@ -642,7 +642,7 @@ diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1675,17 +1719,288 @@
|
@@ -1678,17 +1722,288 @@
|
||||||
.set_msglevel = b44_set_msglevel,
|
.set_msglevel = b44_set_msglevel,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -935,7 +935,7 @@ diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Read 128-bytes of EEPROM. */
|
/* Read 128-bytes of EEPROM. */
|
||||||
@@ -1695,7 +2010,7 @@
|
@@ -1698,7 +2013,7 @@
|
||||||
u16 *ptr = (u16 *) data;
|
u16 *ptr = (u16 *) data;
|
||||||
|
|
||||||
for (i = 0; i < 128; i += 2)
|
for (i = 0; i < 128; i += 2)
|
||||||
@ -944,7 +944,7 @@ diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -1704,19 +2019,41 @@
|
@@ -1707,19 +2022,41 @@
|
||||||
{
|
{
|
||||||
u8 eeprom[128];
|
u8 eeprom[128];
|
||||||
int err;
|
int err;
|
||||||
@ -998,7 +998,7 @@ diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
|||||||
|
|
||||||
/* With this, plus the rx_header prepended to the data by the
|
/* With this, plus the rx_header prepended to the data by the
|
||||||
* hardware, we'll land the ethernet header on a 2-byte boundary.
|
* hardware, we'll land the ethernet header on a 2-byte boundary.
|
||||||
@@ -1726,13 +2063,12 @@
|
@@ -1729,13 +2066,12 @@
|
||||||
bp->imask = IMASK_DEF;
|
bp->imask = IMASK_DEF;
|
||||||
|
|
||||||
bp->core_unit = ssb_core_unit(bp);
|
bp->core_unit = ssb_core_unit(bp);
|
||||||
@ -1014,7 +1014,7 @@ diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int __devinit b44_init_one(struct pci_dev *pdev,
|
static int __devinit b44_init_one(struct pci_dev *pdev,
|
||||||
@@ -1810,7 +2146,7 @@
|
@@ -1813,7 +2149,7 @@
|
||||||
|
|
||||||
spin_lock_init(&bp->lock);
|
spin_lock_init(&bp->lock);
|
||||||
|
|
||||||
@ -1023,7 +1023,7 @@ diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
|||||||
if (bp->regs == 0UL) {
|
if (bp->regs == 0UL) {
|
||||||
printk(KERN_ERR PFX "Cannot map device registers, "
|
printk(KERN_ERR PFX "Cannot map device registers, "
|
||||||
"aborting.\n");
|
"aborting.\n");
|
||||||
@@ -1871,15 +2207,21 @@
|
@@ -1874,15 +2210,21 @@
|
||||||
|
|
||||||
pci_save_state(bp->pdev);
|
pci_save_state(bp->pdev);
|
||||||
|
|
||||||
@ -1047,7 +1047,7 @@ diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
|||||||
|
|
||||||
err_out_free_dev:
|
err_out_free_dev:
|
||||||
free_netdev(dev);
|
free_netdev(dev);
|
||||||
@@ -1901,7 +2243,7 @@
|
@@ -1904,7 +2246,7 @@
|
||||||
struct b44 *bp = netdev_priv(dev);
|
struct b44 *bp = netdev_priv(dev);
|
||||||
|
|
||||||
unregister_netdev(dev);
|
unregister_netdev(dev);
|
||||||
@ -1056,9 +1056,9 @@ diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
|
|||||||
free_netdev(dev);
|
free_netdev(dev);
|
||||||
pci_release_regions(pdev);
|
pci_release_regions(pdev);
|
||||||
pci_disable_device(pdev);
|
pci_disable_device(pdev);
|
||||||
diff -Nur linux-2.6.12.5/drivers/net/b44.h linux-2.6.12.5-b44/drivers/net/b44.h
|
diff -ur linux-2.6.14.3/drivers/net/b44.h linux-2.6.14.3-openwrt/drivers/net/b44.h
|
||||||
--- linux-2.6.12.5/drivers/net/b44.h 2005-08-15 02:20:18.000000000 +0200
|
--- linux-2.6.14.3/drivers/net/b44.h 2005-11-24 23:10:21.000000000 +0100
|
||||||
+++ linux-2.6.12.5-b44/drivers/net/b44.h 2005-09-16 22:18:06.217954624 +0200
|
+++ linux-2.6.14.3-openwrt/drivers/net/b44.h 2005-12-08 13:24:35.000000000 +0100
|
||||||
@@ -292,6 +292,9 @@
|
@@ -292,6 +292,9 @@
|
||||||
#define SSB_PCI_MASK1 0xfc000000
|
#define SSB_PCI_MASK1 0xfc000000
|
||||||
#define SSB_PCI_MASK2 0xc0000000
|
#define SSB_PCI_MASK2 0xc0000000
|
@ -1,6 +1,6 @@
|
|||||||
--- linux-2.6.11.3-stock/include/linux/netfilter_ipv4/ip_conntrack.h 2005-03-13 00:44:41.000000000 -0600
|
--- linux-2.6.14/include/linux/netfilter_ipv4/ip_conntrack.h 2005-10-27 19:02:08.000000000 -0500
|
||||||
+++ linux-2.6.11.3-layer7/include/linux/netfilter_ipv4/ip_conntrack.h 2005-03-13 20:30:01.000000000 -0600
|
+++ linux-2.6.14-layer7/include/linux/netfilter_ipv4/ip_conntrack.h 2005-11-12 17:31:34.000000000 -0600
|
||||||
@@ -177,6 +177,15 @@ struct ip_conntrack
|
@@ -253,6 +253,15 @@ struct ip_conntrack
|
||||||
/* 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 */
|
||||||
struct ip_conntrack_tuple_hash tuplehash[IP_CT_DIR_MAX];
|
struct ip_conntrack_tuple_hash tuplehash[IP_CT_DIR_MAX];
|
||||||
@ -16,8 +16,8 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct ip_conntrack_expect
|
struct ip_conntrack_expect
|
||||||
--- linux-2.6.11.3-stock/include/linux/netfilter_ipv4/ipt_layer7.h 1969-12-31 18:00:00.000000000 -0600
|
--- linux-2.6.14/include/linux/netfilter_ipv4/ipt_layer7.h 1969-12-31 18:00:00.000000000 -0600
|
||||||
+++ linux-2.6.11.3-layer7/include/linux/netfilter_ipv4/ipt_layer7.h 2005-03-13 20:30:01.000000000 -0600
|
+++ linux-2.6.14-layer7/include/linux/netfilter_ipv4/ipt_layer7.h 2005-11-12 17:31:34.000000000 -0600
|
||||||
@@ -0,0 +1,26 @@
|
@@ -0,0 +1,26 @@
|
||||||
+/*
|
+/*
|
||||||
+ By Matthew Strait <quadong@users.sf.net>, Dec 2003.
|
+ By Matthew Strait <quadong@users.sf.net>, Dec 2003.
|
||||||
@ -45,9 +45,9 @@
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif /* _IPT_LAYER7_H */
|
+#endif /* _IPT_LAYER7_H */
|
||||||
--- linux-2.6.11.3-stock/net/ipv4/netfilter/Kconfig 2005-03-13 00:44:38.000000000 -0600
|
--- linux-2.6.14/net/ipv4/netfilter/Kconfig 2005-10-27 19:02:08.000000000 -0500
|
||||||
+++ linux-2.6.11.3-layer7/net/ipv4/netfilter/Kconfig 2005-03-13 20:30:01.000000000 -0600
|
+++ linux-2.6.14-layer7/net/ipv4/netfilter/Kconfig 2005-11-12 17:31:34.000000000 -0600
|
||||||
@@ -146,6 +146,33 @@ config IP_NF_MATCH_MAC
|
@@ -205,6 +205,24 @@ config IP_NF_MATCH_MAC
|
||||||
|
|
||||||
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.
|
||||||
|
|
||||||
@ -68,35 +68,26 @@
|
|||||||
+ depends on IP_NF_MATCH_LAYER7
|
+ depends on IP_NF_MATCH_LAYER7
|
||||||
+ help
|
+ help
|
||||||
+ Say Y to get lots of debugging output.
|
+ Say Y to get lots of debugging output.
|
||||||
+
|
|
||||||
+config IP_NF_MATCH_LAYER7_MAXDATALEN
|
|
||||||
+ int "Buffer size for application layer data" if IP_NF_MATCH_LAYER7
|
|
||||||
+ range 256 65536
|
|
||||||
+ default 2048
|
|
||||||
+ help
|
|
||||||
+ Size of the buffer that the application layer data is stored in.
|
|
||||||
+ Unless you know what you're doing, leave it at the default of 2kB.
|
|
||||||
+
|
|
||||||
+
|
+
|
||||||
config IP_NF_MATCH_PKTTYPE
|
config IP_NF_MATCH_PKTTYPE
|
||||||
tristate "Packet type match support"
|
tristate "Packet type match support"
|
||||||
depends on IP_NF_IPTABLES
|
depends on IP_NF_IPTABLES
|
||||||
--- linux-2.6.11.3-stock/net/ipv4/netfilter/Makefile 2005-03-13 00:44:14.000000000 -0600
|
--- linux-2.6.14/net/ipv4/netfilter/Makefile 2005-10-27 19:02:08.000000000 -0500
|
||||||
+++ linux-2.6.11.3-layer7/net/ipv4/netfilter/Makefile 2005-03-13 20:30:01.000000000 -0600
|
+++ linux-2.6.14-layer7/net/ipv4/netfilter/Makefile 2005-11-12 17:31:34.000000000 -0600
|
||||||
@@ -60,6 +60,8 @@ obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ip
|
@@ -74,6 +74,8 @@ obj-$(CONFIG_IP_NF_MATCH_PHYSDEV) += ipt
|
||||||
obj-$(CONFIG_IP_NF_MATCH_PHYSDEV) += ipt_physdev.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_COMMENT) += ipt_comment.o
|
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
|
+obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_layer7.o
|
||||||
+
|
+
|
||||||
# targets
|
# targets
|
||||||
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
|
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
|
||||||
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
|
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
|
||||||
--- linux-2.6.11.3-stock/net/ipv4/netfilter/ip_conntrack_core.c 2005-03-13 00:43:57.000000000 -0600
|
--- linux-2.6.14/net/ipv4/netfilter/ip_conntrack_core.c 2005-10-27 19:02:08.000000000 -0500
|
||||||
+++ linux-2.6.11.3-layer7/net/ipv4/netfilter/ip_conntrack_core.c 2005-03-13 22:09:32.000000000 -0600
|
+++ linux-2.6.14-layer7/net/ipv4/netfilter/ip_conntrack_core.c 2005-11-12 17:31:34.000000000 -0600
|
||||||
@@ -247,6 +247,13 @@ destroy_conntrack(struct nf_conntrack *n
|
@@ -335,6 +335,13 @@ destroy_conntrack(struct nf_conntrack *n
|
||||||
* too. */
|
* too. */
|
||||||
remove_expectations(ct);
|
ip_ct_remove_expectations(ct);
|
||||||
|
|
||||||
+ #if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE)
|
+ #if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE)
|
||||||
+ if(ct->layer7.app_proto)
|
+ if(ct->layer7.app_proto)
|
||||||
@ -108,10 +99,10 @@
|
|||||||
/* 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));
|
||||||
--- linux-2.6.11.3-stock/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-03-13 00:44:25.000000000 -0600
|
--- linux-2.6.14/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-10-27 19:02:08.000000000 -0500
|
||||||
+++ linux-2.6.11.3-layer7/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-03-13 20:30:01.000000000 -0600
|
+++ linux-2.6.14-layer7/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-11-12 17:31:34.000000000 -0600
|
||||||
@@ -152,6 +152,12 @@ static int ct_seq_real_show(const struct
|
@@ -188,6 +188,12 @@ static int ct_seq_show(struct seq_file *
|
||||||
return 1;
|
return -ENOSPC;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
+#if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE)
|
+#if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE)
|
||||||
@ -121,11 +112,11 @@
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
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 1;
|
return -ENOSPC;
|
||||||
|
|
||||||
--- linux-2.6.11.3-stock/net/ipv4/netfilter/ipt_layer7.c 1969-12-31 18:00:00.000000000 -0600
|
--- linux-2.6.14/net/ipv4/netfilter/ipt_layer7.c 1969-12-31 18:00:00.000000000 -0600
|
||||||
+++ linux-2.6.11.3-layer7/net/ipv4/netfilter/ipt_layer7.c 2005-03-13 20:30:01.000000000 -0600
|
+++ linux-2.6.14-layer7/net/ipv4/netfilter/ipt_layer7.c 2005-11-12 17:49:24.000000000 -0600
|
||||||
@@ -0,0 +1,552 @@
|
@@ -0,0 +1,569 @@
|
||||||
+/*
|
+/*
|
||||||
+ Kernel module to match application layer (OSI layer 7)
|
+ Kernel module to match application layer (OSI layer 7)
|
||||||
+ data in connections.
|
+ data in connections.
|
||||||
@ -151,7 +142,7 @@
|
|||||||
+#include <linux/ctype.h>
|
+#include <linux/ctype.h>
|
||||||
+#include <net/ip.h>
|
+#include <net/ip.h>
|
||||||
+#include <net/tcp.h>
|
+#include <net/tcp.h>
|
||||||
+#include <linux/netfilter_ipv4/lockhelp.h>
|
+#include <linux/spinlock.h>
|
||||||
+
|
+
|
||||||
+#include "regexp/regexp.c"
|
+#include "regexp/regexp.c"
|
||||||
+
|
+
|
||||||
@ -161,8 +152,13 @@
|
|||||||
+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
|
+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
+MODULE_DESCRIPTION("iptables application layer match module");
|
+MODULE_DESCRIPTION("iptables application layer match module");
|
||||||
|
+MODULE_VERSION("2.0");
|
||||||
+
|
+
|
||||||
+#if defined(CONFIG_IP_NF_MATCH_LAYER7_DEBUG)
|
+static int maxdatalen = 2048; // this is the default
|
||||||
|
+module_param(maxdatalen, int, 0444);
|
||||||
|
+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
|
||||||
|
+
|
||||||
|
+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
|
||||||
+ #define DPRINTK(format,args...) printk(format,##args)
|
+ #define DPRINTK(format,args...) printk(format,##args)
|
||||||
+#else
|
+#else
|
||||||
+ #define DPRINTK(format,args...)
|
+ #define DPRINTK(format,args...)
|
||||||
@ -173,7 +169,7 @@
|
|||||||
+
|
+
|
||||||
+/* Number of packets whose data we look at.
|
+/* Number of packets whose data we look at.
|
||||||
+This can be modified through /proc/net/layer7_numpackets */
|
+This can be modified through /proc/net/layer7_numpackets */
|
||||||
+static int num_packets = 8;
|
+static int num_packets = 10;
|
||||||
+
|
+
|
||||||
+static struct pattern_cache {
|
+static struct pattern_cache {
|
||||||
+ char * regex_string;
|
+ char * regex_string;
|
||||||
@ -196,10 +192,10 @@
|
|||||||
+ time. In this case, we have to protect the conntracks and the list of
|
+ time. In this case, we have to protect the conntracks and the list of
|
||||||
+ compiled patterns.
|
+ compiled patterns.
|
||||||
+*/
|
+*/
|
||||||
+DECLARE_RWLOCK(ct_lock);
|
+DEFINE_RWLOCK(ct_lock);
|
||||||
+DECLARE_LOCK(list_lock);
|
+DEFINE_SPINLOCK(list_lock);
|
||||||
+
|
+
|
||||||
+#if CONFIG_IP_NF_MATCH_LAYER7_DEBUG
|
+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
|
||||||
+/* Converts an unfriendly string into a friendly one by
|
+/* Converts an unfriendly string into a friendly one by
|
||||||
+replacing unprintables with periods and all whitespace with " ". */
|
+replacing unprintables with periods and all whitespace with " ". */
|
||||||
+static char * friendly_print(unsigned char * s)
|
+static char * friendly_print(unsigned char * s)
|
||||||
@ -366,7 +362,7 @@
|
|||||||
+ struct ipt_layer7_info * info)
|
+ struct ipt_layer7_info * info)
|
||||||
+{
|
+{
|
||||||
+ /* If we're in here, throw the app data away */
|
+ /* If we're in here, throw the app data away */
|
||||||
+ WRITE_LOCK(&ct_lock);
|
+ write_lock(&ct_lock);
|
||||||
+ if(master_conntrack->layer7.app_data != NULL) {
|
+ if(master_conntrack->layer7.app_data != NULL) {
|
||||||
+
|
+
|
||||||
+ #ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
|
+ #ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
|
||||||
@ -385,38 +381,38 @@
|
|||||||
+ kfree(master_conntrack->layer7.app_data);
|
+ kfree(master_conntrack->layer7.app_data);
|
||||||
+ master_conntrack->layer7.app_data = NULL; /* don't free again */
|
+ master_conntrack->layer7.app_data = NULL; /* don't free again */
|
||||||
+ }
|
+ }
|
||||||
+ WRITE_UNLOCK(&ct_lock);
|
+ write_unlock(&ct_lock);
|
||||||
+
|
+
|
||||||
+ if(master_conntrack->layer7.app_proto){
|
+ if(master_conntrack->layer7.app_proto){
|
||||||
+ /* Here child connections set their .app_proto (for /proc/net/ip_conntrack) */
|
+ /* Here child connections set their .app_proto (for /proc/net/ip_conntrack) */
|
||||||
+ WRITE_LOCK(&ct_lock);
|
+ write_lock(&ct_lock);
|
||||||
+ if(!conntrack->layer7.app_proto) {
|
+ if(!conntrack->layer7.app_proto) {
|
||||||
+ conntrack->layer7.app_proto = kmalloc(strlen(master_conntrack->layer7.app_proto)+1, GFP_ATOMIC);
|
+ conntrack->layer7.app_proto = kmalloc(strlen(master_conntrack->layer7.app_proto)+1, GFP_ATOMIC);
|
||||||
+ if(!conntrack->layer7.app_proto){
|
+ if(!conntrack->layer7.app_proto){
|
||||||
+ if (net_ratelimit())
|
+ if (net_ratelimit())
|
||||||
+ printk(KERN_ERR "layer7: out of memory in match_no_append, bailing.\n");
|
+ printk(KERN_ERR "layer7: out of memory in match_no_append, bailing.\n");
|
||||||
+ WRITE_UNLOCK(&ct_lock);
|
+ write_unlock(&ct_lock);
|
||||||
+ return 1;
|
+ return 1;
|
||||||
+ }
|
+ }
|
||||||
+ strcpy(conntrack->layer7.app_proto, master_conntrack->layer7.app_proto);
|
+ strcpy(conntrack->layer7.app_proto, master_conntrack->layer7.app_proto);
|
||||||
+ }
|
+ }
|
||||||
+ WRITE_UNLOCK(&ct_lock);
|
+ write_unlock(&ct_lock);
|
||||||
+
|
+
|
||||||
+ return (!strcmp(master_conntrack->layer7.app_proto, info->protocol));
|
+ return (!strcmp(master_conntrack->layer7.app_proto, info->protocol));
|
||||||
+ }
|
+ }
|
||||||
+ else {
|
+ else {
|
||||||
+ /* If not classified, set to "unknown" to distinguish from
|
+ /* If not classified, set to "unknown" to distinguish from
|
||||||
+ connections that are still being tested. */
|
+ connections that are still being tested. */
|
||||||
+ WRITE_LOCK(&ct_lock);
|
+ write_lock(&ct_lock);
|
||||||
+ master_conntrack->layer7.app_proto = kmalloc(strlen("unknown")+1, GFP_ATOMIC);
|
+ master_conntrack->layer7.app_proto = kmalloc(strlen("unknown")+1, GFP_ATOMIC);
|
||||||
+ if(!master_conntrack->layer7.app_proto){
|
+ if(!master_conntrack->layer7.app_proto){
|
||||||
+ if (net_ratelimit())
|
+ if (net_ratelimit())
|
||||||
+ printk(KERN_ERR "layer7: out of memory in match_no_append, bailing.\n");
|
+ printk(KERN_ERR "layer7: out of memory in match_no_append, bailing.\n");
|
||||||
+ WRITE_UNLOCK(&ct_lock);
|
+ write_unlock(&ct_lock);
|
||||||
+ return 1;
|
+ return 1;
|
||||||
+ }
|
+ }
|
||||||
+ strcpy(master_conntrack->layer7.app_proto, "unknown");
|
+ strcpy(master_conntrack->layer7.app_proto, "unknown");
|
||||||
+ WRITE_UNLOCK(&ct_lock);
|
+ write_unlock(&ct_lock);
|
||||||
+ return 0;
|
+ return 0;
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
@ -430,7 +426,7 @@
|
|||||||
+
|
+
|
||||||
+ /* Strip nulls. Make everything lower case (our regex lib doesn't
|
+ /* Strip nulls. Make everything lower case (our regex lib doesn't
|
||||||
+ do case insensitivity). Add it to the end of the current data. */
|
+ do case insensitivity). Add it to the end of the current data. */
|
||||||
+ for(i = 0; i < CONFIG_IP_NF_MATCH_LAYER7_MAXDATALEN-oldlength-1 &&
|
+ for(i = 0; i < maxdatalen-oldlength-1 &&
|
||||||
+ i < appdatalen; i++) {
|
+ i < appdatalen; i++) {
|
||||||
+ if(app_data[i] != '\0') {
|
+ if(app_data[i] != '\0') {
|
||||||
+ master_conntrack->layer7.app_data[length+oldlength] =
|
+ master_conntrack->layer7.app_data[length+oldlength] =
|
||||||
@ -463,13 +459,12 @@
|
|||||||
+ return info->invert;
|
+ return info->invert;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /* Treat the parent and all its children together as one connection,
|
+ /* Treat parent & all its children together as one connection, except
|
||||||
+ except for the purpose of setting conntrack->layer7.app_proto in the
|
+ for the purpose of setting conntrack->layer7.app_proto in the actual
|
||||||
+ actual connection. This makes /proc/net/ip_conntrack somewhat more
|
+ connection. This makes /proc/net/ip_conntrack more satisfying. */
|
||||||
+ satisfying. */
|
|
||||||
+ if(!(conntrack = ip_conntrack_get((struct sk_buff *)skb, &ctinfo)) ||
|
+ if(!(conntrack = ip_conntrack_get((struct sk_buff *)skb, &ctinfo)) ||
|
||||||
+ !(master_conntrack = ip_conntrack_get((struct sk_buff *)skb, &master_ctinfo))) {
|
+ !(master_conntrack = ip_conntrack_get((struct sk_buff *)skb, &master_ctinfo))) {
|
||||||
+ DPRINTK("layer7: packet is not from a known connection, giving up.\n");
|
+ //DPRINTK("layer7: packet is not from a known connection, giving up.\n");
|
||||||
+ return info->invert;
|
+ return info->invert;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
@ -505,25 +500,25 @@
|
|||||||
+ app_data = skb->data + app_data_offset(skb);
|
+ app_data = skb->data + app_data_offset(skb);
|
||||||
+ appdatalen = skb->tail - app_data;
|
+ appdatalen = skb->tail - app_data;
|
||||||
+
|
+
|
||||||
+ LOCK_BH(&list_lock);
|
+ spin_lock_bh(&list_lock);
|
||||||
+ /* the return value gets checked later, when we're ready to use it */
|
+ /* the return value gets checked later, when we're ready to use it */
|
||||||
+ comppattern = compile_and_cache(info->pattern, info->protocol);
|
+ comppattern = compile_and_cache(info->pattern, info->protocol);
|
||||||
+ UNLOCK_BH(&list_lock);
|
+ spin_unlock_bh(&list_lock);
|
||||||
+
|
+
|
||||||
+ /* On the first packet of a connection, allocate space for app data */
|
+ /* On the first packet of a connection, allocate space for app data */
|
||||||
+ WRITE_LOCK(&ct_lock);
|
+ write_lock(&ct_lock);
|
||||||
+ if(TOTAL_PACKETS == 1 && !skb->cb[0] && !master_conntrack->layer7.app_data) {
|
+ if(TOTAL_PACKETS == 1 && !skb->cb[0] && !master_conntrack->layer7.app_data) {
|
||||||
+ master_conntrack->layer7.app_data = kmalloc(CONFIG_IP_NF_MATCH_LAYER7_MAXDATALEN, GFP_ATOMIC);
|
+ master_conntrack->layer7.app_data = kmalloc(maxdatalen, GFP_ATOMIC);
|
||||||
+ if(!master_conntrack->layer7.app_data){
|
+ if(!master_conntrack->layer7.app_data){
|
||||||
+ if (net_ratelimit())
|
+ if (net_ratelimit())
|
||||||
+ printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
|
+ printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
|
||||||
+ WRITE_UNLOCK(&ct_lock);
|
+ write_unlock(&ct_lock);
|
||||||
+ return info->invert;
|
+ return info->invert;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ master_conntrack->layer7.app_data[0] = '\0';
|
+ master_conntrack->layer7.app_data[0] = '\0';
|
||||||
+ }
|
+ }
|
||||||
+ WRITE_UNLOCK(&ct_lock);
|
+ write_unlock(&ct_lock);
|
||||||
+
|
+
|
||||||
+ /* Can be here, but unallocated, if numpackets is increased near
|
+ /* Can be here, but unallocated, if numpackets is increased near
|
||||||
+ the beginning of a connection */
|
+ the beginning of a connection */
|
||||||
@ -532,9 +527,9 @@
|
|||||||
+
|
+
|
||||||
+ if(!skb->cb[0]){
|
+ if(!skb->cb[0]){
|
||||||
+ int newbytes;
|
+ int newbytes;
|
||||||
+ WRITE_LOCK(&ct_lock);
|
+ write_lock(&ct_lock);
|
||||||
+ newbytes = add_data(master_conntrack, app_data, appdatalen);
|
+ newbytes = add_data(master_conntrack, app_data, appdatalen);
|
||||||
+ WRITE_UNLOCK(&ct_lock);
|
+ write_unlock(&ct_lock);
|
||||||
+
|
+
|
||||||
+ if(newbytes == 0) { /* didn't add any data */
|
+ if(newbytes == 0) { /* didn't add any data */
|
||||||
+ skb->cb[0] = 1;
|
+ skb->cb[0] = 1;
|
||||||
@ -549,21 +544,21 @@
|
|||||||
+ pattern_result = 0;
|
+ pattern_result = 0;
|
||||||
+ /* If the regexp failed to compile, don't bother running it */
|
+ /* If the regexp failed to compile, don't bother running it */
|
||||||
+ } else if(comppattern && regexec(comppattern, master_conntrack->layer7.app_data)) {
|
+ } else if(comppattern && regexec(comppattern, master_conntrack->layer7.app_data)) {
|
||||||
+ DPRINTK("layer7: regexec positive: %s!\n", info->protocol);
|
+ DPRINTK("layer7: matched %s\n", info->protocol);
|
||||||
+ pattern_result = 1;
|
+ pattern_result = 1;
|
||||||
+ } else pattern_result = 0;
|
+ } else pattern_result = 0;
|
||||||
+
|
+
|
||||||
+ if(pattern_result) {
|
+ if(pattern_result) {
|
||||||
+ WRITE_LOCK(&ct_lock);
|
+ write_lock(&ct_lock);
|
||||||
+ master_conntrack->layer7.app_proto = kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
|
+ master_conntrack->layer7.app_proto = kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
|
||||||
+ if(!master_conntrack->layer7.app_proto){
|
+ if(!master_conntrack->layer7.app_proto){
|
||||||
+ if (net_ratelimit())
|
+ if (net_ratelimit())
|
||||||
+ printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
|
+ printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
|
||||||
+ WRITE_UNLOCK(&ct_lock);
|
+ write_unlock(&ct_lock);
|
||||||
+ return (pattern_result ^ info->invert);
|
+ return (pattern_result ^ info->invert);
|
||||||
+ }
|
+ }
|
||||||
+ strcpy(master_conntrack->layer7.app_proto, info->protocol);
|
+ strcpy(master_conntrack->layer7.app_proto, info->protocol);
|
||||||
+ WRITE_UNLOCK(&ct_lock);
|
+ write_unlock(&ct_lock);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /* mark the packet seen */
|
+ /* mark the packet seen */
|
||||||
@ -632,7 +627,10 @@
|
|||||||
+ return count;
|
+ return count;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ copy_from_user(foo, buffer, count);
|
+ if(copy_from_user(foo, buffer, count)) {
|
||||||
|
+ return -EFAULT;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
+
|
+
|
||||||
+ num_packets = my_atoi(foo);
|
+ num_packets = my_atoi(foo);
|
||||||
+ kfree (foo);
|
+ kfree (foo);
|
||||||
@ -667,6 +665,16 @@
|
|||||||
+static int __init init(void)
|
+static int __init init(void)
|
||||||
+{
|
+{
|
||||||
+ layer7_init_proc();
|
+ layer7_init_proc();
|
||||||
|
+ if(maxdatalen < 1) {
|
||||||
|
+ printk(KERN_WARNING "layer7: maxdatalen can't be < 1, using 1\n");
|
||||||
|
+ maxdatalen = 1;
|
||||||
|
+ }
|
||||||
|
+ /* This is not a hard limit. It's just here to prevent people from
|
||||||
|
+ bringing their slow machines to a grinding halt. */
|
||||||
|
+ else if(maxdatalen > 65536) {
|
||||||
|
+ printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, using 65536\n");
|
||||||
|
+ maxdatalen = 65536;
|
||||||
|
+ }
|
||||||
+ return ipt_register_match(&layer7_match);
|
+ return ipt_register_match(&layer7_match);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
@ -678,8 +686,8 @@
|
|||||||
+
|
+
|
||||||
+module_init(init);
|
+module_init(init);
|
||||||
+module_exit(fini);
|
+module_exit(fini);
|
||||||
--- linux-2.6.11.3-stock/net/ipv4/netfilter/regexp/regexp.c 1969-12-31 18:00:00.000000000 -0600
|
--- linux-2.6.14/net/ipv4/netfilter/regexp/regexp.c 1969-12-31 18:00:00.000000000 -0600
|
||||||
+++ linux-2.6.11.3-layer7/net/ipv4/netfilter/regexp/regexp.c 2005-03-13 20:30:01.000000000 -0600
|
+++ linux-2.6.14-layer7/net/ipv4/netfilter/regexp/regexp.c 2005-11-12 17:31:34.000000000 -0600
|
||||||
@@ -0,0 +1,1195 @@
|
@@ -0,0 +1,1195 @@
|
||||||
+/*
|
+/*
|
||||||
+ * regcomp and regexec -- regsub and regerror are elsewhere
|
+ * regcomp and regexec -- regsub and regerror are elsewhere
|
||||||
@ -1876,8 +1884,8 @@
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
--- linux-2.6.11.3-stock/net/ipv4/netfilter/regexp/regexp.h 1969-12-31 18:00:00.000000000 -0600
|
--- linux-2.6.14/net/ipv4/netfilter/regexp/regexp.h 1969-12-31 18:00:00.000000000 -0600
|
||||||
+++ linux-2.6.11.3-layer7/net/ipv4/netfilter/regexp/regexp.h 2005-03-13 20:30:01.000000000 -0600
|
+++ linux-2.6.14-layer7/net/ipv4/netfilter/regexp/regexp.h 2005-11-12 17:31:34.000000000 -0600
|
||||||
@@ -0,0 +1,41 @@
|
@@ -0,0 +1,41 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Definitions etc. for regexp(3) routines.
|
+ * Definitions etc. for regexp(3) routines.
|
||||||
@ -1920,16 +1928,16 @@
|
|||||||
+void regerror(char *s);
|
+void regerror(char *s);
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
--- linux-2.6.11.3-stock/net/ipv4/netfilter/regexp/regmagic.h 1969-12-31 18:00:00.000000000 -0600
|
--- linux-2.6.14/net/ipv4/netfilter/regexp/regmagic.h 1969-12-31 18:00:00.000000000 -0600
|
||||||
+++ linux-2.6.11.3-layer7/net/ipv4/netfilter/regexp/regmagic.h 2005-03-13 20:30:01.000000000 -0600
|
+++ linux-2.6.14-layer7/net/ipv4/netfilter/regexp/regmagic.h 2005-11-12 17:31:34.000000000 -0600
|
||||||
@@ -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
|
||||||
--- linux-2.6.11.3-stock/net/ipv4/netfilter/regexp/regsub.c 1969-12-31 18:00:00.000000000 -0600
|
--- linux-2.6.14/net/ipv4/netfilter/regexp/regsub.c 1969-12-31 18:00:00.000000000 -0600
|
||||||
+++ linux-2.6.11.3-layer7/net/ipv4/netfilter/regexp/regsub.c 2005-03-13 20:30:01.000000000 -0600
|
+++ linux-2.6.14-layer7/net/ipv4/netfilter/regexp/regsub.c 2005-11-12 17:31:34.000000000 -0600
|
||||||
@@ -0,0 +1,95 @@
|
@@ -0,0 +1,95 @@
|
||||||
+/*
|
+/*
|
||||||
+ * regsub
|
+ * regsub
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user