diff options
| author | David S. Miller | 2012-03-19 04:29:41 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-03-19 04:29:41 +0100 |
| commit | 4da0bd736552e6377b407b3c3d3ae518ebbdd269 (patch) | |
| tree | f0da9f843b8033565c3ca4103fccb17a60688326 /net/sched | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff) | |
| parent | Linux 3.3 (diff) | |
| download | kernel-qcow2-linux-4da0bd736552e6377b407b3c3d3ae518ebbdd269.tar.gz kernel-qcow2-linux-4da0bd736552e6377b407b3c3d3ae518ebbdd269.tar.xz kernel-qcow2-linux-4da0bd736552e6377b407b3c3d3ae518ebbdd269.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_sfq.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index 60d47180f043..02a21abea65e 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c @@ -469,11 +469,15 @@ enqueue: if (slot->qlen == 1) { /* The flow is new */ if (q->tail == NULL) { /* It is the first flow */ slot->next = x; - q->tail = slot; } else { slot->next = q->tail->next; q->tail->next = x; } + /* We put this flow at the end of our flow list. + * This might sound unfair for a new flow to wait after old ones, + * but we could endup servicing new flows only, and freeze old ones. + */ + q->tail = slot; /* We could use a bigger initial quantum for new flows */ slot->allot = q->scaled_quantum; } |