Skip to content

Commit 64b0d2e

Browse files
vladimirolteankuba-moo
authored andcommitted
net: dsa: tag_yt921x: use the dsa_xmit_port_mask() helper
The "yt921x" tagging protocol populates a bit mask for the TX ports, so we can use dsa_xmit_port_mask() to centralize the decision of how to set that field. Cc: David Yang <mmyangfl@gmail.com> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Link: https://patch.msgid.link/20251127120902.292555-16-vladimir.oltean@nxp.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 2409938 commit 64b0d2e

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

net/dsa/tag_yt921x.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,11 @@
3838
#define YT921X_TAG_RX_CMD_FORWARDED 0x80
3939
#define YT921X_TAG_RX_CMD_UNK_UCAST 0xb2
4040
#define YT921X_TAG_RX_CMD_UNK_MCAST 0xb4
41-
#define YT921X_TAG_TX_PORTS_M GENMASK(10, 0)
42-
#define YT921X_TAG_TX_PORTn(port) BIT(port)
41+
#define YT921X_TAG_TX_PORTS GENMASK(10, 0)
4342

4443
static struct sk_buff *
4544
yt921x_tag_xmit(struct sk_buff *skb, struct net_device *netdev)
4645
{
47-
struct dsa_port *dp = dsa_user_to_port(netdev);
48-
unsigned int port = dp->index;
4946
__be16 *tag;
5047
u16 tx;
5148

@@ -58,7 +55,8 @@ yt921x_tag_xmit(struct sk_buff *skb, struct net_device *netdev)
5855
/* VLAN tag unrelated when TX */
5956
tag[1] = 0;
6057
tag[2] = 0;
61-
tx = YT921X_TAG_PORT_EN | YT921X_TAG_TX_PORTn(port);
58+
tx = FIELD_PREP(YT921X_TAG_TX_PORTS, dsa_xmit_port_mask(skb, netdev)) |
59+
YT921X_TAG_PORT_EN;
6260
tag[3] = htons(tx);
6361

6462
return skb;

0 commit comments

Comments
 (0)