Patched in Tegra support.

1 files changed, 31 insertions, 26 deletions

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 47416716294..4f4c52c0eeb 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -67,6 +67,7 @@ struct teql_master {
 struct teql_sched_data {
         struct Qdisc *next;
         struct teql_master *m;
+        struct neighbour *ncache;
         struct sk_buff_head q;
 };
 
@@ -87,7 +88,9 @@ teql_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                 return NET_XMIT_SUCCESS;
         }
 
-        return qdisc_drop(skb, sch);
+        kfree_skb(skb);
+        sch->qstats.drops++;
+        return NET_XMIT_DROP;
 }
 
 static struct sk_buff *
@@ -133,6 +136,7 @@ teql_reset(struct Qdisc *sch)
 
         skb_queue_purge(&dat->q);
         sch->q.qlen = 0;
+        teql_neigh_release(xchg(&dat->ncache, NULL));
 }
 
 static void
@@ -164,6 +168,7 @@ teql_destroy(struct Qdisc *sch)
                                         }
                                 }
                                 skb_queue_purge(&dat->q);
+                                teql_neigh_release(xchg(&dat->ncache, NULL));
                                 break;
                         }
 
@@ -222,25 +227,21 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt)
 static int
 __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res,
                struct net_device *dev, struct netdev_queue *txq,
-               struct dst_entry *dst)
+               struct neighbour *mn)
 {
-        struct neighbour *n;
-        int err = 0;
+        struct teql_sched_data *q = qdisc_priv(txq->qdisc);
+        struct neighbour *n = q->ncache;
 
-        n = dst_neigh_lookup_skb(dst, skb);
-        if (!n)
-                return -ENOENT;
-
-        if (dst->dev != dev) {
-                struct neighbour *mn;
-
-                mn = __neigh_lookup_errno(n->tbl, n->primary_key, dev);
-                neigh_release(n);
-                if (IS_ERR(mn))
-                        return PTR_ERR(mn);
-                n = mn;
+        if (mn->tbl == NULL)
+                return -EINVAL;
+        if (n && n->tbl == mn->tbl &&
+            memcmp(n->primary_key, mn->primary_key, mn->tbl->key_len) == 0) {
+                atomic_inc(&n->refcnt);
+        } else {
+                n = __neigh_lookup_errno(mn->tbl, mn->primary_key, dev);
+                if (IS_ERR(n))
+                        return PTR_ERR(n);
         }
-
         if (neigh_event_send(n, skb_res) == 0) {
                 int err;
                 char haddr[MAX_ADDR_LEN];
@@ -249,13 +250,15 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res,
                 err = dev_hard_header(skb, dev, ntohs(skb->protocol), haddr,
                                       NULL, skb->len);
 
-                if (err < 0)
-                        err = -EINVAL;
-        } else {
-                err = (skb_res == NULL) ? -EAGAIN : 1;
+                if (err < 0) {
+                        neigh_release(n);
+                        return -EINVAL;
+                }
+                teql_neigh_release(xchg(&q->ncache, n));
+                return 0;
         }
         neigh_release(n);
-        return err;
+        return (skb_res == NULL) ? -EAGAIN : 1;
 }
 
 static inline int teql_resolve(struct sk_buff *skb,
@@ -264,6 +267,7 @@ static inline int teql_resolve(struct sk_buff *skb,
                                struct netdev_queue *txq)
 {
         struct dst_entry *dst = skb_dst(skb);
+        struct neighbour *mn;
         int res;
 
         if (txq->qdisc == &noop_qdisc)
@@ -273,7 +277,8 @@ static inline int teql_resolve(struct sk_buff *skb,
                 return 0;
 
         rcu_read_lock();
-        res = __teql_resolve(skb, skb_res, dev, txq, dst);
+        mn = dst_get_neighbour(dst);
+        res = mn ? __teql_resolve(skb, skb_res, dev, txq, mn) : 0;
         rcu_read_unlock();
 
         return res;
@@ -305,7 +310,7 @@ restart:
 
                 if (slave_txq->qdisc_sleeping != q)
                         continue;
-                if (netif_xmit_stopped(netdev_get_tx_queue(slave, subq)) ||
+                if (__netif_subqueue_stopped(slave, subq) ||
                     !netif_running(slave)) {
                         busy = 1;
                         continue;
@@ -316,7 +321,7 @@ restart:
                         if (__netif_tx_trylock(slave_txq)) {
                                 unsigned int length = qdisc_pkt_len(skb);
 
-                                if (!netif_xmit_frozen_or_stopped(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);
@@ -328,7 +333,7 @@ restart:
                                 }
                                 __netif_tx_unlock(slave_txq);
                         }
-                        if (netif_xmit_stopped(netdev_get_tx_queue(dev, 0)))
+                        if (netif_queue_stopped(dev))
                                 busy = 1;
                         break;
                 case 1: