Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-microblaze.git] / drivers / firewire / net.c

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 4c3fd2e..dcc1410 100644 (file)
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1443,8 +1443,8 @@ static int fwnet_probe(struct fw_unit *unit,
        struct net_device *net;
        bool allocated_netdev = false;
        struct fwnet_device *dev;
+       union fwnet_hwaddr ha;
        int ret;
-       union fwnet_hwaddr *ha;
 
        mutex_lock(&fwnet_device_mutex);
 
@@ -1491,12 +1491,12 @@ static int fwnet_probe(struct fw_unit *unit,
        net->max_mtu = 4096U;
 
        /* Set our hardware address while we're at it */
-       ha = (union fwnet_hwaddr *)net->dev_addr;
-       put_unaligned_be64(card->guid, &ha->uc.uniq_id);
-       ha->uc.max_rec = dev->card->max_receive;
-       ha->uc.sspd = dev->card->link_speed;
-       put_unaligned_be16(dev->local_fifo >> 32, &ha->uc.fifo_hi);
-       put_unaligned_be32(dev->local_fifo & 0xffffffff, &ha->uc.fifo_lo);
+       ha.uc.uniq_id = cpu_to_be64(card->guid);
+       ha.uc.max_rec = dev->card->max_receive;
+       ha.uc.sspd = dev->card->link_speed;
+       ha.uc.fifo_hi = cpu_to_be16(dev->local_fifo >> 32);
+       ha.uc.fifo_lo = cpu_to_be32(dev->local_fifo & 0xffffffff);
+       dev_addr_set(net, ha.u);
 
        memset(net->broadcast, -1, net->addr_len);