summaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-23 21:05:32 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-23 21:05:32 +0000
commit530802ba69f170f1d7821d85d1cfbd5304dc5a3f (patch)
tree945f48d78b01d63f15e047ba00cfe7eeb2d86b26 /target/linux/generic
parent71526f870554c861c20611b9838356fbf8d5ff83 (diff)
kernel: update linux 3.3 to 3.3.7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31848 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch23
-rw-r--r--target/linux/generic/patches-3.3/252-mv_cesa_depends.patch2
2 files changed, 9 insertions, 16 deletions
diff --git a/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch b/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch
index 5fc75a074..e8154b584 100644
--- a/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch
+++ b/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch
@@ -20,11 +20,9 @@ Cc: Van Jacobson <van@pollere.net>
net/sched/sch_fq_codel.c | 5 +++--
3 files changed, 12 insertions(+), 12 deletions(-)
-diff --git a/include/net/codel.h b/include/net/codel.h
-index 7546517..550debf 100644
--- a/include/net/codel.h
+++ b/include/net/codel.h
-@@ -205,7 +205,7 @@ static codel_time_t codel_control_law(codel_time_t t,
+@@ -205,7 +205,7 @@ static codel_time_t codel_control_law(co
static bool codel_should_drop(const struct sk_buff *skb,
@@ -33,7 +31,7 @@ index 7546517..550debf 100644
struct codel_vars *vars,
struct codel_params *params,
struct codel_stats *stats,
-@@ -219,13 +219,13 @@ static bool codel_should_drop(const struct sk_buff *skb,
+@@ -219,13 +219,13 @@ static bool codel_should_drop(const stru
}
vars->ldelay = now - codel_get_enqueue_time(skb);
@@ -49,7 +47,7 @@ index 7546517..550debf 100644
/* went below - stay below for at least interval */
vars->first_above_time = 0;
return false;
-@@ -249,8 +249,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+@@ -249,8 +249,7 @@ static struct sk_buff *codel_dequeue(str
struct codel_params *params,
struct codel_vars *vars,
struct codel_stats *stats,
@@ -59,7 +57,7 @@ index 7546517..550debf 100644
{
struct sk_buff *skb = dequeue_func(vars, sch);
codel_time_t now;
-@@ -261,7 +260,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+@@ -261,7 +260,7 @@ static struct sk_buff *codel_dequeue(str
return skb;
}
now = codel_get_time();
@@ -68,7 +66,7 @@ index 7546517..550debf 100644
if (vars->dropping) {
if (!drop) {
/* sojourn time below target - leave dropping state */
-@@ -292,7 +291,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+@@ -292,7 +291,7 @@ static struct sk_buff *codel_dequeue(str
qdisc_drop(skb, sch);
stats->drop_count++;
skb = dequeue_func(vars, sch);
@@ -77,7 +75,7 @@ index 7546517..550debf 100644
vars, params, stats, now)) {
/* leave dropping state */
vars->dropping = false;
-@@ -313,7 +312,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+@@ -313,7 +312,7 @@ static struct sk_buff *codel_dequeue(str
stats->drop_count++;
skb = dequeue_func(vars, sch);
@@ -86,11 +84,9 @@ index 7546517..550debf 100644
stats, now);
}
vars->dropping = true;
-diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
-index 213ef60..2f9ab17 100644
--- a/net/sched/sch_codel.c
+++ b/net/sched/sch_codel.c
-@@ -77,8 +77,8 @@ static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch)
+@@ -77,8 +77,8 @@ static struct sk_buff *codel_qdisc_deque
struct codel_sched_data *q = qdisc_priv(sch);
struct sk_buff *skb;
@@ -101,11 +97,9 @@ index 213ef60..2f9ab17 100644
/* We cant call qdisc_tree_decrease_qlen() if our qlen is 0,
* or HTB crashes. Defer it for next round.
*/
-diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
-index 337ff20..9fc1c62 100644
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
-@@ -217,13 +217,14 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+@@ -217,13 +217,14 @@ static int fq_codel_enqueue(struct sk_bu
*/
static struct sk_buff *dequeue(struct codel_vars *vars, struct Qdisc *sch)
{
@@ -130,4 +124,3 @@ index 337ff20..9fc1c62 100644
flow->dropped += q->cstats.drop_count - prev_drop_count;
flow->dropped += q->cstats.ecn_mark - prev_ecn_mark;
-
diff --git a/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch b/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch
index b43d29c75..53701458a 100644
--- a/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch
+++ b/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch
@@ -6,5 +6,5 @@
select CRYPTO_AES
+ select CRYPTO_HASH2
select CRYPTO_BLKCIPHER2
+ select CRYPTO_HASH
help
- This driver allows you to utilize the Cryptographic Engines and