1 files changed, 46 insertions, 31 deletions

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index feaabc103ce6..45cd30098e34 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -53,38 +53,38 @@
       which will not break load balancing, though native slave
       traffic will have the highest priority.  */
 
-struct teql_master
-{
+struct teql_master {
         struct Qdisc_ops qops;
         struct net_device *dev;
         struct Qdisc *slaves;
         struct list_head master_list;
+        unsigned long   tx_bytes;
+        unsigned long   tx_packets;
+        unsigned long   tx_errors;
+        unsigned long   tx_dropped;
 };
 
-struct teql_sched_data
-{
+struct teql_sched_data {
         struct Qdisc *next;
         struct teql_master *m;
         struct neighbour *ncache;
         struct sk_buff_head q;
 };
 
-#define NEXT_SLAVE(q) (((struct teql_sched_data*)qdisc_priv(q))->next)
+#define NEXT_SLAVE(q) (((struct teql_sched_data *)qdisc_priv(q))->next)
 
-#define FMASK (IFF_BROADCAST|IFF_POINTOPOINT)
+#define FMASK (IFF_BROADCAST | IFF_POINTOPOINT)
 
 /* "teql*" qdisc routines */
 
 static int
-teql_enqueue(struct sk_buff *skb, struct Qdisc* sch)
+teql_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 {
         struct net_device *dev = qdisc_dev(sch);
         struct teql_sched_data *q = qdisc_priv(sch);
 
         if (q->q.qlen < dev->tx_queue_len) {
                 __skb_queue_tail(&q->q, skb);
-                sch->bstats.bytes += qdisc_pkt_len(skb);
-                sch->bstats.packets++;
                 return NET_XMIT_SUCCESS;
         }
 
@@ -94,7 +94,7 @@ teql_enqueue(struct sk_buff *skb, struct Qdisc* sch)
 }
 
 static struct sk_buff *
-teql_dequeue(struct Qdisc* sch)
+teql_dequeue(struct Qdisc *sch)
 {
         struct teql_sched_data *dat = qdisc_priv(sch);
         struct netdev_queue *dat_queue;
@@ -108,19 +108,21 @@ teql_dequeue(struct Qdisc* sch)
                         dat->m->slaves = sch;
                         netif_wake_queue(m);
                 }
+        } else {
+                qdisc_bstats_update(sch, skb);
         }
         sch->q.qlen = dat->q.qlen + dat_queue->qdisc->q.qlen;
         return skb;
 }
 
 static struct sk_buff *
-teql_peek(struct Qdisc* sch)
+teql_peek(struct Qdisc *sch)
 {
         /* teql is meant to be used as root qdisc */
         return NULL;
 }
 
-static __inline__ void
+static inline void
 teql_neigh_release(struct neighbour *n)
 {
         if (n)
@@ -128,7 +130,7 @@ teql_neigh_release(struct neighbour *n)
 }
 
 static void
-teql_reset(struct Qdisc* sch)
+teql_reset(struct Qdisc *sch)
 {
         struct teql_sched_data *dat = qdisc_priv(sch);
 
@@ -138,13 +140,14 @@ teql_reset(struct Qdisc* sch)
 }
 
 static void
