Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits)
  netxen: update copyright
  netxen: fix tx timeout recovery
  netxen: fix file firmware leak
  netxen: improve pci memory access
  netxen: change firmware write size
  tg3: Fix return ring size breakage
  netxen: build fix for INET=n
  cdc-phonet: autoconfigure Phonet address
  Phonet: back-end for autoconfigured addresses
  Phonet: fix netlink address dump error handling
  ipv6: Add IFA_F_DADFAILED flag
  net: Add DEVTYPE support for Ethernet based devices
  mv643xx_eth.c: remove unused txq_set_wrr()
  ucc_geth: Fix hangs after switching from full to half duplex
  ucc_geth: Rearrange some code to avoid forward declarations
  phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
  drivers/net/phy: introduce missing kfree
  drivers/net/wan: introduce missing kfree
  net: force bridge module(s) to be GPL
  Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
  ...

Fixed up trivial conflicts:

 - arch/x86/include/asm/socket.h

   converted to <asm-generic/socket.h> in the x86 tree.  The generic
   header has the same new #define's, so that works out fine.

 - drivers/net/tun.c

   fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that
   switched over to using 'tun->socket.sk' instead of the redundantly
   available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
   to the TUN driver") which added a new 'tun->sk' use.

   Noted in 'next' by Stephen Rothwell.

1 files changed, 65 insertions, 74 deletions

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index fdb694e9f759..692d9a41cd23 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -207,7 +207,7 @@ static struct Qdisc *qdisc_match_from_root(struct Qdisc *root, u32 handle)
 static void qdisc_list_add(struct Qdisc *q)
 {
         if ((q->parent != TC_H_ROOT) && !(q->flags & TCQ_F_INGRESS))
-                list_add_tail(&q->list, &qdisc_root_sleeping(q)->list);
+                list_add_tail(&q->list, &qdisc_dev(q)->qdisc->list);
 }
 
 void qdisc_list_del(struct Qdisc *q)
@@ -219,17 +219,11 @@ EXPORT_SYMBOL(qdisc_list_del);
 
 struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle)
 {
-        unsigned int i;
         struct Qdisc *q;
 
-        for (i = 0; i < dev->num_tx_queues; i++) {
-                struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
-                struct Qdisc *txq_root = txq->qdisc_sleeping;
-
-                q = qdisc_match_from_root(txq_root, handle);
-                if (q)
-                        goto out;
-        }
+        q = qdisc_match_from_root(dev->qdisc, handle);
+        if (q)
+                goto out;
 
         q = qdisc_match_from_root(dev->rx_queue.qdisc_sleeping, handle);
 out:
@@ -616,32 +610,6 @@ static u32 qdisc_alloc_handle(struct net_device *dev)
         return i>0 ? autohandle : 0;
 }
 
