---

yaml --- r: 251657 b: refs/heads/master c: 07bd8df h: refs/heads/master i: 251655: 16b8c0b v: v3
git-mirror · May 25, 2011 · 90afde9 · 90afde9
1 parent 066b20a
commit 90afde9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 367bbf2aa1654c12ab5d6dbf4428b043b425be29
+refs/heads/master: 07bd8df5df4369487812bf85a237322ff3569b77
diff --git a/trunk/net/sched/sch_sfq.c b/trunk/net/sched/sch_sfq.c
@@ -413,18 +413,6 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 	return (qlen != slot->qlen) ? NET_XMIT_CN : NET_XMIT_SUCCESS;
 }
 
-static struct sk_buff *
-sfq_peek(struct Qdisc *sch)
-{
-	struct sfq_sched_data *q = qdisc_priv(sch);
-
-	/* No active slots */
-	if (q->tail == NULL)
-		return NULL;
-
-	return q->slots[q->tail->next].skblist_next;
-}
-
 static struct sk_buff *
 sfq_dequeue(struct Qdisc *sch)
 {
@@ -706,7 +694,7 @@ static struct Qdisc_ops sfq_qdisc_ops __read_mostly = {
 	.priv_size	=	sizeof(struct sfq_sched_data),
 	.enqueue	=	sfq_enqueue,
 	.dequeue	=	sfq_dequeue,
-	.peek		=	sfq_peek,
+	.peek		=	qdisc_peek_dequeued,
 	.drop		=	sfq_drop,
 	.init		=	sfq_init,
 	.reset		=	sfq_reset,