ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-22 06:57:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

kernel: add some fixes for kernel 3.9

Browse Source 
This patch fixes some compile problems with kernel 3.9 and adds some missing linux 3.9 handling into kernel packages.

SVN-Revision: 36098
This commit is contained in:
Hauke Mehrtens 2013-03-20 21:59:24 +00:00
parent 99638c5288
commit c9544f4af0
7 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/modules/netdevices.mk
View File

@ -473,7 +473,7 @@ $(eval $(call KernelPackage,pcnet32))
define KernelPackage/tg3 define KernelPackage/tg3
TITLE:=Broadcom Tigon3 Gigabit Ethernet TITLE:=Broadcom Tigon3 Gigabit Ethernet
KCONFIG:=CONFIG_TIGON3 KCONFIG:=CONFIG_TIGON3
DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +LINUX_3_8:kmod-ptp DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +(LINUX_3_8||LINUX_3_9):kmod-ptp
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
AUTOLOAD:=$(call AutoLoad,50,tg3) AUTOLOAD:=$(call AutoLoad,50,tg3)

2
package/kernel/modules/usb.mk
View File

@ -157,7 +157,7 @@ $(eval $(call KernelPackage,usb2))
define KernelPackage/usb2-pci define KernelPackage/usb2-pci
TITLE:=Support for PCI USB2 controllers TITLE:=Support for PCI USB2 controllers
DEPENDS:=@PCI_SUPPORT @LINUX_3_8 +kmod-usb2 DEPENDS:=@PCI_SUPPORT @(LINUX_3_8||LINUX_3_9) +kmod-usb2
KCONFIG:=CONFIG_USB_EHCI_PCI KCONFIG:=CONFIG_USB_EHCI_PCI
FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko
AUTOLOAD:=$(call AutoLoad,42,ehci-pci,1) AUTOLOAD:=$(call AutoLoad,42,ehci-pci,1)

16
package/network/utils/ipset/patches/001-fix-kernel-3.9.patch Normal file
View File

@ -0,0 +1,16 @@
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -27,6 +27,13 @@
#include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/ipset/ip_set.h>
+#ifndef IPSET_IN_KERNEL_TREE
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+#define nfnl_unlock() nfnl_unlock(NFNL_SUBSYS_IPSET)
+#define nfnl_lock() nfnl_lock(NFNL_SUBSYS_IPSET)
+#endif
+#endif
+
static LIST_HEAD(ip_set_type_list); /* all registered set types */
static DEFINE_MUTEX(ip_set_type_mutex); /* protects ip_set_type_list */
static DEFINE_RWLOCK(ip_set_ref_lock); /* protects the set refs */

14
package/network/utils/xtables-addons/patches/003-fix-kernel-3.9.patch Normal file
View File

@ -0,0 +1,14 @@
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -57,4 +57,11 @@
#define xt_request_find_match xtnu_request_find_match
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+static inline void proc_net_remove(struct net *net, const char *name)
+{
+ remove_proc_entry(name, net->proc_net);
+}
+#endif
+
#endif /* _XTABLES_COMPAT_H */

6
package/network/utils/xtables-addons/patches/102-rtsp-linux-3.7-compat.patch
View File

@ -72,7 +72,7 @@
{ {
char* ptcp; char* ptcp;
uint tcplen; uint tcplen;
@@ -256,7 +256,7 @@ rtsp_mangle_tran(enum ip_conntrack_info @@ -256,7 +256,7 @@ rtsp_mangle_tran(enum ip_conntrack_info
if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun)) if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
{ {
diff = nextfieldoff-off; diff = nextfieldoff-off;
@ -81,7 +81,7 @@
off, diff, NULL, 0)) off, diff, NULL, 0))
{ {
/* mangle failed, all we can do is bail */ /* mangle failed, all we can do is bail */
@@ -326,7 +326,7 @@ rtsp_mangle_tran(enum ip_conntrack_info @@ -326,7 +326,7 @@ rtsp_mangle_tran(enum ip_conntrack_info
* parameter 4 below is offset from start of tcp data. * parameter 4 below is offset from start of tcp data.
*/ */
diff = origlen-rbuflen; diff = origlen-rbuflen;
@ -90,7 +90,7 @@
origoff, origlen, rbuf, rbuflen)) origoff, origlen, rbuf, rbuflen))
{ {
/* mangle failed, all we can do is bail */ /* mangle failed, all we can do is bail */
@@ -351,7 +351,7 @@ rtsp_mangle_tran(enum ip_conntrack_info @@ -351,7 +351,7 @@ rtsp_mangle_tran(enum ip_conntrack_info
} }
static uint static uint

2
package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
View File

@ -78,7 +78,7 @@
#define UCHAR_MAX 255 #define UCHAR_MAX 255
#define SHRT_MAX 32767 #define SHRT_MAX 32767
#define BUFSIZ 8192 #define BUFSIZ 8192
@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l; @@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l;
*/ */
#if defined(__KERNEL__) #if defined(__KERNEL__)
#undef LUA_USE_ULONGJMP #undef LUA_USE_ULONGJMP

14
target/linux/generic/patches-3.9/259-regmap_dynamic.patch
View File

@ -39,6 +39,20 @@
enum regmap_endian { enum regmap_endian {
/* Unspecified -> 0 -> Backwards compatible default */ /* Unspecified -> 0 -> Backwards compatible default */
--- a/drivers/base/regmap/Makefile
+++ b/drivers/base/regmap/Makefile
@@ -1,6 +1,8 @@
-obj-$(CONFIG_REGMAP) += regmap.o regcache.o
-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o
-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
+regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o regcache-flat.o
+ifdef CONFIG_DEBUG_FS
+regmap-core-objs += regmap-debugfs.o
+endif
+obj-$(CONFIG_REGMAP) += regmap-core.o
obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
obj-$(CONFIG_REGMAP_MMIO) += regmap-mmio.o
--- a/drivers/base/regmap/regmap.c --- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@