kernel: update kernel 3.18 to version 3.18.43

[openwrt/openwrt.git] / target / linux / generic / patches-3.18 / 621-sched_act_connmark.patch

diff --git a/target/linux/generic/patches-3.18/621-sched_act_connmark.patch b/target/linux/generic/patches-3.18/621-sched_act_connmark.patch
index 945974981a9054964d80488ee2cf73faa39653f8..72d8e5343392e9d2584a9b73749e3ca1008f39a8 100644 (file)
--- a/target/linux/generic/patches-3.18/621-sched_act_connmark.patch
+++ b/target/linux/generic/patches-3.18/621-sched_act_connmark.patch
@@ -2,7 +2,7 @@
 +++ b/net/sched/act_connmark.c
 @@ -0,0 +1,126 @@
 +/*
-+ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (c) 2011 Felix Fietkau <nbd@nbd.name>
 + *
 + * This program is free software; you can redistribute it and/or modify it
 + * under the terms and conditions of the GNU General Public License,
@@ -110,7 +110,7 @@
 +      .init           =       tcf_connmark_init,
 +};
 +
-+MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
++MODULE_AUTHOR("Felix Fietkau <nbd@nbd.name>");
 +MODULE_DESCRIPTION("Connection tracking mark restoring");
 +MODULE_LICENSE("GPL");
 +
@@ -129,7 +129,7 @@
 +module_exit(connmark_cleanup_module);
 --- a/net/sched/Kconfig
 +++ b/net/sched/Kconfig
-@@ -717,6 +717,19 @@ config NET_ACT_CSUM
+@@ -686,6 +686,19 @@ config NET_ACT_CSUM
          To compile this code as a module, choose M here: the
          module will be called act_csum.