-/* Attach toplevel qdisc to device queue. */
-
-static struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue,
-                                     struct Qdisc *qdisc)
-{
-        struct Qdisc *oqdisc = dev_queue->qdisc_sleeping;
-        spinlock_t *root_lock;
-
-        root_lock = qdisc_lock(oqdisc);
-        spin_lock_bh(root_lock);
-
-        /* Prune old scheduler */
-        if (oqdisc && atomic_read(&oqdisc->refcnt) <= 1)
-                qdisc_reset(oqdisc);
-
-        /* ... and graft new one */
-        if (qdisc == NULL)
-                qdisc = &noop_qdisc;
-        dev_queue->qdisc_sleeping = qdisc;
-        rcu_assign_pointer(dev_queue->qdisc, &noop_qdisc);
-
-        spin_unlock_bh(root_lock);
-
-        return oqdisc;
-}
-
 void qdisc_tree_decrease_qlen(struct Qdisc *sch, unsigned int n)
 {
         const struct Qdisc_class_ops *cops;
@@ -710,6 +678,11 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
                 if (dev->flags & IFF_UP)
                         dev_deactivate(dev);
 
+                if (new && new->ops->attach) {
+                        new->ops->attach(new);
+                        num_q = 0;
+                }
+
                 for (i = 0; i < num_q; i++) {
                         struct netdev_queue *dev_queue = &dev->rx_queue;
 
@@ -720,22 +693,27 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
                         if (new && i > 0)
                                 atomic_inc(&new->refcnt);
 
-                        notify_and_destroy(skb, n, classid, old, new);
+                        qdisc_destroy(old);
                 }
 
+                notify_and_destroy(skb, n, classid, dev->qdisc, new);
+                if (new && !new->ops->attach)
+                        atomic_inc(&new->refcnt);
+                dev->qdisc = new ? : &noop_qdisc;
+
                 if (dev->flags & IFF_UP)
                         dev_activate(dev);
         } else {
                 const struct Qdisc_class_ops *cops = parent->ops->cl_ops;
 
-                err = -EINVAL;
-
-                if (cops) {
+                err = -EOPNOTSUPP;
+                if (cops && cops->graft) {
                         unsigned long cl = cops->get(parent, classid);
                         if (cl) {
                                 err = cops->graft(parent, cl, new, &old);
                                 cops->put(parent, cl);
-                        }
+                        } else
+                                err = -ENOENT;
                 }
                 if (!err)
                         notify_and_destroy(skb, n, classid, old, new);
@@ -755,7 +733,8 @@ static struct lock_class_key qdisc_rx_lock;
 
 static struct Qdisc *
 qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue,
-             u32 parent, u32 handle, struct nlattr **tca, int *errp)
+             struct Qdisc *p, u32 parent, u32 handle,
+             struct nlattr **tca, int *errp)
 {
         int err;
         struct nlattr *kind = tca[TCA_KIND];
@@ -832,24 +811,21 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue,
                 if (tca[TCA_RATE]) {
                         spinlock_t *root_lock;
 
+                        err = -EOPNOTSUPP;
+                        if (sch->flags & TCQ_F_MQROOT)
+                                goto err_out4;
+
                         if ((sch->parent != TC_H_ROOT) &&
-                            !(sch->flags & TCQ_F_INGRESS))
+                            !(sch->flags & TCQ_F_INGRESS) &&
+                            (!p || !(p->flags & TCQ_F_MQROOT)))
                                 root_lock = qdisc_root_sleeping_lock(sch);
                         else
                                 root_lock = qdisc_lock(sch);
 
                         err = gen_new_estimator(&sch->bstats, &sch->rate_est,
                                                 root_lock, tca[TCA_RATE]);
-                        if (err) {
-                                /*
-                                 * Any broken qdiscs that would require
-                                 * a ops->reset() here? The qdisc was never
-                                 * in action so it shouldn't be necessary.
-                                 */
-                                if (ops->destroy)
-                                        ops->destroy(sch);
-                                goto err_out3;
-                        }
+                        if (err)
+                                goto err_out4;
                 }
 
                 qdisc_list_add(sch);
@@ -865,6 +841,15 @@ err_out2:
 err_out:
         *errp = err;
         return NULL;
+
+err_out4:
+        /*
+         * Any broken qdiscs that would require a ops->reset() here?
+         * The qdisc was never in action so it shouldn't be necessary.
+         */
+        if (ops->destroy)
+                ops->destroy(sch);
+        goto err_out3;
 }
 
 static int qdisc_change(struct Qdisc *sch, struct nlattr **tca)
@@ -889,13 +874,16 @@ static int qdisc_change(struct Qdisc *sch, struct nlattr **tca)
         qdisc_put_stab(sch->stab);
         sch->stab = stab;
 
-        if (tca[TCA_RATE])
+        if (tca[TCA_RATE]) {
                 /* NB: ignores errors from replace_estimator
                    because change can't be undone. */
+                if (sch->flags & TCQ_F_MQROOT)
+                        goto out;
                 gen_replace_estimator(&sch->bstats, &sch->rate_est,
                                             qdisc_root_sleeping_lock(sch),
                                             tca[TCA_RATE]);
-
+        }
+out:
         return 0;
 }
 
@@ -974,9 +962,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
                                 q = dev->rx_queue.qdisc_sleeping;
                         }
                 } else {
-                        struct netdev_queue *dev_queue;
-                        dev_queue = netdev_get_tx_queue(dev, 0);
-                        q = dev_queue->qdisc_sleeping;
+                        q = dev->qdisc;
                 }
                 if (!q)
                         return -ENOENT;
@@ -1044,9 +1030,7 @@ replay:
                                 q = dev->rx_queue.qdisc_sleeping;
                         }
                 } else {
-                        struct netdev_queue *dev_queue;
-                        dev_queue = netdev_get_tx_queue(dev, 0);
-                        q = dev_queue->qdisc_sleeping;
+                        q = dev->qdisc;
                 }
 
                 /* It may be default qdisc, ignore it */
