net: dsa: tag_mtk: Fix warnings for __be16
authorAndrew Lunn <andrew@lunn.ch>
Sun, 5 Jul 2020 19:30:07 +0000 (21:30 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 5 Jul 2020 22:31:58 +0000 (15:31 -0700)
net/dsa/tag_mtk.c:84:13: warning: incorrect type in assignment (different base types)
net/dsa/tag_mtk.c:84:13:    expected restricted __be16 [usertype] hdr
net/dsa/tag_mtk.c:84:13:    got int
net/dsa/tag_mtk.c:94:17: warning: restricted __be16 degrades to integer

The result of a ntohs() is not __be16, but u16.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dsa/tag_mtk.c

index d6619edd53e5a25068811c4d457000c31b7dc6a4..f602fc758d68dbd685c31e900bb745029d40abcc 100644 (file)
@@ -67,8 +67,9 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,
 static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,
                                   struct packet_type *pt)
 {
+       u16 hdr;
        int port;
-       __be16 *phdr, hdr;
+       __be16 *phdr;
        unsigned char *dest = eth_hdr(skb)->h_dest;
        bool is_multicast_skb = is_multicast_ether_addr(dest) &&
                                !is_broadcast_ether_addr(dest);