Patched in Tegra support.

7 files changed, 30 insertions, 26 deletions

diff --git a/net/802/Makefile b/net/802/Makefile
index a30d6e385ae..7893d679910 100644
--- a/net/802/Makefile
+++ b/net/802/Makefile
@@ -4,6 +4,7 @@
 
 # Check the p8022 selections against net/core/Makefile.
 obj-$(CONFIG_LLC)       += p8022.o psnap.o
+obj-$(CONFIG_TR)        += p8022.o psnap.o tr.o
 obj-$(CONFIG_NET_FC)    +=                 fc.o
 obj-$(CONFIG_FDDI)      +=                 fddi.o
 obj-$(CONFIG_HIPPI)     +=                 hippi.o
diff --git a/net/802/fc.c b/net/802/fc.c
index 05eea6b98bb..1e49f2d4ea9 100644
--- a/net/802/fc.c
+++ b/net/802/fc.c
@@ -11,6 +11,7 @@
  */
 
 #include <asm/uaccess.h>
+#include <asm/system.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -26,7 +27,6 @@
 #include <linux/net.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
-#include <linux/export.h>
 #include <net/arp.h>
 
 /*
@@ -35,7 +35,7 @@
 
 static int fc_header(struct sk_buff *skb, struct net_device *dev,
                      unsigned short type,
-                     const void *daddr, const void *saddr, unsigned int len)
+                     const void *daddr, const void *saddr, unsigned len)
 {
         struct fch_hdr *fch;
         int hdr_len;
diff --git a/net/802/fddi.c b/net/802/fddi.c
index 9cda40661e0..94b3ad08f39 100644
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -27,6 +27,7 @@
  */
 
 #include <linux/module.h>
