2 files changed, 5 insertions, 5 deletions

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 9b9c555c713f..4b52fa78935a 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1284,8 +1284,7 @@ static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl)
                                                   struct htb_class, sibling));
 
         /* note: this delete may happen twice (see htb_delete) */
-        if (!hlist_unhashed(&cl->hlist))
-                hlist_del(&cl->hlist);
+        hlist_del_init(&cl->hlist);
         list_del(&cl->sibling);
 
         if (cl->prio_activity)
@@ -1333,8 +1332,7 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg)
         sch_tree_lock(sch);
 
         /* delete from hash and active; remainder in destroy_class */
-        if (!hlist_unhashed(&cl->hlist))
-                hlist_del(&cl->hlist);
+        hlist_del_init(&cl->hlist);
 
         if (cl->prio_activity)
                 htb_deactivate(q, cl);
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 45939bafbdf8..0441876aa1e7 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -4,7 +4,7 @@
  *              This program is free software; you can redistribute it and/or
  *              modify it under the terms of the GNU General Public License
  *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
+ *              2 of the License.
  *
  *              Many of the algorithms and ideas for this came from
  *              NIST Net which is not copyrighted. 
@@ -170,6 +170,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                 return NET_XMIT_BYPASS;
         }
 
+        skb_orphan(skb);
+
         /*
          * If we need to duplicate packet, then re-insert at top of the
          * qdisc tree, since parent queuer expects that only one