net: ethernet: mtk_eth_soc: Use ipv6_addr_{cpu_to_be32,be32_to_cpu} helpers

Use ipv6_addr_cpu_to_be32 and ipv6_addr_be32_to_cpu helpers to convert
address, rather than open coding the conversion.

No functional change intended.
Compile tested only.

Suggested-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/netdev/c7684349-535c-45a4-9a74-d47479a50020@lunn.ch/
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20240813-ipv6_addr-helpers-v2-2-5c974f8cca3e@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c
index 0acee405a7498a5bd2944c7c4cbc274ba617cd9b..ada852adc5f7023a0787a324257a9063bbbf2a44 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
@@ -8,8 +8,11 @@
 #include <linux/platform_device.h>
 #include <linux/if_ether.h>
 #include <linux/if_vlan.h>
+
 #include <net/dst_metadata.h>
 #include <net/dsa.h>
+#include <net/ipv6.h>
+
 #include "mtk_eth_soc.h"
 #include "mtk_ppe.h"
 #include "mtk_ppe_regs.h"
@@ -338,7 +341,6 @@ int mtk_foe_entry_set_ipv6_tuple(struct mtk_eth *eth,
 {
        int type = mtk_get_ib1_pkt_type(eth, entry->ib1);
        u32 *src, *dest;
-       int i;
 
        switch (type) {
        case MTK_PPE_PKT_TYPE_IPV4_DSLITE:
@@ -359,10 +361,8 @@ int mtk_foe_entry_set_ipv6_tuple(struct mtk_eth *eth,
                return -EINVAL;
        }
 
-       for (i = 0; i < 4; i++)
-               src[i] = be32_to_cpu(src_addr[i]);
-       for (i = 0; i < 4; i++)
-               dest[i] = be32_to_cpu(dest_addr[i]);
+       ipv6_addr_be32_to_cpu(src, src_addr);
+       ipv6_addr_be32_to_cpu(dest, dest_addr);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c
index 1a97feca77f237dea2fd5522fcccdaa80ca9d6fe..570ebf91f693546466f9b6df0e135d38746bb863 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c
@@ -3,6 +3,9 @@
 
 #include <linux/kernel.h>
 #include <linux/debugfs.h>
+
+#include <net/ipv6.h>
+
 #include "mtk_eth_soc.h"
 
 struct mtk_flow_addr_info
@@ -47,16 +50,14 @@ static const char *mtk_foe_pkt_type_str(int type)
 static void
 mtk_print_addr(struct seq_file *m, u32 *addr, bool ipv6)
 {
-       __be32 n_addr[4];
-       int i;
+       __be32 n_addr[IPV6_ADDR_WORDS];
 
        if (!ipv6) {
                seq_printf(m, "%pI4h", addr);
                return;
        }
 
-       for (i = 0; i < ARRAY_SIZE(n_addr); i++)
-               n_addr[i] = htonl(addr[i]);
+       ipv6_addr_cpu_to_be32(n_addr, addr);
        seq_printf(m, "%pI6", n_addr);
 }