Control groups: Replace "cont" with "cgrp" and other misc renaming

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

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index e525fd723c128abb9950a8d4a5e6a659fdac988e..e01d57692c9a76f530b89cbc0b9e9443ae3c8ced 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. */
@@ -142,34 +134,19 @@ static inline int qdisc_restart(struct net_device *dev)
 {
        struct Qdisc *q = dev->qdisc;
        struct sk_buff *skb;
-       unsigned lockless;
        int ret;
 
        /* Dequeue packet */
        if (unlikely((skb = dev_dequeue_skb(dev, q)) == NULL))
                return 0;
 
-       /*
-        * When the driver has LLTX set, it does its own locking in
-        * start_xmit. These checks are worth it because even uncongested
-        * locks can be quite expensive. The driver can do a trylock, as
-        * is being done here; in case of lock contention it should return
-        * NETDEV_TX_LOCKED and the packet will be requeued.
-        */
-       lockless = (dev->features & NETIF_F_LLTX);
-
-       if (!lockless && !netif_tx_trylock(dev)) {
-               /* Another CPU grabbed the driver tx lock */
-               return handle_dev_cpu_collision(skb, dev, q);
-       }
 
        /* And release queue */
        spin_unlock(&dev->queue_lock);
 
+       HARD_TX_LOCK(dev, smp_processor_id());
        ret = dev_hard_start_xmit(skb, dev);
-
-       if (!lockless)
-               netif_tx_unlock(dev);
+       HARD_TX_UNLOCK(dev);
 
        spin_lock(&dev->queue_lock);
        q = dev->qdisc;
@@ -264,14 +241,27 @@ 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))
+       if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
                linkwatch_fire_event(dev);
-       if (netif_running(dev))
-               __netdev_watchdog_up(dev);
+               if (netif_running(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))