diff --git a/[refs] b/[refs] index 8153067d26b0..d03f08530c43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43dff98b022ded593e73c3784bac03bc9fc7ec55 +refs/heads/master: 89bbb0a361cdae50eec863f10a876b58abf7d312 diff --git a/trunk/net/sched/sch_netem.c b/trunk/net/sched/sch_netem.c index 7228d30512c7..5a4a4d0ae502 100644 --- a/trunk/net/sched/sch_netem.c +++ b/trunk/net/sched/sch_netem.c @@ -167,7 +167,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) if (count == 0) { sch->qstats.drops++; kfree_skb(skb); - return NET_XMIT_DROP; + return NET_XMIT_BYPASS; } /*