[MAC80211]: rework hardware crypto flags

[linux-2.6] / net / sched / sch_generic.c

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 983c32caf713c1bf21688f38567e1296bc620f1b..e970e8e757203f79a2278e5f499a4d5ad88ce6c9 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -11,27 +11,19 @@
  *              - Ingress support
  */
 
-#include <asm/uaccess.h>
-#include <asm/system.h>
 #include <linux/bitops.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/socket.h>
-#include <linux/sockios.h>
-#include <linux/in.h>
 #include <linux/errno.h>
-#include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
 #include <linux/init.h>
 #include <linux/rcupdate.h>
 #include <linux/list.h>
-#include <net/sock.h>
 #include <net/pkt_sched.h>
 
 /* Main transmission queue. */
@@ -61,7 +53,6 @@ void qdisc_unlock_tree(struct net_device *dev)
 
 static inline int qdisc_qlen(struct Qdisc *q)
 {
-       BUG_ON((int) q->q.qlen < 0);
        return q->q.qlen;
 }
 
@@ -167,9 +158,7 @@ static inline int qdisc_restart(struct net_device *dev)
        /* And release queue */
        spin_unlock(&dev->queue_lock);
 
-       ret = NETDEV_TX_BUSY;
-       if (!netif_queue_stopped(dev))
-               ret = dev_hard_start_xmit(skb, dev);
+       ret = dev_hard_start_xmit(skb, dev);
 
        if (!lockless)
                netif_tx_unlock(dev);
@@ -267,6 +256,12 @@ static void dev_watchdog_down(struct net_device *dev)
        netif_tx_unlock_bh(dev);
 }
 
+/**
+ *     netif_carrier_on - set carrier
+ *     @dev: network device
+ *
+ * Device has detected that carrier.
+ */
 void netif_carrier_on(struct net_device *dev)
 {
        if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state))
@@ -275,6 +270,12 @@ void netif_carrier_on(struct net_device *dev)
                __netdev_watchdog_up(dev);
 }
 
+/**
+ *     netif_carrier_off - clear carrier
+ *     @dev: network device
+ *
+ * Device has detected loss of carrier.
+ */
 void netif_carrier_off(struct net_device *dev)
 {
        if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state))
@@ -517,9 +518,7 @@ void qdisc_destroy(struct Qdisc *qdisc)
                return;
 
        list_del(&qdisc->list);
-#ifdef CONFIG_NET_ESTIMATOR
        gen_kill_estimator(&qdisc->bstats, &qdisc->rate_est);
-#endif
        if (ops->reset)
                ops->reset(qdisc);
        if (ops->destroy)