net: macb: fixup sparse warnings on __be16 ports

The port fields in the ethool flow structures are defined
to be __be16 types, so sparse is showing issues where these
are being passed to htons(). Fix these warnings by passing
them to be16_to_cpu() instead.

These are being used in netdev_dbg() so should only effect
anyone doing debug.

Fixes the following sparse warnings:

drivers/net/ethernet/cadence/macb_main.c:3366:9: warning: cast from restricted __be16
drivers/net/ethernet/cadence/macb_main.c:3366:9: warning: cast from restricted __be16
drivers/net/ethernet/cadence/macb_main.c:3366:9: warning: cast from restricted __be16
drivers/net/ethernet/cadence/macb_main.c:3419:25: warning: cast from restricted __be16
drivers/net/ethernet/cadence/macb_main.c:3419:25: warning: cast from restricted __be16
drivers/net/ethernet/cadence/macb_main.c:3419:25: warning: cast from restricted __be16
drivers/net/ethernet/cadence/macb_main.c:3419:25: warning: cast from restricted __be16

Signed-off-by: Ben Dooks <ben.dooks@sifive.com>
Link: https://lore.kernel.org/r/20220715173009.526126-1-ben.dooks@sifive.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index d5f7a9fb36d5b437f4064ea580e1b83f4f0fd2fe..7eb7822cd1846e15416bb810ca3aa6f233454bc2 100644 (file)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3482,7 +3482,8 @@ static int gem_add_flow_filter(struct net_device *netdev,
                        fs->flow_type, (int)fs->ring_cookie, fs->location,
                        htonl(fs->h_u.tcp_ip4_spec.ip4src),
                        htonl(fs->h_u.tcp_ip4_spec.ip4dst),
-                       htons(fs->h_u.tcp_ip4_spec.psrc), htons(fs->h_u.tcp_ip4_spec.pdst));
+                       be16_to_cpu(fs->h_u.tcp_ip4_spec.psrc),
+                       be16_to_cpu(fs->h_u.tcp_ip4_spec.pdst));
 
        spin_lock_irqsave(&bp->rx_fs_lock, flags);
 
@@ -3535,8 +3536,8 @@ static int gem_del_flow_filter(struct net_device *netdev,
                                        fs->flow_type, (int)fs->ring_cookie, fs->location,
                                        htonl(fs->h_u.tcp_ip4_spec.ip4src),
                                        htonl(fs->h_u.tcp_ip4_spec.ip4dst),
-                                       htons(fs->h_u.tcp_ip4_spec.psrc),
-                                       htons(fs->h_u.tcp_ip4_spec.pdst));
+                                       be16_to_cpu(fs->h_u.tcp_ip4_spec.psrc),
+                                       be16_to_cpu(fs->h_u.tcp_ip4_spec.pdst));
 
                        gem_writel_n(bp, SCRT2, fs->location, 0);