diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 20:56:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 20:56:42 -0400 |
commit | de326dbe0c8b61b81aab32970236ee9ee47d782a (patch) | |
tree | 948f696e0261fb536c140560d369cdc555fc442f | |
parent | 28defbea64622f69d65a6079bf800cedb9915a5f (diff) | |
parent | 53aadcc90931dfa150f76ce9a5f9e8f3e43d57df (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV6]: Set IF_READY if the device is up and has carrier
[NET_SCHED]: sch_htb/sch_hfsc: fix oops in qlen_notify
[NET]: Remove dead net/sched/Makefile entry for sch_hpfq.o.
-rw-r--r-- | net/ipv6/addrconf.c | 3 | ||||
-rw-r--r-- | net/sched/Makefile | 1 | ||||
-rw-r--r-- | net/sched/sch_hfsc.c | 4 | ||||
-rw-r--r-- | net/sched/sch_htb.c | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 1b616992d916..7552663aa125 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -342,6 +342,9 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev) | |||
342 | } | 342 | } |
343 | #endif | 343 | #endif |
344 | 344 | ||
345 | if (netif_running(dev) && netif_carrier_ok(dev)) | ||
346 | ndev->if_flags |= IF_READY; | ||
347 | |||
345 | ipv6_mc_init_dev(ndev); | 348 | ipv6_mc_init_dev(ndev); |
346 | ndev->tstamp = jiffies; | 349 | ndev->tstamp = jiffies; |
347 | #ifdef CONFIG_SYSCTL | 350 | #ifdef CONFIG_SYSCTL |
diff --git a/net/sched/Makefile b/net/sched/Makefile index ff2d6e5e282c..020767a204d4 100644 --- a/net/sched/Makefile +++ b/net/sched/Makefile | |||
@@ -17,7 +17,6 @@ obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o | |||
17 | obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o | 17 | obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o |
18 | obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o | 18 | obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o |
19 | obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o | 19 | obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o |
20 | obj-$(CONFIG_NET_SCH_HPFQ) += sch_hpfq.o | ||
21 | obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o | 20 | obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o |
22 | obj-$(CONFIG_NET_SCH_RED) += sch_red.o | 21 | obj-$(CONFIG_NET_SCH_RED) += sch_red.o |
23 | obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o | 22 | obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o |
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 396deb71480f..407c6fb1ba14 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
@@ -1184,10 +1184,12 @@ hfsc_delete_class(struct Qdisc *sch, unsigned long arg) | |||
1184 | 1184 | ||
1185 | sch_tree_lock(sch); | 1185 | sch_tree_lock(sch); |
1186 | 1186 | ||
1187 | list_del(&cl->hlist); | ||
1188 | list_del(&cl->siblings); | 1187 | list_del(&cl->siblings); |
1189 | hfsc_adjust_levels(cl->cl_parent); | 1188 | hfsc_adjust_levels(cl->cl_parent); |
1189 | |||
1190 | hfsc_purge_queue(sch, cl); | 1190 | hfsc_purge_queue(sch, cl); |
1191 | list_del(&cl->hlist); | ||
1192 | |||
1191 | if (--cl->refcnt == 0) | 1193 | if (--cl->refcnt == 0) |
1192 | hfsc_destroy_class(sch, cl); | 1194 | hfsc_destroy_class(sch, cl); |
1193 | 1195 | ||
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 97cbb9aec946..3c3294d01041 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
@@ -1380,15 +1380,15 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg) | |||
1380 | 1380 | ||
1381 | sch_tree_lock(sch); | 1381 | sch_tree_lock(sch); |
1382 | 1382 | ||
1383 | /* delete from hash and active; remainder in destroy_class */ | ||
1384 | hlist_del_init(&cl->hlist); | ||
1385 | |||
1386 | if (!cl->level) { | 1383 | if (!cl->level) { |
1387 | qlen = cl->un.leaf.q->q.qlen; | 1384 | qlen = cl->un.leaf.q->q.qlen; |
1388 | qdisc_reset(cl->un.leaf.q); | 1385 | qdisc_reset(cl->un.leaf.q); |
1389 | qdisc_tree_decrease_qlen(cl->un.leaf.q, qlen); | 1386 | qdisc_tree_decrease_qlen(cl->un.leaf.q, qlen); |
1390 | } | 1387 | } |
1391 | 1388 | ||
1389 | /* delete from hash and active; remainder in destroy_class */ | ||
1390 | hlist_del_init(&cl->hlist); | ||
1391 | |||
1392 | if (cl->prio_activity) | 1392 | if (cl->prio_activity) |
1393 | htb_deactivate(q, cl); | 1393 | htb_deactivate(q, cl); |
1394 | 1394 | ||