Patched in Tegra support.

2 files changed, 7 insertions, 10 deletions

diff --git a/net/ethernet/Makefile b/net/ethernet/Makefile
index 32317750540..7cef1d8ace2 100644
--- a/net/ethernet/Makefile
+++ b/net/ethernet/Makefile
@@ -3,3 +3,5 @@
 #
 
 obj-y                                   += eth.o
+obj-$(subst m,y,$(CONFIG_IPX))          += pe2.o
+obj-$(subst m,y,$(CONFIG_ATALK))        += pe2.o
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 4efad533e5f..a2468363978 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -59,6 +59,7 @@
 #include <net/ip.h>
 #include <net/dsa.h>
 #include <asm/uaccess.h>
+#include <asm/system.h>
 
 __setup("ether=", netdev_boot_setup);
 
@@ -77,7 +78,7 @@ __setup("ether=", netdev_boot_setup);
  */
 int eth_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 ethhdr *eth = (struct ethhdr *)skb_push(skb, ETH_HLEN);
 
@@ -164,7 +165,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
         eth = eth_hdr(skb);
 
         if (unlikely(is_multicast_ether_addr(eth->h_dest))) {
-                if (ether_addr_equal_64bits(eth->h_dest, dev->broadcast))
+                if (!compare_ether_addr_64bits(eth->h_dest, dev->broadcast))
                         skb->pkt_type = PACKET_BROADCAST;
                 else
                         skb->pkt_type = PACKET_MULTICAST;
@@ -179,8 +180,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
          */
 
         else if (1 /*dev->flags&IFF_PROMISC */ ) {
-                if (unlikely(!ether_addr_equal_64bits(eth->h_dest,
-                                                      dev->dev_addr)))
+                if (unlikely(compare_ether_addr_64bits(eth->h_dest, dev->dev_addr)))
                         skb->pkt_type = PACKET_OTHERHOST;
         }
 
@@ -232,7 +232,6 @@ EXPORT_SYMBOL(eth_header_parse);
  * @neigh: source neighbour
  * @hh: destination cache entry
  * @type: Ethernet type field
- *
  * Create an Ethernet header template from the neighbour.
  */
 int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh, __be16 type)
@@ -275,7 +274,6 @@ EXPORT_SYMBOL(eth_header_cache_update);
  * eth_mac_addr - set new Ethernet hardware address
  * @dev: network device
  * @p: socket address
- *
  * Change hardware address of device.
  *
  * This doesn't change hardware matching, so needs to be overridden
@@ -285,13 +283,11 @@ int eth_mac_addr(struct net_device *dev, void *p)
 {
         struct sockaddr *addr = p;
 
-        if (!(dev->priv_flags & IFF_LIVE_ADDR_CHANGE) && netif_running(dev))
+        if (netif_running(dev))
                 return -EBUSY;
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
         memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
-        /* if device marked as NET_ADDR_RANDOM, reset it */
-        dev->addr_assign_type &= ~NET_ADDR_RANDOM;
         return 0;
 }
 EXPORT_SYMBOL(eth_mac_addr);
@@ -333,7 +329,6 @@ const struct header_ops eth_header_ops ____cacheline_aligned = {
 /**
  * ether_setup - setup Ethernet network device
  * @dev: network device
- *
  * Fill in the fields of the device structure with Ethernet-generic values.
  */
 void ether_setup(struct net_device *dev)