Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (36 commits)
  [ATM]: Check IP header validity in mpc_send_packet
  [IPV6]: IPV6_MULTICAST_IF setting is ignored on link-local connect()
  [CONNECTOR]: Don't touch queue dev after decrement of ref count.
  [SOCK]: Adds a rcu_dereference() in sk_filter
  [XFRM]: xfrm_algo_clone() allocates too much memory
  [FORCEDETH]: Fix reversing the MAC address on suspend.
  [NET]: mcs7830 passes msecs instead of jiffies to usb_control_msg
  [LRO] Fix lro_mgr->features checks
  [NET]: Clone the sk_buff 'iif' field in __skb_clone()
  [IPV4] ROUTE: ip_rt_dump() is unecessary slow
  [NET]: kaweth was forgotten in msec switchover of usb_start_wait_urb
  [NET] Intel ethernet drivers: update MAINTAINERS
  [NET]: Make ->poll() breakout consistent in Intel ethernet drivers.
  [NET]: Stop polling when napi_disable() is pending.
  [NET]: Fix drivers to handle napi_disable() disabling interrupts.
  [NETXEN]: Fix ->poll() done logic.
  mac80211: return an error when SIWRATE doesn't match any rate
  ssb: Fix probing of PCI cores if PCI and PCIE core is available
  [NET]: Do not check netif_running() and carrier state in ->poll()
  [NET]: Add NAPI_STATE_DISABLE.
  ...

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 0c89b028a80c..cdaa8fc21809 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -95,11 +95,14 @@ static inline void load_eaddr(struct net_device *dev)
 {
         int i;
         DECLARE_MAC_BUF(mac);
+        u64 macaddr;
 
-        for (i = 0; i < 6; i++)
-                dev->dev_addr[i] = o2meth_eaddr[i];
         DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr));
-        mace->eth.mac_addr = (*(unsigned long*)o2meth_eaddr) >> 16;
+        macaddr = 0;
+        for (i = 0; i < 6; i++)
+                macaddr |= dev->dev_addr[i] << ((5 - i) * 8);
+
+        mace->eth.mac_addr = macaddr;
 }
 
 /*
@@ -794,6 +797,7 @@ static int __init meth_probe(struct platform_device *pdev)
 #endif
         dev->irq             = MACE_ETHERNET_IRQ;
         dev->base_addr       = (unsigned long)&mace->eth;
+        memcpy(dev->dev_addr, o2meth_eaddr, 6);
 
         priv = netdev_priv(dev);
         spin_lock_init(&priv->meth_lock);