diff --git a/[refs] b/[refs] index af7750620aac..f7fecc4c8175 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc0fe83525d734bdd9c883b45eca6bb22f286daa +refs/heads/master: 90d841fd0a5e02affd4e2bbdde4f710c61599281 diff --git a/trunk/include/net/sch_generic.h b/trunk/include/net/sch_generic.h index 3fe49d808957..f81f7c4d76fa 100644 --- a/trunk/include/net/sch_generic.h +++ b/trunk/include/net/sch_generic.h @@ -111,6 +111,7 @@ struct Qdisc_ops int (*enqueue)(struct sk_buff *, struct Qdisc *); struct sk_buff * (*dequeue)(struct Qdisc *); + struct sk_buff * (*peek)(struct Qdisc *); int (*requeue)(struct sk_buff *, struct Qdisc *); unsigned int (*drop)(struct Qdisc *);