10 files changed, 60 insertions, 48 deletions

diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index e5becb92b3e7..e4877ca6727c 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/cls_flow.c b/net/sched/cls_flow.c
index 0ef4e3065bcd..9402a7fd3785 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -84,7 +84,7 @@ static u32 flow_get_dst(const struct sk_buff *skb)
         case htons(ETH_P_IPV6):
                 return ntohl(ipv6_hdr(skb)->daddr.s6_addr32[3]);
         default:
-                return addr_fold(skb->dst) ^ (__force u16)skb->protocol;
+                return addr_fold(skb_dst(skb)) ^ (__force u16)skb->protocol;
         }
 }
 
@@ -163,7 +163,7 @@ static u32 flow_get_proto_dst(const struct sk_buff *skb)
                 break;
         }
         default:
-                res = addr_fold(skb->dst) ^ (__force u16)skb->protocol;
+                res = addr_fold(skb_dst(skb)) ^ (__force u16)skb->protocol;
         }
 
         return res;
@@ -251,8 +251,8 @@ fallback:
 static u32 flow_get_rtclassid(const struct sk_buff *skb)
 {
 #ifdef CONFIG_NET_CLS_ROUTE
-        if (skb->dst)
-                return skb->dst->tclassid;
+        if (skb_dst(skb))
+                return skb_dst(skb)->tclassid;
 #endif
         return 0;
 }
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index bdf1f4172eef..dd872d5383ef 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -137,7 +137,7 @@ static int route4_classify(struct sk_buff *skb, struct tcf_proto *tp,
         u32 id, h;
         int iif, dont_cache = 0;
 
-        if ((dst = skb->dst) == NULL)
+        if ((dst = skb_dst(skb)) == NULL)
                 goto failure;
 
         id = dst->tclassid;
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index fad596bf32d7..266151ae85a3 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -246,11 +246,11 @@ META_COLLECTOR(int_tcindex)
 
 META_COLLECTOR(int_rtclassid)
 {
-        if (unlikely(skb->dst == NULL))
+        if (unlikely(skb_dst(skb) == NULL))
                 *err = -1;
         else
 #ifdef CONFIG_NET_CLS_ROUTE
-                dst->value = skb->dst->tclassid;
+                dst->value = skb_dst(skb)->tclassid;
 #else
                 dst->value = 0;
 #endif
@@ -258,10 +258,10 @@ META_COLLECTOR(int_rtclassid)
 
 META_COLLECTOR(int_rtiif)
 {
-        if (unlikely(skb->rtable == NULL))
+        if (unlikely(skb_rtable(skb) == NULL))
                 *err = -1;
         else
-                dst->value = skb->rtable->fl.iif;
+                dst->value = skb_rtable(skb)->fl.iif;
 }
 
 /**************************************************************************
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 32009793307b..24d17ce9c294 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -484,7 +484,7 @@ void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires)
 
         wd->qdisc->flags |= TCQ_F_THROTTLED;
         time = ktime_set(0, 0);
-        time = ktime_add_ns(time, PSCHED_US2NS(expires));
+        time = ktime_add_ns(time, PSCHED_TICKS2NS(expires));
         hrtimer_start(&wd->timer, time, HRTIMER_MODE_ABS);
 }
 EXPORT_SYMBOL(qdisc_watchdog_schedule);
@@ -1680,7 +1680,7 @@ static int psched_show(struct seq_file *seq, void *v)
 
         hrtimer_get_res(CLOCK_MONOTONIC, &ts);
         seq_printf(seq, "%08x %08x %08x %08x\n",
-                   (u32)NSEC_PER_USEC, (u32)PSCHED_US2NS(1),
+                   (u32)NSEC_PER_USEC, (u32)PSCHED_TICKS2NS(1),
                    1000000,
                    (u32)NSEC_PER_SEC/(u32)ktime_to_ns(timespec_to_ktime(ts)));
 
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index d728d8111732..23a167670fd5 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -509,7 +509,7 @@ static void cbq_ovl_delay(struct cbq_class *cl)
                         q->pmask |= (1<<TC_CBQ_MAXPRIO);
 
                         expires = ktime_set(0, 0);
-                        expires = ktime_add_ns(expires, PSCHED_US2NS(sched));
+                        expires = ktime_add_ns(expires, PSCHED_TICKS2NS(sched));
                         if (hrtimer_try_to_cancel(&q->delay_timer) &&
                             ktime_to_ns(ktime_sub(
                                         hrtimer_get_expires(&q->delay_timer),
@@ -620,7 +620,7 @@ static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)
                 ktime_t time;
 
                 time = ktime_set(0, 0);
-                time = ktime_add_ns(time, PSCHED_US2NS(now + delay));
+                time = ktime_add_ns(time, PSCHED_TICKS2NS(now + delay));
                 hrtimer_start(&q->delay_timer, time, HRTIMER_MODE_ABS);
         }
 
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_hfsc.c b/net/sched/sch_hfsc.c
index 5022f9c1f34b..362c2811b2df 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -372,7 +372,7 @@ cftree_update(struct hfsc_class *cl)
  *      ism: (psched_us/byte) << ISM_SHIFT
  *      dx: psched_us
  *
- * The clock source resolution with ktime is 1.024us.
+ * The clock source resolution with ktime and PSCHED_SHIFT 10 is 1.024us.
  *
  * sm and ism are scaled in order to keep effective digits.
  * SM_SHIFT and ISM_SHIFT are selected to keep at least 4 effective
@@ -383,9 +383,11 @@ cftree_update(struct hfsc_class *cl)
  *  bytes/1.024us 12.8e-3    128e-3     1280e-3    12800e-3   128000e-3
  *
  *  1.024us/byte  78.125     7.8125     0.78125    0.078125   0.0078125
+ *
+ * So, for PSCHED_SHIFT 10 we need: SM_SHIFT 20, ISM_SHIFT 18.
  */
-#define SM_SHIFT        20
-#define ISM_SHIFT       18
+#define SM_SHIFT        (30 - PSCHED_SHIFT)
+#define ISM_SHIFT       (8 + PSCHED_SHIFT)
 
 #define SM_MASK         ((1ULL << SM_SHIFT) - 1)
 #define ISM_MASK        ((1ULL << ISM_SHIFT) - 1)
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 33133d27b539..8706920a6d45 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -149,7 +149,7 @@ static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb)
                 break;
         }
         default:
