diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-14 15:39:09 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-14 15:39:09 -0800 |
| commit | 38661db6b6eb4d793d747559c1ebbde67c7106ea (patch) | |
| tree | 54e46d38229487eb7d460685b82da24ef5cc554b | |
| parent | f36da817c4ad9ed77e826b6fa8b506eb6ca6ded1 (diff) | |
| download | ltsi-kernel-38661db6b6eb4d793d747559c1ebbde67c7106ea.tar.gz | |
update to 3.4.23
| -rw-r--r-- | KERNEL_VERSION | 2 | ||||
| -rw-r--r-- | patches.codel/codel-refine-one-condition-to-avoid-a-nul-rec_inv_sq.patch | 13 | ||||
| -rw-r--r-- | patches.ltsi/ltsi-makefile-addition.patch | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/KERNEL_VERSION b/KERNEL_VERSION index 3ecfa57a8adf8..0183856eaeb35 100644 --- 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 a3c55729642a3..e4651c87bc05e 100644 --- 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 7a0ac595f2101..1ec545f3efc17 100644 --- 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 |