projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://oss.sgi.com:8090/xfs/xfs-2.6
[linux-drm-fsl-dcu.git]
/
net
/
sched
/
sch_teql.c
diff --git
a/net/sched/sch_teql.c
b/net/sched/sch_teql.c
index 4c16ad57a3e49141335a2812b4c7bc3e976e9b46..6a66037abac9e80cb08e7bcc7c02b69681fc12b1 100644
(file)
--- a/
net/sched/sch_teql.c
+++ b/
net/sched/sch_teql.c
@@
-178,7
+178,7
@@
teql_destroy(struct Qdisc* sch)
teql_neigh_release(xchg(&dat->ncache, NULL));
break;
}
teql_neigh_release(xchg(&dat->ncache, NULL));
break;
}
-
+
} while ((prev = q) != master->slaves);
}
}
} while ((prev = q) != master->slaves);
}
}
@@
-292,7
+292,7
@@
restart:
do {
struct net_device *slave = q->dev;
do {
struct net_device *slave = q->dev;
-
+
if (slave->qdisc_sleeping != q)
continue;
if (netif_queue_stopped(slave) || ! netif_running(slave)) {
if (slave->qdisc_sleeping != q)
continue;
if (netif_queue_stopped(slave) || ! netif_running(slave)) {
@@
-425,7
+425,7
@@
static __init void teql_master_setup(struct net_device *dev)
master->dev = dev;
ops->priv_size = sizeof(struct teql_sched_data);
master->dev = dev;
ops->priv_size = sizeof(struct teql_sched_data);
-
+
ops->enqueue = teql_enqueue;
ops->dequeue = teql_dequeue;
ops->requeue = teql_requeue;
ops->enqueue = teql_enqueue;
ops->dequeue = teql_dequeue;
ops->requeue = teql_requeue;
@@
-489,7
+489,7
@@
static int __init teql_init(void)
return i ? 0 : err;
}
return i ? 0 : err;
}
-static void __exit teql_exit(void)
+static void __exit teql_exit(void)
{
struct teql_master *master, *nxt;
{
struct teql_master *master, *nxt;