diff --git a/[refs] b/[refs] index 184506688f37..07416ba8d6db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 207024b9477e253859abfc30f1ff314cd6008b24 +refs/heads/master: b60b6592baa69c43a5a0f55d6300a7feaab15338 diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c index 9839b26674f4..fe35c1f338c2 100644 --- a/trunk/net/sched/sch_api.c +++ b/trunk/net/sched/sch_api.c @@ -1637,9 +1637,12 @@ int tc_classify(struct sk_buff *skb, struct tcf_proto *tp, tp = otp; if (verd++ >= MAX_REC_LOOP) { - printk("rule prio %u protocol %02x reclassify loop, " - "packet dropped\n", - tp->prio&0xffff, ntohs(tp->protocol)); + if (net_ratelimit()) + printk(KERN_NOTICE + "%s: packet reclassify loop" + " rule prio %u protocol %02x\n", + tp->q->ops->id, + tp->prio & 0xffff, ntohs(tp->protocol)); return TC_ACT_SHOT; } skb->tc_verd = SET_TC_VERD(skb->tc_verd, verd);