X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=net%2Fsched%2Fsch_atm.c;h=6318e1136b83de86f1b73150a0a5199522293f4f;hb=a505b3b30fc69904f858822a2aa95990a4bf7958;hp=e114f23d5eaeb189428fbf4d307669da80e4f255;hpb=3cf8ad3394b8675e92a35c438f22341197535531;p=net-next-2.6.git

diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index e114f23d5ea..6318e1136b8 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -255,10 +255,6 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent,
 			error = -EINVAL;
 			goto err_out;
 		}
-		if (!list_empty(&flow->list)) {
-			error = -EEXIST;
-			goto err_out;
-		}
 	} else {
 		int i;
 		unsigned long cl;
@@ -418,7 +414,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 	}
 
 	ret = qdisc_enqueue(skb, flow->q);
-	if (ret != 0) {
+	if (ret != NET_XMIT_SUCCESS) {
 drop: __maybe_unused
 		if (net_xmit_drop_count(ret)) {
 			sch->qstats.drops++;
@@ -442,7 +438,7 @@ drop: __maybe_unused
 	 */
 	if (flow == &p->link) {
 		sch->q.qlen++;
-		return 0;
+		return NET_XMIT_SUCCESS;
 	}
 	tasklet_schedule(&p->task);
 	return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;