mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
kernel: bump 4.14 to 4.14.129
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
parent
6c1bef833d
commit
9c6fb1d67a
@ -3,10 +3,10 @@
|
|||||||
LINUX_RELEASE?=1
|
LINUX_RELEASE?=1
|
||||||
|
|
||||||
LINUX_VERSION-4.9 = .183
|
LINUX_VERSION-4.9 = .183
|
||||||
LINUX_VERSION-4.14 = .128
|
LINUX_VERSION-4.14 = .129
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-4.9.183 = fd57b0991cdbf4e2e933c260356a4768d6685a77460684f8de36a59fd42867f3
|
LINUX_KERNEL_HASH-4.9.183 = fd57b0991cdbf4e2e933c260356a4768d6685a77460684f8de36a59fd42867f3
|
||||||
LINUX_KERNEL_HASH-4.14.128 = e93c2c754f1f9c610314b2fe9f27a9636ad3a7f43983469bb8e0f44a531f2913
|
LINUX_KERNEL_HASH-4.14.129 = 7548482b03aea1784e728e4d29fe75a2abc61c9dbf9851ec925a7fbecf9336e4
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||||
|
@ -159,7 +159,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||||||
net->nf.proc_netfilter = proc_net_mkdir(net, "netfilter",
|
net->nf.proc_netfilter = proc_net_mkdir(net, "netfilter",
|
||||||
--- a/net/netfilter/nf_queue.c
|
--- a/net/netfilter/nf_queue.c
|
||||||
+++ b/net/netfilter/nf_queue.c
|
+++ b/net/netfilter/nf_queue.c
|
||||||
@@ -201,6 +201,23 @@ repeat:
|
@@ -202,6 +202,23 @@ repeat:
|
||||||
return NF_ACCEPT;
|
return NF_ACCEPT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -183,7 +183,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||||||
/* Caller must hold rcu read-side lock */
|
/* Caller must hold rcu read-side lock */
|
||||||
void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
|
void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
|
||||||
{
|
{
|
||||||
@@ -216,12 +233,12 @@ void nf_reinject(struct nf_queue_entry *
|
@@ -217,12 +234,12 @@ void nf_reinject(struct nf_queue_entry *
|
||||||
net = entry->state.net;
|
net = entry->state.net;
|
||||||
pf = entry->state.pf;
|
pf = entry->state.pf;
|
||||||
|
|
||||||
|
@ -152,7 +152,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||||||
#endif
|
#endif
|
||||||
--- a/net/netfilter/nf_queue.c
|
--- a/net/netfilter/nf_queue.c
|
||||||
+++ b/net/netfilter/nf_queue.c
|
+++ b/net/netfilter/nf_queue.c
|
||||||
@@ -204,8 +204,10 @@ repeat:
|
@@ -205,8 +205,10 @@ repeat:
|
||||||
static struct nf_hook_entries *nf_hook_entries_head(const struct net *net, u8 pf, u8 hooknum)
|
static struct nf_hook_entries *nf_hook_entries_head(const struct net *net, u8 pf, u8 hooknum)
|
||||||
{
|
{
|
||||||
switch (pf) {
|
switch (pf) {
|
||||||
|
@ -171,7 +171,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||||||
|
|
||||||
--- a/net/netfilter/nf_queue.c
|
--- a/net/netfilter/nf_queue.c
|
||||||
+++ b/net/netfilter/nf_queue.c
|
+++ b/net/netfilter/nf_queue.c
|
||||||
@@ -266,7 +266,6 @@ void nf_reinject(struct nf_queue_entry *
|
@@ -267,7 +267,6 @@ void nf_reinject(struct nf_queue_entry *
|
||||||
const struct nf_hook_entry *hook_entry;
|
const struct nf_hook_entry *hook_entry;
|
||||||
const struct nf_hook_entries *hooks;
|
const struct nf_hook_entries *hooks;
|
||||||
struct sk_buff *skb = entry->skb;
|
struct sk_buff *skb = entry->skb;
|
||||||
@ -179,7 +179,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||||||
const struct net *net;
|
const struct net *net;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
int err;
|
int err;
|
||||||
@@ -293,8 +292,7 @@ void nf_reinject(struct nf_queue_entry *
|
@@ -294,8 +293,7 @@ void nf_reinject(struct nf_queue_entry *
|
||||||
verdict = nf_hook_entry_hookfn(hook_entry, skb, &entry->state);
|
verdict = nf_hook_entry_hookfn(hook_entry, skb, &entry->state);
|
||||||
|
|
||||||
if (verdict == NF_ACCEPT) {
|
if (verdict == NF_ACCEPT) {
|
||||||
|
Loading…
Reference in New Issue
Block a user