-                h = (unsigned long)skb->dst ^ skb->protocol;
+                h = (unsigned long)skb_dst(skb) ^ skb->protocol;
                 h2 = (unsigned long)skb->sk;
         }
 
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 3b6418297231..9c002b6e0533 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
@@ -223,7 +222,7 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *
 {
         struct netdev_queue *dev_queue = netdev_get_tx_queue(dev, 0);
         struct teql_sched_data *q = qdisc_priv(dev_queue->qdisc);
-        struct neighbour *mn = skb->dst->neighbour;
+        struct neighbour *mn = skb_dst(skb)->neighbour;
         struct neighbour *n = q->ncache;
 
         if (mn->tbl == NULL)
@@ -263,8 +262,8 @@ static inline int teql_resolve(struct sk_buff *skb,
                 return -ENODEV;
 
         if (dev->header_ops == NULL ||
-            skb->dst == NULL ||
-            skb->dst->neighbour == NULL)
+            skb_dst(skb) == NULL ||
+            skb_dst(skb)->neighbour == NULL)
                 return 0;
         return __teql_resolve(skb, skb_res, dev);
 }
@@ -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);
@@ -337,12 +338,12 @@ restart:
 
         if (busy) {
                 netif_stop_queue(dev);
-                return 1;
+                return NETDEV_TX_BUSY;
         }
-        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,
 };