update to 3.4.23

diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index 3ecfa57a8adf8fe008c30383bc3f03f6529a839c..0183856eaeb3579a6a0d7d5a9e43eefc3197c849 100644 (file)
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-3.4.21
+3.4.23

diff --git a/patches.codel/codel-refine-one-condition-to-avoid-a-nul-rec_inv_sq.patch b/patches.codel/codel-refine-one-condition-to-avoid-a-nul-rec_inv_sq.patch
index a3c55729642a3624db9917b0070aaa35419241a8..e4651c87bc05eeaf752bc36f4d57e1843382eb38 100644 (file)
--- a/patches.codel/codel-refine-one-condition-to-avoid-a-nul-rec_inv_sq.patch
+++ b/patches.codel/codel-refine-one-condition-to-avoid-a-nul-rec_inv_sq.patch
@@ -23,11 +23,13 @@ Signed-off-by: Eric Dumazet <edumazet@google.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
-diff --git a/include/net/codel.h b/include/net/codel.h
-index 550debf..389cf62 100644
+---
+ include/net/codel.h |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
 --- a/include/net/codel.h
 +++ b/include/net/codel.h
-@@ -305,6 +305,8 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+@@ -305,6 +305,8 @@ static struct sk_buff *codel_dequeue(str
                        }
                }
        } else if (drop) {
@@ -36,7 +38,7 @@ index 550debf..389cf62 100644
                if (params->ecn && INET_ECN_set_ce(skb)) {
                        stats->ecn_mark++;
                } else {
-@@ -320,9 +322,11 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+@@ -320,9 +322,11 @@ static struct sk_buff *codel_dequeue(str
                 * assume that the drop rate that controlled the queue on the
                 * last cycle is a good starting point to control it now.
                 */
@@ -50,6 +52,3 @@ index 550debf..389cf62 100644
                        /* we dont care if rec_inv_sqrt approximation
                         * is not very precise :
                         * Next Newton steps will correct it quadratically.
--- 
-1.7.12.rc1.1.gbce1580
-

diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index 7a0ac595f2101659f33c0a1198b9870b189386f1..1ec545f3efc173f3d51905d3d4cc8f638fa2262d 100644 (file)
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 4
- SUBLEVEL = 21
+ SUBLEVEL = 23
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = Saber-toothed Squirrel