* [PATCH net-next v1 1/1] firewire: net: Make use of get_unaligned_be48(), put_unaligned_be48()
@ 2022-07-26 14:49 Andy Shevchenko
2022-07-29 5:30 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2022-07-26 14:49 UTC (permalink / raw)
To: Jakub Kicinski, Andy Shevchenko, linux1394-devel, linux-kernel, netdev
Cc: Stefan Richter, David S. Miller, Eric Dumazet, Paolo Abeni
Since we have a proper endianness converters for BE 48-bit data use
them.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/firewire/net.c | 14 ++------------
include/net/firewire.h | 3 +--
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index dcc141068128..af22be84034b 100644
--- 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 2442d645e412..8fbff8d77865 100644
--- 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;
};
--
2.35.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next v1 1/1] firewire: net: Make use of get_unaligned_be48(), put_unaligned_be48()
2022-07-26 14:49 [PATCH net-next v1 1/1] firewire: net: Make use of get_unaligned_be48(), put_unaligned_be48() Andy Shevchenko
@ 2022-07-29 5:30 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-07-29 5:30 UTC (permalink / raw)
To: Andy Shevchenko
Cc: kuba, linux1394-devel, linux-kernel, netdev, stefanr, davem,
edumazet, pabeni
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
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 <andriy.shevchenko@linux.intel.com>
> ---
> 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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-29 5:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-26 14:49 [PATCH net-next v1 1/1] firewire: net: Make use of get_unaligned_be48(), put_unaligned_be48() Andy Shevchenko
2022-07-29 5:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).