Patched in Tegra support.

1 files changed, 29 insertions, 33 deletions

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 0dab173e27d..2720884287c 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -59,7 +59,7 @@ struct neigh_parms {
         int     reachable_time;
         int     delay_probe_time;
 
-        int     queue_len_bytes;
+        int     queue_len;
         int     ucast_probes;
         int     app_probes;
         int     mcast_probes;
@@ -99,7 +99,6 @@ struct neighbour {
         rwlock_t                lock;
         atomic_t                refcnt;
         struct sk_buff_head     arp_queue;
-        unsigned int            arp_queue_len_bytes;
         struct timer_list       timer;
         unsigned long           used;
         atomic_t                probes;
@@ -139,12 +138,10 @@ struct pneigh_entry {
  *      neighbour table manipulation
  */
 
-#define NEIGH_NUM_HASH_RND      4
-
 struct neigh_hash_table {
         struct neighbour __rcu  **hash_buckets;
         unsigned int            hash_shift;
-        __u32                   hash_rnd[NEIGH_NUM_HASH_RND];
+        __u32                   hash_rnd;
         struct rcu_head         rcu;
 };
 
@@ -156,7 +153,7 @@ struct neigh_table {
         int                     key_len;
         __u32                   (*hash)(const void *pkey,
                                         const struct net_device *dev,
-                                        __u32 *hash_rnd);
+                                        __u32 hash_rnd);
         int                     (*constructor)(struct neighbour *);
         int                     (*pconstructor)(struct pneigh_entry *);
         void                    (*pdestructor)(struct pneigh_entry *);
@@ -175,18 +172,12 @@ struct neigh_table {
         atomic_t                entries;
         rwlock_t                lock;
         unsigned long           last_rand;
+        struct kmem_cache       *kmem_cachep;
         struct neigh_statistics __percpu *stats;
         struct neigh_hash_table __rcu *nht;
         struct pneigh_entry     **phash_buckets;
 };
 
-#define NEIGH_PRIV_ALIGN        sizeof(long long)
-
-static inline void *neighbour_priv(const struct neighbour *n)
-{
-        return (char *)n + ALIGN(sizeof(*n) + n->tbl->key_len, NEIGH_PRIV_ALIGN);
-}
-
 /* flags for neigh_update() */
 #define NEIGH_UPDATE_F_OVERRIDE                 0x00000001
 #define NEIGH_UPDATE_F_WEAK_OVERRIDE            0x00000002
@@ -195,6 +186,7 @@ static inline void *neighbour_priv(const struct neighbour *n)
 #define NEIGH_UPDATE_F_ADMIN                    0x80000000
 
 extern void                     neigh_table_init(struct neigh_table *tbl);
+extern void                     neigh_table_init_no_netlink(struct neigh_table *tbl);
 extern int                      neigh_table_clear(struct neigh_table *tbl);
 extern struct neighbour *       neigh_lookup(struct neigh_table *tbl,
                                              const void *pkey,
@@ -202,16 +194,9 @@ extern struct neighbour *	neigh_lookup(struct neigh_table *tbl,
 extern struct neighbour *       neigh_lookup_nodev(struct neigh_table *tbl,
                                                    struct net *net,
                                                    const void *pkey);
-extern struct neighbour *       __neigh_create(struct neigh_table *tbl,
-                                               const void *pkey,
-                                               struct net_device *dev,
-                                               bool want_ref);
-static inline struct neighbour *neigh_create(struct neigh_table *tbl,
+extern struct neighbour *       neigh_create(struct neigh_table *tbl,
                                              const void *pkey,
-                                             struct net_device *dev)
-{
-        return __neigh_create(tbl, pkey, dev, true);
-}
+                                             struct net_device *dev);
 extern void                     neigh_destroy(struct neighbour *neigh);
 extern int                      __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb);
 extern int                      neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, 
@@ -309,6 +294,12 @@ static inline struct neighbour * neigh_clone(struct neighbour *neigh)
 
 #define neigh_hold(n)   atomic_inc(&(n)->refcnt)
 
+static inline void neigh_confirm(struct neighbour *neigh)
+{
+        if (neigh)
+                neigh->confirmed = jiffies;
+}
+
 static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
 {
         unsigned long now = jiffies;
@@ -323,7 +314,7 @@ static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
 #ifdef CONFIG_BRIDGE_NETFILTER
 static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
 {
-        unsigned int seq, hh_alen;
+        unsigned seq, hh_alen;
 
         do {
                 seq = read_seqbegin(&hh->hh_lock);
@@ -334,28 +325,33 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
 }
 #endif
 
-static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *skb)
+static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
 {
-        unsigned int seq;
+        unsigned seq;
         int hh_len;
 
         do {
+                int hh_alen;
+
                 seq = read_seqbegin(&hh->hh_lock);
                 hh_len = hh->hh_len;
-                if (likely(hh_len <= HH_DATA_MOD)) {
-                        /* this is inlined by gcc */
-                        memcpy(skb->data - HH_DATA_MOD, hh->hh_data, HH_DATA_MOD);
-                } else {
-                        int hh_alen = HH_DATA_ALIGN(hh_len);
-
-                        memcpy(skb->data - hh_alen, hh->hh_data, hh_alen);
-                }
+                hh_alen = HH_DATA_ALIGN(hh_len);
+                memcpy(skb->data - hh_alen, hh->hh_data, hh_alen);
         } while (read_seqretry(&hh->hh_lock, seq));
 
         skb_push(skb, hh_len);
         return dev_queue_xmit(skb);
 }
 
+static inline int neigh_output(struct neighbour *n, struct sk_buff *skb)
+{
+        struct hh_cache *hh = &n->hh;
+        if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
+                return neigh_hh_output(hh, skb);
+        else
+                return n->output(n, skb);
+}
+
 static inline struct neighbour *
 __neigh_lookup(struct neigh_table *tbl, const void *pkey, struct net_device *dev, int creat)
 {