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, 17 insertions, 21 deletions

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index d5798e17a832..5b132c473264 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1621,29 +1621,25 @@ static int cbq_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
 {
         struct cbq_class *cl = (struct cbq_class*)arg;
 
-        if (cl) {
-                if (new == NULL) {
-                        new = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
-                                                &pfifo_qdisc_ops,
-                                                cl->common.classid);
-                        if (new == NULL)
-                                return -ENOBUFS;
-                } else {
+        if (new == NULL) {
+                new = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
+                                        &pfifo_qdisc_ops, cl->common.classid);
+                if (new == NULL)
+                        return -ENOBUFS;
+        } else {
 #ifdef CONFIG_NET_CLS_ACT
-                        if (cl->police == TC_POLICE_RECLASSIFY)
-                                new->reshape_fail = cbq_reshape_fail;
+                if (cl->police == TC_POLICE_RECLASSIFY)
+                        new->reshape_fail = cbq_reshape_fail;
 #endif
-                }
-                sch_tree_lock(sch);
-                *old = cl->q;
-                cl->q = new;
-                qdisc_tree_decrease_qlen(*old, (*old)->q.qlen);
-                qdisc_reset(*old);
-                sch_tree_unlock(sch);
-
-                return 0;
         }
-        return -ENOENT;
+        sch_tree_lock(sch);
+        *old = cl->q;
+        cl->q = new;
+        qdisc_tree_decrease_qlen(*old, (*old)->q.qlen);
+        qdisc_reset(*old);
+        sch_tree_unlock(sch);
+
+        return 0;
 }
 
 static struct Qdisc *
@@ -1651,7 +1647,7 @@ cbq_leaf(struct Qdisc *sch, unsigned long arg)
 {
         struct cbq_class *cl = (struct cbq_class*)arg;
 
-        return cl ? cl->q : NULL;
+        return cl->q;
 }
 
 static void cbq_qlen_notify(struct Qdisc *sch, unsigned long arg)