1 files changed, 10 insertions, 16 deletions

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,
 };