net: dsa: bcm_sf2: Fix IP fragment location and behavior

[ Upstream commit 7c3125f0a6ebc17846c5908ad7d6056d66c1c426 ]

The IP fragment is specified through user-defined field as the first
bit of the first user-defined word. We were previously trying to extract
it from the user-defined mask which could not possibly work. The ip_frag
is also supposed to be a boolean, if we do not cast it as such, we risk
overwriting the next fields in CFP_DATA(6) which would render the rule
inoperative.

Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c
index d264776..471837c 100644 (file)
--- a/drivers/net/dsa/bcm_sf2_cfp.c
+++ b/drivers/net/dsa/bcm_sf2_cfp.c
@@ -358,7 +358,7 @@ static int bcm_sf2_cfp_ipv4_rule_set(struct bcm_sf2_priv *priv, int port,
                return -EINVAL;
        }
 
-       ip_frag = be32_to_cpu(fs->m_ext.data[0]);
+       ip_frag = !!(be32_to_cpu(fs->h_ext.data[0]) & 1);
 
        /* Locate the first rule available */
        if (fs->location == RX_CLS_LOC_ANY)
@@ -569,7 +569,7 @@ static int bcm_sf2_cfp_rule_cmp(struct bcm_sf2_priv *priv, int port,
 
                if (rule->fs.flow_type != fs->flow_type ||
                    rule->fs.ring_cookie != fs->ring_cookie ||
-                   rule->fs.m_ext.data[0] != fs->m_ext.data[0])
+                   rule->fs.h_ext.data[0] != fs->h_ext.data[0])
                        continue;
 
                switch (fs->flow_type & ~FLOW_EXT) {
@@ -621,7 +621,7 @@ static int bcm_sf2_cfp_ipv6_rule_set(struct bcm_sf2_priv *priv, int port,
                return -EINVAL;
        }
 
-       ip_frag = be32_to_cpu(fs->m_ext.data[0]);
+       ip_frag = !!(be32_to_cpu(fs->h_ext.data[0]) & 1);
 
        layout = &udf_tcpip6_layout;
        slice_num = bcm_sf2_get_slice_number(layout, 0);