Message ID | 20240909134301.75448-1-vtpieter@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 3f464b193d40e49299dcd087b10cc3b77cbbea68 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next,1/1] net: dsa: microchip: update tag_ksz masks for KSZ9477 family | expand |
On 9/9/24 06:42, vtpieter@gmail.com wrote: > From: Pieter Van Trappen <pieter.van.trappen@cern.ch> > > Remove magic number 7 by introducing a GENMASK macro instead. > Remove magic number 0x80 by using the BIT macro instead. > > Signed-off-by: Pieter Van Trappen <pieter.van.trappen@cern.ch> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 9 Sep 2024 15:42:59 +0200 you wrote: > From: Pieter Van Trappen <pieter.van.trappen@cern.ch> > > Remove magic number 7 by introducing a GENMASK macro instead. > Remove magic number 0x80 by using the BIT macro instead. > > Signed-off-by: Pieter Van Trappen <pieter.van.trappen@cern.ch> > > [...] Here is the summary with links: - [net-next,1/1] net: dsa: microchip: update tag_ksz masks for KSZ9477 family https://git.kernel.org/netdev/net-next/c/3f464b193d40 You are awesome, thank you!
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c index 1f46de394f2e..281bbac5539d 100644 --- a/net/dsa/tag_ksz.c +++ b/net/dsa/tag_ksz.c @@ -178,8 +178,9 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ8795, KSZ8795_NAME); #define KSZ9477_INGRESS_TAG_LEN 2 #define KSZ9477_PTP_TAG_LEN 4 -#define KSZ9477_PTP_TAG_INDICATION 0x80 +#define KSZ9477_PTP_TAG_INDICATION BIT(7) +#define KSZ9477_TAIL_TAG_EG_PORT_M GENMASK(2, 0) #define KSZ9477_TAIL_TAG_PRIO GENMASK(8, 7) #define KSZ9477_TAIL_TAG_OVERRIDE BIT(9) #define KSZ9477_TAIL_TAG_LOOKUP BIT(10) @@ -312,7 +313,7 @@ static struct sk_buff *ksz9477_rcv(struct sk_buff *skb, struct net_device *dev) { /* Tag decoding */ u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN; - unsigned int port = tag[0] & 7; + unsigned int port = tag[0] & KSZ9477_TAIL_TAG_EG_PORT_M; unsigned int len = KSZ_EGRESS_TAG_LEN; /* Extra 4-bytes PTP timestamp */