-teql_destroy(struct Qdisc* sch)
+teql_destroy(struct Qdisc *sch)
 {
         struct Qdisc *q, *prev;
         struct teql_sched_data *dat = qdisc_priv(sch);
         struct teql_master *master = dat->m;
 
-        if ((prev = master->slaves) != NULL) {
+        prev = master->slaves;
+        if (prev) {
                 do {
                         q = NEXT_SLAVE(prev);
                         if (q == sch) {
@@ -176,7 +179,7 @@ teql_destroy(struct Qdisc* sch)
 static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt)
 {
         struct net_device *dev = qdisc_dev(sch);
-        struct teql_master *m = (struct teql_master*)sch->ops;
+        struct teql_master *m = (struct teql_master *)sch->ops;
         struct teql_sched_data *q = qdisc_priv(sch);
 
         if (dev->hard_header_len > m->dev->hard_header_len)
@@ -241,11 +244,11 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *
         }
         if (neigh_event_send(n, skb_res) == 0) {
                 int err;
+                char haddr[MAX_ADDR_LEN];
 
-                read_lock(&n->lock);
-                err = dev_hard_header(skb, dev, ntohs(skb->protocol),
-                                      n->ha, NULL, skb->len);
-                read_unlock(&n->lock);
+                neigh_ha_snapshot(haddr, n, dev);
+                err = dev_hard_header(skb, dev, ntohs(skb->protocol), haddr,
+                                      NULL, skb->len);
 
                 if (err < 0) {
                         neigh_release(n);
@@ -275,7 +278,6 @@ static inline int teql_resolve(struct sk_buff *skb,
 static netdev_tx_t 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;
@@ -288,7 +290,8 @@ restart:
         nores = 0;
         busy = 0;
 
-        if ((q = start) == NULL)
+        q = start;
+        if (!q)
                 goto drop;
 
         do {
@@ -309,15 +312,14 @@ restart:
                         if (__netif_tx_trylock(slave_txq)) {
                                 unsigned int length = qdisc_pkt_len(skb);
 
-                                if (!netif_tx_queue_stopped(slave_txq) &&
-                                    !netif_tx_queue_frozen(slave_txq) &&
+                                if (!netif_tx_queue_frozen_or_stopped(slave_txq) &&
                                     slave_ops->ndo_start_xmit(skb, slave) == NETDEV_TX_OK) {
                                         txq_trans_update(slave_txq);
                                         __netif_tx_unlock(slave_txq);
                                         master->slaves = NEXT_SLAVE(q);
                                         netif_wake_queue(dev);
-                                        txq->tx_packets++;
-                                        txq->tx_bytes += length;
+                                        master->tx_packets++;
+                                        master->tx_bytes += length;
                                         return NETDEV_TX_OK;
                                 }
                                 __netif_tx_unlock(slave_txq);
@@ -344,20 +346,20 @@ restart:
                 netif_stop_queue(dev);
                 return NETDEV_TX_BUSY;
         }
-        dev->stats.tx_errors++;
+        master->tx_errors++;
 
 drop:
-        txq->tx_dropped++;
+        master->tx_dropped++;
         dev_kfree_skb(skb);
         return NETDEV_TX_OK;
 }
 
 static int teql_master_open(struct net_device *dev)
 {
-        struct Qdisc * q;
+        struct Qdisc *q;
         struct teql_master *m = netdev_priv(dev);
         int mtu = 0xFFFE;
-        unsigned flags = IFF_NOARP|IFF_MULTICAST;
+        unsigned int flags = IFF_NOARP | IFF_MULTICAST;
 
         if (m->slaves == NULL)
                 return -EUNATCH;
@@ -400,6 +402,18 @@ static int teql_master_close(struct net_device *dev)
         return 0;
 }
 
+static struct rtnl_link_stats64 *teql_master_stats64(struct net_device *dev,
+                                                     struct rtnl_link_stats64 *stats)
+{
+        struct teql_master *m = netdev_priv(dev);
+
+        stats->tx_packets       = m->tx_packets;
+        stats->tx_bytes         = m->tx_bytes;
+        stats->tx_errors        = m->tx_errors;
+        stats->tx_dropped       = m->tx_dropped;
+        return stats;
+}
+
 static int teql_master_mtu(struct net_device *dev, int new_mtu)
 {
         struct teql_master *m = netdev_priv(dev);
@@ -413,7 +427,7 @@ static int teql_master_mtu(struct net_device *dev, int new_mtu)
                 do {
                         if (new_mtu > qdisc_dev(q)->mtu)
                                 return -EINVAL;
-                } while ((q=NEXT_SLAVE(q)) != m->slaves);
+                } while ((q = NEXT_SLAVE(q)) != m->slaves);
         }
 
         dev->mtu = new_mtu;
@@ -424,6 +438,7 @@ 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_stats64 = teql_master_stats64,
         .ndo_change_mtu = teql_master_mtu,
 };