@@ -1123,13 +1107,19 @@ create_n_graft:
         if (!(n->nlmsg_flags&NLM_F_CREATE))
                 return -ENOENT;
         if (clid == TC_H_INGRESS)
-                q = qdisc_create(dev, &dev->rx_queue,
+                q = qdisc_create(dev, &dev->rx_queue, p,
                                  tcm->tcm_parent, tcm->tcm_parent,
                                  tca, &err);
-        else
-                q = qdisc_create(dev, netdev_get_tx_queue(dev, 0),
+        else {
+                unsigned int ntx = 0;
+
+                if (p && p->ops->cl_ops && p->ops->cl_ops->select_queue)
+                        ntx = p->ops->cl_ops->select_queue(p, tcm);
+
+                q = qdisc_create(dev, netdev_get_tx_queue(dev, ntx), p,
                                  tcm->tcm_parent, tcm->tcm_handle,
                                  tca, &err);
+        }
         if (q == NULL) {
                 if (err == -EAGAIN)
                         goto replay;
@@ -1291,8 +1281,7 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
                         s_q_idx = 0;
                 q_idx = 0;
 
-                dev_queue = netdev_get_tx_queue(dev, 0);
-                if (tc_dump_qdisc_root(dev_queue->qdisc_sleeping, skb, cb, &q_idx, s_q_idx) < 0)
+                if (tc_dump_qdisc_root(dev->qdisc, skb, cb, &q_idx, s_q_idx) < 0)
                         goto done;
 
                 dev_queue = &dev->rx_queue;
@@ -1323,7 +1312,6 @@ done:
 static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 {
         struct net *net = sock_net(skb->sk);
-        struct netdev_queue *dev_queue;
         struct tcmsg *tcm = NLMSG_DATA(n);
         struct nlattr *tca[TCA_MAX + 1];
         struct net_device *dev;
@@ -1361,7 +1349,6 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 
         /* Step 1. Determine qdisc handle X:0 */
 
-        dev_queue = netdev_get_tx_queue(dev, 0);
         if (pid != TC_H_ROOT) {
                 u32 qid1 = TC_H_MAJ(pid);
 
@@ -1372,7 +1359,7 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
                 } else if (qid1) {
                         qid = qid1;
                 } else if (qid == 0)
-                        qid = dev_queue->qdisc_sleeping->handle;
+                        qid = dev->qdisc->handle;
 
                 /* Now qid is genuine qdisc handle consistent
                    both with parent and child.
@@ -1383,7 +1370,7 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
                         pid = TC_H_MAKE(qid, pid);
         } else {
                 if (qid == 0)
-                        qid = dev_queue->qdisc_sleeping->handle;
+                        qid = dev->qdisc->handle;
         }
 
         /* OK. Locate qdisc */
@@ -1417,7 +1404,9 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
                                 goto out;
                         break;
                 case RTM_DELTCLASS:
-                        err = cops->delete(q, cl);
+                        err = -EOPNOTSUPP;
+                        if (cops->delete)
+                                err = cops->delete(q, cl);
                         if (err == 0)
                                 tclass_notify(skb, n, q, cl, RTM_DELTCLASS);
                         goto out;
@@ -1431,7 +1420,9 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
         }
 
         new_cl = cl;
-        err = cops->change(q, clid, pid, tca, &new_cl);
+        err = -EOPNOTSUPP;
+        if (cops->change)
+                err = cops->change(q, clid, pid, tca, &new_cl);
         if (err == 0)
                 tclass_notify(skb, n, q, new_cl, RTM_NEWTCLASS);
 
@@ -1586,8 +1577,7 @@ static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb)
         s_t = cb->args[0];
         t = 0;
 
-        dev_queue = netdev_get_tx_queue(dev, 0);
-        if (tc_dump_tclass_root(dev_queue->qdisc_sleeping, skb, tcm, cb, &t, s_t) < 0)
+        if (tc_dump_tclass_root(dev->qdisc, skb, tcm, cb, &t, s_t) < 0)
                 goto done;
 
         dev_queue = &dev->rx_queue;
@@ -1707,6 +1697,7 @@ static int __init pktsched_init(void)
 {
         register_qdisc(&pfifo_qdisc_ops);
         register_qdisc(&bfifo_qdisc_ops);
+        register_qdisc(&mq_qdisc_ops);
         proc_net_fops_create(&init_net, "psched", 0, &psched_fops);
 
         rtnl_register(PF_UNSPEC, RTM_NEWQDISC, tc_modify_qdisc, NULL);