diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-02-22 12:21:05 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2018-02-22 12:46:25 +0100 |
| commit | aad1f11efe1c0f761d3454ac371fd98e65284b35 (patch) | |
| tree | 96b046b404941f541c6ca5b86d94f25c0b66441b /target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch | |
| parent | 14a01311f5b834cda6962e866e855d27325d232b (diff) | |
| download | upstream-aad1f11efe1c0f761d3454ac371fd98e65284b35.tar.gz upstream-aad1f11efe1c0f761d3454ac371fd98e65284b35.tar.bz2 upstream-aad1f11efe1c0f761d3454ac371fd98e65284b35.zip | |
kernel: refresh patches
Some fuzz was introduced due to the netfilter-offload series
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch b/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch index f39ed62dc0..10da96b7ed 100644 --- a/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch +++ b/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch @@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <net/net_namespace.h> #ifdef CONFIG_SYSCTL #include <linux/sysctl.h> -@@ -377,10 +378,66 @@ static int ct_open(struct inode *inode, +@@ -381,10 +382,66 @@ static int ct_open(struct inode *inode, sizeof(struct ct_iter_state)); } @@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> .llseek = seq_lseek, .release = seq_release_net, }; -@@ -484,7 +541,7 @@ static int nf_conntrack_standalone_init_ +@@ -488,7 +545,7 @@ static int nf_conntrack_standalone_init_ kuid_t root_uid; kgid_t root_gid; |