3 files changed, 37 insertions, 27 deletions

diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index cc29b44b1500..0f815cc6a3db 100644
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -62,13 +62,7 @@ static u64 read_classid(struct cgroup *cgrp, struct cftype *cft)
 
 static int write_classid(struct cgroup *cgrp, struct cftype *cft, u64 value)
 {
-        if (!cgroup_lock_live_group(cgrp))
-                return -ENODEV;
-
         cgrp_cls_state(cgrp)->classid = (u32) value;
-
-        cgroup_unlock();
-
         return 0;
 }
 
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 5f5efe4e6072..27d03816ec3e 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -196,6 +196,21 @@ void __qdisc_run(struct Qdisc *q)
         clear_bit(__QDISC_STATE_RUNNING, &q->state);
 }
 
+unsigned long dev_trans_start(struct net_device *dev)
+{
+        unsigned long val, res = dev->trans_start;
+        unsigned int i;
+
+        for (i = 0; i < dev->num_tx_queues; i++) {
+                val = netdev_get_tx_queue(dev, i)->trans_start;
+                if (val && time_after(val, res))
+                        res = val;
+        }
+        dev->trans_start = res;
+        return res;
+}
+EXPORT_SYMBOL(dev_trans_start);
+
 static void dev_watchdog(unsigned long arg)
 {
         struct net_device *dev = (struct net_device *)arg;
@@ -205,25 +220,30 @@ static void dev_watchdog(unsigned long arg)
                 if (netif_device_present(dev) &&
                     netif_running(dev) &&
                     netif_carrier_ok(dev)) {
-                        int some_queue_stopped = 0;
+                        int some_queue_timedout = 0;
                         unsigned int i;
+                        unsigned long trans_start;
 
                         for (i = 0; i < dev->num_tx_queues; i++) {
                                 struct netdev_queue *txq;
 
                                 txq = netdev_get_tx_queue(dev, i);
-                                if (netif_tx_queue_stopped(txq)) {
-                                        some_queue_stopped = 1;
+                                /*
+                                 * old device drivers set dev->trans_start
+                                 */
+                                trans_start = txq->trans_start ? : dev->trans_start;
+                                if (netif_tx_queue_stopped(txq) &&
+                                    time_after(jiffies, (trans_start +
+                                                         dev->watchdog_timeo))) {
+                                        some_queue_timedout = 1;
                                         break;
                                 }
                         }
 
-                        if (some_queue_stopped &&
-                            time_after(jiffies, (dev->trans_start +
-                                                 dev->watchdog_timeo))) {
+                        if (some_queue_timedout) {
                                 char drivername[64];
-                                WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit timed out\n",
-                                       dev->name, netdev_drivername(dev, drivername, 64));
+                                WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n",
+                                       dev->name, netdev_drivername(dev, drivername, 64), i);
                                 dev->netdev_ops->ndo_tx_timeout(dev);
                         }
                         if (!mod_timer(&dev->watchdog_timer,
@@ -602,8 +622,10 @@ static void transition_one_qdisc(struct net_device *dev,
                 clear_bit(__QDISC_STATE_DEACTIVATED, &new_qdisc->state);
 
         rcu_assign_pointer(dev_queue->qdisc, new_qdisc);
-        if (need_watchdog_p && new_qdisc != &noqueue_qdisc)
+        if (need_watchdog_p && new_qdisc != &noqueue_qdisc) {
+                dev_queue->trans_start = 0;
                 *need_watchdog_p = 1;
+        }
 }
 
 void dev_activate(struct net_device *dev)
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 3b6418297231..a886496bdc3a 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -58,7 +58,6 @@ struct teql_master
         struct net_device *dev;
         struct Qdisc *slaves;
         struct list_head master_list;
-        struct net_device_stats stats;
 };
 
 struct teql_sched_data
@@ -272,6 +271,7 @@ static inline int teql_resolve(struct sk_buff *skb,
 static int teql_master_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct teql_master *master = netdev_priv(dev);
+        struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
         struct Qdisc *start, *q;
         int busy;
         int nores;
@@ -308,11 +308,12 @@ restart:
                                 if (!netif_tx_queue_stopped(slave_txq) &&
                                     !netif_tx_queue_frozen(slave_txq) &&
                                     slave_ops->ndo_start_xmit(skb, slave) == 0) {
+                                        txq_trans_update(slave_txq);
                                         __netif_tx_unlock(slave_txq);
                                         master->slaves = NEXT_SLAVE(q);
                                         netif_wake_queue(dev);
-                                        master->stats.tx_packets++;
-                                        master->stats.tx_bytes += length;
+                                        txq->tx_packets++;
+                                        txq->tx_bytes += length;
                                         return 0;
                                 }
                                 __netif_tx_unlock(slave_txq);
@@ -339,10 +340,10 @@ restart:
                 netif_stop_queue(dev);
                 return 1;
         }
-        master->stats.tx_errors++;
+        dev->stats.tx_errors++;
 
 drop:
-        master->stats.tx_dropped++;
+        txq->tx_dropped++;
         dev_kfree_skb(skb);
         return 0;
 }
@@ -395,12 +396,6 @@ static int teql_master_close(struct net_device *dev)
         return 0;
 }
 
-static struct net_device_stats *teql_master_stats(struct net_device *dev)
-{
-        struct teql_master *m = netdev_priv(dev);
-        return &m->stats;
-}
-
 static int teql_master_mtu(struct net_device *dev, int new_mtu)
 {
         struct teql_master *m = netdev_priv(dev);
@@ -425,7 +420,6 @@ static const struct net_device_ops teql_netdev_ops = {
         .ndo_open       = teql_master_open,
         .ndo_stop       = teql_master_close,
         .ndo_start_xmit = teql_master_xmit,
-        .ndo_get_stats  = teql_master_stats,
         .ndo_change_mtu = teql_master_mtu,
 };