Skip to content

Commit

Permalink
net: dsa: ksz: use common define for tag len
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Grzeschik authored and David S. Miller committed Dec 21, 2019
1 parent f80742b commit 4249c50
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions net/dsa/tag_ksz.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit 4249c50

Please sign in to comment.