Commit 29192a17 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jakub Kicinski
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220726144906.5217-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 39befe3a

drivers/firewire/net.c

+2 −12
Original line number Diff line number Diff line
@@ -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);

include/net/firewire.h

+1 −2
Original line number Diff line number Diff line
@@ -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;

};