]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: dsa: ksz: use common define for tag len
authorMichael Grzeschik <m.grzeschik@pengutronix.de>
Wed, 18 Dec 2019 16:01:39 +0000 (17:01 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Dec 2019 05:06:49 +0000 (21:06 -0800)
Remove special taglen define KSZ8795_INGRESS_TAG_LEN
and use generic KSZ_INGRESS_TAG_LEN instead.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dsa/tag_ksz.c

index 73605bcbb38511f065b7d1b432d5ec8761344c5f..90d055c4df9e80b16aaa5aeb303f8d8a9e31291f 100644 (file)
@@ -84,8 +84,6 @@ static struct sk_buff *ksz_common_rcv(struct sk_buff *skb,
  *       (eg, 0x00=port1, 0x02=port3, 0x06=port7)
  */
 
-#define KSZ8795_INGRESS_TAG_LEN                1
-
 #define KSZ8795_TAIL_TAG_OVERRIDE      BIT(6)
 #define KSZ8795_TAIL_TAG_LOOKUP                BIT(7)
 
@@ -96,12 +94,12 @@ static struct sk_buff *ksz8795_xmit(struct sk_buff *skb, struct net_device *dev)
        u8 *tag;
        u8 *addr;
 
-       nskb = ksz_common_xmit(skb, dev, KSZ8795_INGRESS_TAG_LEN);
+       nskb = ksz_common_xmit(skb, dev, KSZ_INGRESS_TAG_LEN);
        if (!nskb)
                return NULL;
 
        /* Tag encoding */
-       tag = skb_put(nskb, KSZ8795_INGRESS_TAG_LEN);
+       tag = skb_put(nskb, KSZ_INGRESS_TAG_LEN);
        addr = skb_mac_header(nskb);
 
        *tag = 1 << dp->index;
@@ -124,7 +122,7 @@ static const struct dsa_device_ops ksz8795_netdev_ops = {
        .proto  = DSA_TAG_PROTO_KSZ8795,
        .xmit   = ksz8795_xmit,
        .rcv    = ksz8795_rcv,
-       .overhead = KSZ8795_INGRESS_TAG_LEN,
+       .overhead = KSZ_INGRESS_TAG_LEN,
 };
 
 DSA_TAG_DRIVER(ksz8795_netdev_ops);