patch-2.4.0-test4 linux/net/sched/sch_cbq.c

Next file: linux/net/socket.c
Previous file: linux/net/netlink/netlink_dev.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test3/linux/net/sched/sch_cbq.c linux/net/sched/sch_cbq.c
@@ -1751,11 +1751,12 @@
 
 static void cbq_put(struct Qdisc *sch, unsigned long arg)
 {
-	struct cbq_sched_data *q = (struct cbq_sched_data *)sch->data;
 	struct cbq_class *cl = (struct cbq_class*)arg;
 
 	if (--cl->refcnt == 0) {
 #ifdef CONFIG_NET_CLS_POLICE
+		struct cbq_sched_data *q = (struct cbq_sched_data *)sch->data;
+
 		spin_lock_bh(&sch->dev->queue_lock);
 		if (q->rx_class == cl)
 			q->rx_class = NULL;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)