net_sched: move dev_graft_qdisc() to sch_generic.c

It will be used in a following patch by the multiqueue qdisc.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index a48a4cc7258b4c3911c98cec46f5192baeb0f9fa..a92dc6208eff9a4663eb7f2b8f8eaf7489cdfb0a 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -302,6 +302,8 @@ extern void dev_init_scheduler(struct net_device *dev);
 extern void dev_shutdown(struct net_device *dev);
 extern void dev_activate(struct net_device *dev);
 extern void dev_deactivate(struct net_device *dev);
+extern struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue,
+                                    struct Qdisc *qdisc);
 extern void qdisc_reset(struct Qdisc *qdisc);
 extern void qdisc_destroy(struct Qdisc *qdisc);
 extern void qdisc_tree_decrease_qlen(struct Qdisc *qdisc, unsigned int n);

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 8aa9a0c5a9eb6f5d26920dfe8c5e9d645498a463..d71f12be6e293342e77d08b8950efc9f22486859 100644 (file)
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -610,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;

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index a91f079fb47a4077d6cb4dcf624c5b8ea67df5f7..e7c47ceb009817f4f8347291104bd26cfa6f7566 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -623,6 +623,31 @@ void qdisc_destroy(struct Qdisc *qdisc)
 }
 EXPORT_SYMBOL(qdisc_destroy);
 
+/* Attach toplevel qdisc to device queue. */
+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;
+}
+
 static void attach_one_default_qdisc(struct net_device *dev,
                                     struct netdev_queue *dev_queue,
                                     void *_unused)