+#include <asm/system.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -51,7 +52,7 @@
 
 static int fddi_header(struct sk_buff *skb, struct net_device *dev,
                        unsigned short type,
-                       const void *daddr, const void *saddr, unsigned int len)
+                       const void *daddr, const void *saddr, unsigned len)
 {
         int hl = FDDI_K_SNAP_HLEN;
         struct fddihdr *fddi;
diff --git a/net/802/garp.c b/net/802/garp.c
index 8456f5d98b8..16102951d36 100644
--- a/net/802/garp.c
+++ b/net/802/garp.c
@@ -15,7 +15,6 @@
 #include <linux/rtnetlink.h>
 #include <linux/llc.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <net/llc.h>
 #include <net/llc_pdu.h>
 #include <net/garp.h>
@@ -157,9 +156,9 @@ static struct garp_attr *garp_attr_lookup(const struct garp_applicant *app,
         while (parent) {
                 attr = rb_entry(parent, struct garp_attr, node);
                 d = garp_attr_cmp(attr, data, len, type);
-                if (d > 0)
+                if (d < 0)
                         parent = parent->rb_left;
-                else if (d < 0)
+                else if (d > 0)
                         parent = parent->rb_right;
                 else
                         return attr;
@@ -167,8 +166,7 @@ static struct garp_attr *garp_attr_lookup(const struct garp_applicant *app,
         return NULL;
 }
 
-static struct garp_attr *garp_attr_create(struct garp_applicant *app,
-                                          const void *data, u8 len, u8 type)
+static void garp_attr_insert(struct garp_applicant *app, struct garp_attr *new)
 {
         struct rb_node *parent = NULL, **p = &app->gid.rb_node;
         struct garp_attr *attr;
@@ -177,16 +175,21 @@ static struct garp_attr *garp_attr_create(struct garp_applicant *app,
         while (*p) {
                 parent = *p;
                 attr = rb_entry(parent, struct garp_attr, node);
-                d = garp_attr_cmp(attr, data, len, type);
-                if (d > 0)
+                d = garp_attr_cmp(attr, new->data, new->dlen, new->type);
+                if (d < 0)
                         p = &parent->rb_left;
-                else if (d < 0)
+                else if (d > 0)
                         p = &parent->rb_right;
-                else {
-                        /* The attribute already exists; re-use it. */
-                        return attr;
-                }
         }
+        rb_link_node(&new->node, parent, p);
+        rb_insert_color(&new->node, &app->gid);
+}
+
+static struct garp_attr *garp_attr_create(struct garp_applicant *app,
+                                          const void *data, u8 len, u8 type)
+{
+        struct garp_attr *attr;
+
         attr = kmalloc(sizeof(*attr) + len, GFP_ATOMIC);
         if (!attr)
                 return attr;
@@ -194,9 +197,7 @@ static struct garp_attr *garp_attr_create(struct garp_applicant *app,
         attr->type  = type;
         attr->dlen  = len;
         memcpy(attr->data, data, len);
-
-        rb_link_node(&attr->node, parent, p);
-        rb_insert_color(&attr->node, &app->gid);
+        garp_attr_insert(app, attr);
         return attr;
 }
 
@@ -552,7 +553,7 @@ static void garp_release_port(struct net_device *dev)
                 if (rtnl_dereference(port->applicants[i]))
                         return;
         }
-        RCU_INIT_POINTER(dev->garp_port, NULL);
+        rcu_assign_pointer(dev->garp_port, NULL);
         kfree_rcu(port, rcu);
 }
 
@@ -604,7 +605,7 @@ void garp_uninit_applicant(struct net_device *dev, struct garp_application *appl
 
         ASSERT_RTNL();
 
-        RCU_INIT_POINTER(port->applicants[appl->type], NULL);
+        rcu_assign_pointer(port->applicants[appl->type], NULL);
 
         /* Delete timer and generate a final TRANSMIT_PDU event to flush out
          * all pending messages before the applicant is gone. */
diff --git a/net/802/hippi.c b/net/802/hippi.c
index 51a1f530417..91aca8780fd 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -35,6 +35,7 @@
 #include <net/arp.h>
 #include <net/sock.h>
 #include <asm/uaccess.h>
+#include <asm/system.h>
 
 /*
  * Create the HIPPI MAC header for an arbitrary protocol layer
@@ -45,7 +46,7 @@
 
 static int hippi_header(struct sk_buff *skb, struct net_device *dev,
                         unsigned short type,
-                        const void *daddr, const void *saddr, unsigned int len)
+                        const void *daddr, const void *saddr, unsigned len)
 {
         struct hippi_hdr *hip = (struct hippi_hdr *)skb_push(skb, HIPPI_HLEN);
         struct hippi_cb *hcb = (struct hippi_cb *) skb->cb;
diff --git a/net/802/p8022.c b/net/802/p8022.c
index 0bda8de7df5..7f353c4f437 100644
--- a/net/802/p8022.c
+++ b/net/802/p8022.c
@@ -1,5 +1,6 @@
 /*
- *      NET3:   Support for 802.2 demultiplexing off Ethernet
+ *      NET3:   Support for 802.2 demultiplexing off Ethernet (Token ring
+ *              is kept separate see p8022tr.c)
  *              This program is free software; you can redistribute it and/or
  *              modify it under the terms of the GNU General Public License
  *              as published by the Free Software Foundation; either version
diff --git a/net/802/stp.c b/net/802/stp.c
index 2c40ba0ec11..978c30b1b36 100644
--- a/net/802/stp.c
+++ b/net/802/stp.c
@@ -12,7 +12,6 @@
 #include <linux/etherdevice.h>
 #include <linux/llc.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <net/llc.h>
 #include <net/llc_pdu.h>
 #include <net/stp.h>
@@ -46,7 +45,7 @@ static int stp_pdu_rcv(struct sk_buff *skb, struct net_device *dev,
                 proto = rcu_dereference(garp_protos[eh->h_dest[5] -
                                                     GARP_ADDR_MIN]);
                 if (proto &&
-                    !ether_addr_equal(eh->h_dest, proto->group_address))
+                    compare_ether_addr(eh->h_dest, proto->group_address))
                         goto err;
         } else
                 proto = rcu_dereference(stp_proto);
@@ -89,9 +88,9 @@ void stp_proto_unregister(const struct stp_proto *proto)
 {
         mutex_lock(&stp_proto_mutex);
         if (is_zero_ether_addr(proto->group_address))
-                RCU_INIT_POINTER(stp_proto, NULL);
+                rcu_assign_pointer(stp_proto, NULL);
         else
-                RCU_INIT_POINTER(garp_protos[proto->group_address[5] -
+                rcu_assign_pointer(garp_protos[proto->group_address[5] -
                                                GARP_ADDR_MIN], NULL);
         synchronize_rcu();