Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

generic/4.0: refresh patches

Browse source 
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44532
This commit is contained in:
Imre Kaloz 2015-02-24 18:53:14 +00:00
parent 11e93be20d
commit f76a752c57
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/generic/patches-4.0/305-mips_module_reloc.patch
View file

@ -150,7 +150,7 @@
{ {
+#ifdef MODULE_START +#ifdef MODULE_START
return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END, return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE, GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE,
__builtin_return_address(0)); __builtin_return_address(0));
+#else +#else
+ void *ptr; + void *ptr;

8
target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
View file

@ -11,8 +11,8 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/ubi/block.c --- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c
@@ -614,6 +614,44 @@ static int __init ubiblock_create_from_p @@ -614,6 +614,44 @@ static void __init ubiblock_create_from_
return ret; }
} }
+#define UBIFS_NODE_MAGIC 0x06101831 +#define UBIFS_NODE_MAGIC 0x06101831
@ -57,8 +57,8 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
{ {
struct ubiblock *next; struct ubiblock *next;
@@ -644,6 +682,10 @@ int __init ubiblock_init(void) @@ -644,6 +682,10 @@ int __init ubiblock_init(void)
if (ret) */
goto err_remove; ubiblock_create_from_param();
+ /* auto-attach "rootfs" volume if existing and non-ubifs */ + /* auto-attach "rootfs" volume if existing and non-ubifs */
+ if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV)) + if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV))

4
target/linux/generic/patches-4.0/604-netfilter_conntrack_flush.patch
View file

@ -8,7 +8,7 @@
#include <net/net_namespace.h> #include <net/net_namespace.h>
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
#include <linux/sysctl.h> #include <linux/sysctl.h>
@@ -259,10 +260,66 @@ static int ct_open(struct inode *inode, @@ -265,10 +266,66 @@ static int ct_open(struct inode *inode,
sizeof(struct ct_iter_state)); sizeof(struct ct_iter_state));
} }
@ -75,7 +75,7 @@
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release_net, .release = seq_release_net,
}; };
@@ -364,7 +421,7 @@ static int nf_conntrack_standalone_init_ @@ -370,7 +427,7 @@ static int nf_conntrack_standalone_init_
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;

4
target/linux/generic/patches-4.0/617-netfilter_skip_filter_sysctl.patch
View file

@ -63,7 +63,7 @@
net->ipv6.ip6table_filter); net->ipv6.ip6table_filter);
--- a/net/netfilter/nf_conntrack_standalone.c --- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c
@@ -501,6 +501,13 @@ static struct ctl_table nf_ct_sysctl_tab @@ -507,6 +507,13 @@ static struct ctl_table nf_ct_sysctl_tab
.extra2 = &log_invalid_proto_max, .extra2 = &log_invalid_proto_max,
}, },
{ {
@ -77,7 +77,7 @@
.procname = "nf_conntrack_expect_max", .procname = "nf_conntrack_expect_max",
.data = &nf_ct_expect_max, .data = &nf_ct_expect_max,
.maxlen = sizeof(int), .maxlen = sizeof(int),
@@ -536,6 +543,7 @@ static int nf_conntrack_standalone_init_ @@ -542,6 +549,7 @@ static int nf_conntrack_standalone_init_
table[2].data = &net->ct.htable_size; table[2].data = &net->ct.htable_size;
table[3].data = &net->ct.sysctl_checksum; table[3].data = &net->ct.sysctl_checksum;
table[4].data = &net->ct.sysctl_log_invalid; table[4].data = &net->ct.sysctl_log_invalid;

4
target/linux/generic/patches-4.0/645-bridge_multicast_to_unicast.patch
View file

@ -273,7 +273,7 @@
}; };
struct net_bridge_mdb_entry struct net_bridge_mdb_entry
@@ -476,7 +479,8 @@ void br_multicast_free_pg(struct rcu_hea @@ -480,7 +483,8 @@ void br_multicast_free_pg(struct rcu_hea
struct net_bridge_port_group * struct net_bridge_port_group *
br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group, br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,
struct net_bridge_port_group __rcu *next, struct net_bridge_port_group __rcu *next,
@ -285,7 +285,7 @@
void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port, void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
--- a/net/bridge/br_mdb.c --- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c
@@ -342,7 +342,7 @@ static int br_mdb_add_group(struct net_b @@ -343,7 +343,7 @@ static int br_mdb_add_group(struct net_b
break; break;
} }

2
target/linux/generic/patches-4.0/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
View file

@ -472,7 +472,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
return 0; return 0;
nla_put_failure: nla_put_failure:
@@ -1769,6 +2022,7 @@ static const struct nla_policy ip6_tnl_p @@ -1777,6 +2030,7 @@ static const struct nla_policy ip6_tnl_p
[IFLA_IPTUN_FLOWINFO] = { .type = NLA_U32 }, [IFLA_IPTUN_FLOWINFO] = { .type = NLA_U32 },
[IFLA_IPTUN_FLAGS] = { .type = NLA_U32 }, [IFLA_IPTUN_FLAGS] = { .type = NLA_U32 },
[IFLA_IPTUN_PROTO] = { .type = NLA_U8 }, [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },

4
target/linux/generic/patches-4.0/862-gpio_spi_driver.patch
View file

@ -345,7 +345,7 @@ Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
--- a/drivers/spi/Kconfig --- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig
@@ -232,6 +232,15 @@ config SPI_IMG_SPFI @@ -242,6 +242,15 @@ config SPI_IMG_SPFI
This enables support for the SPFI master controller found on This enables support for the SPFI master controller found on
IMG SoCs. IMG SoCs.
@ -363,7 +363,7 @@ Please use the new mainline SPI-GPIO driver, as of 2.6.29.
depends on ARCH_MXC || COMPILE_TEST depends on ARCH_MXC || COMPILE_TEST
--- a/drivers/spi/Makefile --- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile +++ b/drivers/spi/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_SPI_FSL_LIB) += spi-fsl-li @@ -41,6 +41,7 @@ obj-$(CONFIG_SPI_FSL_LIB) += spi-fsl-li
obj-$(CONFIG_SPI_FSL_ESPI) += spi-fsl-espi.o obj-$(CONFIG_SPI_FSL_ESPI) += spi-fsl-espi.o
obj-$(CONFIG_SPI_FSL_SPI) += spi-fsl-spi.o obj-$(CONFIG_SPI_FSL_SPI) += spi-fsl-spi.o
obj-$(CONFIG_SPI_GPIO) += spi-gpio.o obj-$(CONFIG_SPI_GPIO) += spi-gpio.o