sched: fix compile errors with CONFIG_NET_SCHED deactivated in the kernel config...
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 18 Jul 2009 20:31:21 +0000 (20:31 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 18 Jul 2009 20:31:21 +0000 (20:31 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16903 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic-2.6/patches-2.6.28/260-extend_pfifo_fast.patch
target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch

index a9bdb06..90773f7 100644 (file)
        .enqueue        =       pfifo_fast_enqueue,
        .dequeue        =       pfifo_fast_dequeue,
        .requeue        =       pfifo_fast_requeue,
        .enqueue        =       pfifo_fast_enqueue,
        .dequeue        =       pfifo_fast_dequeue,
        .requeue        =       pfifo_fast_requeue,
-@@ -739,3 +803,16 @@ void dev_shutdown(struct net_device *dev
+@@ -739,3 +803,18 @@ void dev_shutdown(struct net_device *dev
        shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);
        WARN_ON(timer_pending(&dev->watchdog_timer));
  }
 +
        shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);
        WARN_ON(timer_pending(&dev->watchdog_timer));
  }
 +
++#ifdef CONFIG_NET_SCHED
 +static int __init sch_generic_init(void)
 +{
 +      return register_qdisc(&pfifo_fast_ops);
 +static int __init sch_generic_init(void)
 +{
 +      return register_qdisc(&pfifo_fast_ops);
 +
 +module_init(sch_generic_init)
 +module_exit(sch_generic_exit)
 +
 +module_init(sch_generic_init)
 +module_exit(sch_generic_exit)
++#endif
index 70718e7..ad9e9ba 100644 (file)
        .enqueue        =       pfifo_fast_enqueue,
        .dequeue        =       pfifo_fast_dequeue,
        .peek           =       pfifo_fast_peek,
        .enqueue        =       pfifo_fast_enqueue,
        .dequeue        =       pfifo_fast_dequeue,
        .peek           =       pfifo_fast_peek,
-@@ -735,3 +799,16 @@ void dev_shutdown(struct net_device *dev
+@@ -735,3 +799,18 @@ void dev_shutdown(struct net_device *dev
        shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);
        WARN_ON(timer_pending(&dev->watchdog_timer));
  }
 +
        shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);
        WARN_ON(timer_pending(&dev->watchdog_timer));
  }
 +
++#ifdef CONFIG_NET_SCHED
 +static int __init sch_generic_init(void)
 +{
 +      return register_qdisc(&pfifo_fast_ops);
 +static int __init sch_generic_init(void)
 +{
 +      return register_qdisc(&pfifo_fast_ops);
 +
 +module_init(sch_generic_init)
 +module_exit(sch_generic_exit)
 +
 +module_init(sch_generic_init)
 +module_exit(sch_generic_exit)
++#endif
This page took 0.035177 seconds and 4 git commands to generate.