Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/sched/sch_hfsc.c
	net/sched/sch_htb.c
	net/sched/sch_tbf.c

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc include/net/sch_generic.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge

diff --cc net/sched/sch_cbq.c
index 25ed522,5f63ec5..24d94c0
--- 1/net/sched/sch_cbq.c
--- 2/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@@ -973,8 -969,9 +971,9 @@@ cbq_dequeue(struct Qdisc *sch
  
                skb = cbq_dequeue_1(sch);
                if (skb) {
+                       qdisc_bstats_update(sch, skb);
                        sch->q.qlen--;
 -                      sch->flags &= ~TCQ_F_THROTTLED;
 +                      qdisc_unthrottled(sch);
                        return skb;
                }
  

diff --cc net/sched/sch_dsmark.c
Simple merge

diff --cc net/sched/sch_fifo.c
index f7290d2,d468b47..be33f9d
--- 1/net/sched/sch_fifo.c
--- 2/net/sched/sch_fifo.c
+++ b/net/sched/sch_fifo.c
@@@ -43,9 -44,8 +43,8 @@@ static int pfifo_enqueue(struct sk_buf
        return qdisc_reshape_fail(skb, sch);
  }
  
 -static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc* sch)
 +static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch)
  {
-       struct sk_buff *skb_head;
        struct fifo_sched_data *q = qdisc_priv(sch);
  
        if (likely(skb_queue_len(&sch->q) < q->limit))

diff --cc net/sched/sch_hfsc.c
index b632d92,14a799d..6488e64
--- 1/net/sched/sch_hfsc.c
--- 2/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@@ -1664,7 -1664,8 +1663,8 @@@ hfsc_dequeue(struct Qdisc *sch
                set_passive(cl);
        }
  
 -      sch->flags &= ~TCQ_F_THROTTLED;
 +      qdisc_unthrottled(sch);
+       qdisc_bstats_update(sch, skb);
        sch->q.qlen--;
  
        return skb;

diff --cc net/sched/sch_htb.c
index 39db75c,fc12fe6..e1429a8
--- 1/net/sched/sch_htb.c
--- 2/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@@ -865,7 -850,9 +864,9 @@@ static struct sk_buff *htb_dequeue(stru
        /* try to dequeue direct packets as high prio (!) to minimize cpu work */
        skb = __skb_dequeue(&q->direct_queue);
        if (skb != NULL) {
 -              sch->flags &= ~TCQ_F_THROTTLED;
+ ok:
+               qdisc_bstats_update(sch, skb);
 +              qdisc_unthrottled(sch);
                sch->q.qlen--;
                return skb;
        }
@@@ -896,14 -883,10 +897,11 @@@
                m = ~q->row_mask[level];
                while (m != (int)(-1)) {
                        int prio = ffz(m);
 +
                        m |= 1 << prio;
                        skb = htb_dequeue_tree(q, prio, level);
-                       if (likely(skb != NULL)) {
-                               sch->q.qlen--;
-                               qdisc_unthrottled(sch);
-                               goto fin;
-                       }
+                       if (likely(skb != NULL))
+                               goto ok;
                }
        }
        sch->qstats.overlimits++;

diff --cc net/sched/sch_multiq.c
Simple merge

diff --cc net/sched/sch_netem.c
Simple merge

diff --cc net/sched/sch_prio.c
Simple merge

diff --cc net/sched/sch_red.c
Simple merge

diff --cc net/sched/sch_sfq.c
Simple merge

diff --cc net/sched/sch_tbf.c
index 86c0166,e931658..1dcfb52
--- 1/net/sched/sch_tbf.c
--- 2/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@@ -185,7 -185,8 +184,8 @@@ static struct sk_buff *tbf_dequeue(stru
                        q->tokens = toks;
                        q->ptokens = ptoks;
                        sch->q.qlen--;
 -                      sch->flags &= ~TCQ_F_THROTTLED;
 +                      qdisc_unthrottled(sch);
+                       qdisc_bstats_update(sch, skb);
                        return skb;
                }
  

diff --cc net/sched/sch_teql.c
Simple merge