From: Florian Fainelli Date: Mon, 30 Mar 2020 21:38:51 +0000 (-0700) Subject: net: dsa: bcm_sf2: Check earlier for FLOW_EXT and FLOW_MAC_EXT X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5ae8c0d51ace3bdbfb89c27e7661f081cc9287de;p=openwrt%2Fstaging%2Fblogic.git net: dsa: bcm_sf2: Check earlier for FLOW_EXT and FLOW_MAC_EXT We do not currently support matching on FLOW_EXT or FLOW_MAC_EXT, but we were not checking for those bits being set in the flow specification. The check for FLOW_EXT and FLOW_MAC_EXT are separated out because a subsequent commit will add support for matching VLAN TCI which are covered by FLOW_EXT. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller --- diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c index f9785027c096..40ea88c304de 100644 --- a/drivers/net/dsa/bcm_sf2_cfp.c +++ b/drivers/net/dsa/bcm_sf2_cfp.c @@ -878,8 +878,9 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port, int ret = -EINVAL; /* Check for unsupported extensions */ - if ((fs->flow_type & FLOW_EXT) && (fs->m_ext.vlan_etype || - fs->m_ext.data[1])) + if ((fs->flow_type & FLOW_EXT) || + (fs->flow_type & FLOW_MAC_EXT) || + fs->m_ext.data[1]) return -EINVAL; if (fs->location != RX_CLS_LOC_ANY &&