From: Vladimir Oltean Date: Thu, 27 Nov 2025 12:08:54 +0000 (+0200) Subject: net: dsa: tag_mxl_gsw1xx: use the dsa_xmit_port_mask() helper X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4a00d9e365a99188e40153b5672d184649eb14e;p=thirdparty%2Fkernel%2Flinux.git 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 Cc: Daniel Golle Signed-off-by: Vladimir Oltean Link: https://patch.msgid.link/20251127120902.292555-8-vladimir.oltean@nxp.com Signed-off-by: Jakub Kicinski --- diff --git a/net/dsa/tag_mxl-gsw1xx.c b/net/dsa/tag_mxl-gsw1xx.c index 701a079955f2e..60f7c445e6561 100644 --- a/net/dsa/tag_mxl-gsw1xx.c +++ b/net/dsa/tag_mxl-gsw1xx.c @@ -43,8 +43,8 @@ static struct sk_buff *gsw1xx_tag_xmit(struct sk_buff *skb, struct net_device *dev) { - struct dsa_port *dp = dsa_user_to_port(dev); __be16 *gsw1xx_tag; + u16 tag; /* provide additional space 'GSW1XX_HEADER_LEN' bytes */ skb_push(skb, GSW1XX_HEADER_LEN); @@ -55,9 +55,10 @@ static struct sk_buff *gsw1xx_tag_xmit(struct sk_buff *skb, /* special tag ingress */ gsw1xx_tag = dsa_etype_header_pos_tx(skb); gsw1xx_tag[0] = htons(ETH_P_MXLGSW); - gsw1xx_tag[1] = htons(GSW1XX_TX_PORT_MAP_EN | GSW1XX_TX_LRN_DIS | - FIELD_PREP(GSW1XX_TX_PORT_MAP, BIT(dp->index))); + tag = FIELD_PREP(GSW1XX_TX_PORT_MAP, dsa_xmit_port_mask(skb, dev)) | + GSW1XX_TX_PORT_MAP_EN | GSW1XX_TX_LRN_DIS; + gsw1xx_tag[1] = htons(tag); gsw1xx_tag[2] = 0; gsw1xx_tag[3] = 0;