Skip to content

Commit a4a00d9

Browse files
vladimirolteankuba-moo
authored andcommitted
net: dsa: tag_mxl_gsw1xx: use the dsa_xmit_port_mask() helper
The "gsw1xx" 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: Hauke Mehrtens <hauke@hauke-m.de> Cc: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Link: https://patch.msgid.link/20251127120902.292555-8-vladimir.oltean@nxp.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 84a60bb commit a4a00d9

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

net/dsa/tag_mxl-gsw1xx.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
static struct sk_buff *gsw1xx_tag_xmit(struct sk_buff *skb,
4444
struct net_device *dev)
4545
{
46-
struct dsa_port *dp = dsa_user_to_port(dev);
4746
__be16 *gsw1xx_tag;
47+
u16 tag;
4848

4949
/* provide additional space 'GSW1XX_HEADER_LEN' bytes */
5050
skb_push(skb, GSW1XX_HEADER_LEN);
@@ -55,9 +55,10 @@ static struct sk_buff *gsw1xx_tag_xmit(struct sk_buff *skb,
5555
/* special tag ingress */
5656
gsw1xx_tag = dsa_etype_header_pos_tx(skb);
5757
gsw1xx_tag[0] = htons(ETH_P_MXLGSW);
58-
gsw1xx_tag[1] = htons(GSW1XX_TX_PORT_MAP_EN | GSW1XX_TX_LRN_DIS |
59-
FIELD_PREP(GSW1XX_TX_PORT_MAP, BIT(dp->index)));
6058

59+
tag = FIELD_PREP(GSW1XX_TX_PORT_MAP, dsa_xmit_port_mask(skb, dev)) |
60+
GSW1XX_TX_PORT_MAP_EN | GSW1XX_TX_LRN_DIS;
61+
gsw1xx_tag[1] = htons(tag);
6162
gsw1xx_tag[2] = 0;
6263
gsw1xx_tag[3] = 0;
6364

0 commit comments

Comments
 (0)