firewire: net: Make use of get_unaligned_be48(), put_unaligned_be48()

Since we have a proper endianness converters for BE 48-bit data use
them.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220726144906.5217-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index dcc141068128c5cbdc66253bc5d63cbfa8762558..af22be84034bba2cc310de835d045b788d40b00f 100644 (file)
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -201,15 +201,6 @@ struct fwnet_packet_task {
        u8 enqueued;
 };
 
-/*
- * Get fifo address embedded in hwaddr
- */
-static __u64 fwnet_hwaddr_fifo(union fwnet_hwaddr *ha)
-{
-       return (u64)get_unaligned_be16(&ha->uc.fifo_hi) << 32
-              | get_unaligned_be32(&ha->uc.fifo_lo);
-}
-
 /*
  * saddr == NULL means use device source address.
  * daddr == NULL means leave destination address (eg unresolved arp).
@@ -1306,7 +1297,7 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
                max_payload        = peer->max_payload;
                datagram_label_ptr = &peer->datagram_label;
 
-               ptask->fifo_addr   = fwnet_hwaddr_fifo(ha);
+               ptask->fifo_addr   = get_unaligned_be48(ha->uc.fifo);
                ptask->generation  = generation;
                ptask->dest_node   = dest_node;
                ptask->speed       = peer->speed;
@@ -1494,8 +1485,7 @@ static int fwnet_probe(struct fw_unit *unit,
        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);
+       put_unaligned_be48(dev->local_fifo, ha.uc.fifo);
        dev_addr_set(net, ha.u);
 
        memset(net->broadcast, -1, net->addr_len);

diff --git a/include/net/firewire.h b/include/net/firewire.h
index 2442d645e4123034073a2c63e089e3222934bfe1..8fbff8d7786527d1c0ad0e430450f807fe7523e2 100644 (file)
--- a/include/net/firewire.h
+++ b/include/net/firewire.h
@@ -13,8 +13,7 @@ union fwnet_hwaddr {
                __be64 uniq_id;         /* EUI-64                       */
                u8 max_rec;             /* max packet size              */
                u8 sspd;                /* max speed                    */
-               __be16 fifo_hi;         /* hi 16bits of FIFO addr       */
-               __be32 fifo_lo;         /* lo 32bits of FIFO addr       */
+               u8 fifo[6];             /* FIFO addr                    */
        } __packed uc;
 };