net: dsa: tag_qca.c: Fix warning for __be16 vs u16

net/dsa/tag_qca.c:48:15: warning: incorrect type in assignment (different base types)
net/dsa/tag_qca.c:48:15:    expected unsigned short [usertype]
net/dsa/tag_qca.c:48:15:    got restricted __be16 [usertype]
net/dsa/tag_qca.c:68:13: warning: incorrect type in assignment (different base types)
net/dsa/tag_qca.c:68:13:    expected restricted __be16 [usertype] hdr
net/dsa/tag_qca.c:68:13:    got int
net/dsa/tag_qca.c:71:16: warning: restricted __be16 degrades to integer
net/dsa/tag_qca.c:81:17: warning: restricted __be16 degrades to integer

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>

diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
index 70db7c9..7066f5e 100644 (file)
--- a/net/dsa/tag_qca.c
+++ b/net/dsa/tag_qca.c
@@ -31,7 +31,8 @@
 static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct dsa_port *dp = dsa_slave_to_port(dev);
-       u16 *phdr, hdr;
+       __be16 *phdr;
+       u16 hdr;
 
        if (skb_cow_head(skb, QCA_HDR_LEN) < 0)
                return NULL;
@@ -39,7 +40,7 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)
        skb_push(skb, QCA_HDR_LEN);
 
        memmove(skb->data, skb->data + QCA_HDR_LEN, 2 * ETH_ALEN);
-       phdr = (u16 *)(skb->data + 2 * ETH_ALEN);
+       phdr = (__be16 *)(skb->data + 2 * ETH_ALEN);
 
        /* Set the version field, and set destination port information */
        hdr = QCA_HDR_VERSION << QCA_HDR_XMIT_VERSION_S |
@@ -54,8 +55,9 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
                                   struct packet_type *pt)
 {
        u8 ver;
+       u16  hdr;
        int port;
-       __be16 *phdr, hdr;
+       __be16 *phdr;
 
        if (unlikely(!pskb_may_pull(skb, QCA_HDR_LEN)))
                return NULL;