Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6

2 files changed, 9 insertions, 8 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index a4132766d363..4580460ebecd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1648,7 +1648,8 @@ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)
         if (txq < 1 || txq > dev->num_tx_queues)
                 return -EINVAL;
 
-        if (dev->reg_state == NETREG_REGISTERED) {
+        if (dev->reg_state == NETREG_REGISTERED ||
+            dev->reg_state == NETREG_UNREGISTERING) {
                 ASSERT_RTNL();
 
                 rc = netdev_queue_update_kobjects(dev, dev->real_num_tx_queues,
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index effd4ee0e880..ace37f9f1cd0 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -29,18 +29,18 @@ static void mqprio_destroy(struct Qdisc *sch)
         struct mqprio_sched *priv = qdisc_priv(sch);
         unsigned int ntx;
 
-        if (!priv->qdiscs)
-                return;
-
-        for (ntx = 0; ntx < dev->num_tx_queues && priv->qdiscs[ntx]; ntx++)
-                qdisc_destroy(priv->qdiscs[ntx]);
+        if (priv->qdiscs) {
+                for (ntx = 0;
+                     ntx < dev->num_tx_queues && priv->qdiscs[ntx];
+                     ntx++)
+                        qdisc_destroy(priv->qdiscs[ntx]);
+                kfree(priv->qdiscs);
+        }
 
         if (priv->hw_owned && dev->netdev_ops->ndo_setup_tc)
                 dev->netdev_ops->ndo_setup_tc(dev, 0);
         else
                 netdev_set_num_tc(dev, 0);
-
-        kfree(priv->qdiscs);
 }
 
 static int mqprio_parse_opt(struct net_device *dev, struct tc_mqprio_qopt *qopt)