leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Andy Shevchenko 2022-07-26 17:49:06 +03:00 committed by Jakub Kicinski
parent 39befe3a43
commit 29192a170e
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/firewire/net.c
View File

@ -201,15 +201,6 @@ struct fwnet_packet_task {
u8 enqueued; 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. * saddr == NULL means use device source address.
* daddr == NULL means leave destination address (eg unresolved arp). * 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; max_payload = peer->max_payload;
datagram_label_ptr = &peer->datagram_label; 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->generation = generation;
ptask->dest_node = dest_node; ptask->dest_node = dest_node;
ptask->speed = peer->speed; 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.uniq_id = cpu_to_be64(card->guid);
ha.uc.max_rec = dev->card->max_receive; ha.uc.max_rec = dev->card->max_receive;
ha.uc.sspd = dev->card->link_speed; ha.uc.sspd = dev->card->link_speed;
ha.uc.fifo_hi = cpu_to_be16(dev->local_fifo >> 32); put_unaligned_be48(dev->local_fifo, ha.uc.fifo);
ha.uc.fifo_lo = cpu_to_be32(dev->local_fifo & 0xffffffff);
dev_addr_set(net, ha.u); dev_addr_set(net, ha.u);
memset(net->broadcast, -1, net->addr_len); memset(net->broadcast, -1, net->addr_len);

3
include/net/firewire.h
View File

@ -13,8 +13,7 @@ union fwnet_hwaddr {
__be64 uniq_id; /* EUI-64 */ __be64 uniq_id; /* EUI-64 */
u8 max_rec; /* max packet size */ u8 max_rec; /* max packet size */
u8 sspd; /* max speed */ u8 sspd; /* max speed */
__be16 fifo_hi; /* hi 16bits of FIFO addr */ u8 fifo[6]; /* FIFO addr */
__be32 fifo_lo; /* lo 32bits of FIFO addr */
} __packed uc; } __packed uc;
}; };