kernel: bump 4.14 to 4.14.169

[openwrt/staging/yousong.git] / target / linux / generic / hack-4.14 / 645-netfilter-connmark-introduce-set-dscpmark.patch

diff --git a/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-set-dscpmark.patch b/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-set-dscpmark.patch
index 88c8c7f3ef415ce6471c4366140130da3a78965c..1ecc95bf22d99cb5e9548b6ae1025767b918371a 100644 (file)
--- a/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-set-dscpmark.patch
+++ b/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-set-dscpmark.patch
@@ -80,11 +80,9 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
  net/netfilter/xt_connmark.c | 19 +++++++++++++++++--
  1 file changed, 17 insertions(+), 2 deletions(-)
 
-diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
-index ec377cc6a369..823d925b3aaf 100644
 --- a/net/netfilter/xt_connmark.c
 +++ b/net/netfilter/xt_connmark.c
-@@ -42,6 +42,7 @@ connmark_tg(struct sk_buff *skb, const struct xt_action_param *par)
+@@ -42,6 +42,7 @@ connmark_tg(struct sk_buff *skb, const s
        enum ip_conntrack_info ctinfo;
        struct nf_conn *ct;
        u_int32_t newmark;
@@ -92,7 +90,7 @@ index ec377cc6a369..823d925b3aaf 100644
  
        ct = nf_ct_get(skb, &ctinfo);
        if (ct == NULL)
-@@ -49,7 +50,21 @@ connmark_tg(struct sk_buff *skb, const struct xt_action_param *par)
+@@ -49,7 +50,21 @@ connmark_tg(struct sk_buff *skb, const s
  
        switch (info->mode) {
        case XT_CONNMARK_SET:
@@ -115,7 +113,7 @@ index ec377cc6a369..823d925b3aaf 100644
                if (ct->mark != newmark) {
                        ct->mark = newmark;
                        nf_conntrack_event_cache(IPCT_MARK, ct);
-@@ -57,7 +72,7 @@ connmark_tg(struct sk_buff *skb, const struct xt_action_param *par)
+@@ -57,7 +72,7 @@ connmark_tg(struct sk_buff *skb, const s
                break;
        case XT_CONNMARK_SAVE:
                newmark = (ct->mark & ~info->ctmask) ^
@@ -124,6 +122,3 @@ index ec377cc6a369..823d925b3aaf 100644
                if (ct->mark != newmark) {
                        ct->mark = newmark;
                        nf_conntrack_event_cache(IPCT_MARK, ct);
--- 
-2.21.0 (Apple Git-122.2)
-