firewire: net: Make use of get_unaligned_be48(), put_unaligned_be48()
Subsystems (3)
PATCH 1/1 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 <[email protected]>
--- drivers/firewire/net.c | 14 ++------------ include/net/firewire.h | 3 +-- 2 files changed, 3 insertions(+), 14 deletions(-)
drivers/firewire/net.c +2 -12
@@ -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
@@ -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; };
Signature · 1 line
2.35.1
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Tue, 26 Jul 2022 17:49:06 +0300 you wrote:
Since we have a proper endianness converters for BE 48-bit data use them.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/firewire/net.c | 14 ++------------ include/net/firewire.h | 3 +-- 2 files changed, 3 insertions(+), 14 deletions(-)
Here is the summary with links:
- [net-next,v1,1/1] firewire: net: Make use of get_unaligned_be48(), put_unaligned_be48()
https://git.kernel.org/netdev/net-next/c/29192a170e15
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html