diff options
author | Jakub Kicinski <kubakici@wp.pl> | 2015-08-11 20:41:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-12 17:47:05 -0400 |
commit | a898fe040f62a32b90e26dc1f1b5973608054b29 (patch) | |
tree | fad2943f4ea6c8d2d5fa72a0b4597308ed4dad73 | |
parent | b02e3e948de6c11fded1821d89012e24d953da12 (diff) |
gianfar: correct filer table writing
MAX_FILER_IDX is the last usable index. Using less-than
will already guarantee that one entry for catch-all rule
will be left, no need to subtract 1 here.
Signed-off-by: Jakub Kicinski <kubakici@wp.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/freescale/gianfar_ethtool.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c index 3c0a8f825b63..4a710f3eb5eb 100644 --- a/drivers/net/ethernet/freescale/gianfar_ethtool.c +++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c | |||
@@ -1583,11 +1583,10 @@ static int gfar_write_filer_table(struct gfar_private *priv, | |||
1583 | return -EBUSY; | 1583 | return -EBUSY; |
1584 | 1584 | ||
1585 | /* Fill regular entries */ | 1585 | /* Fill regular entries */ |
1586 | for (; i < MAX_FILER_IDX - 1 && (tab->fe[i].ctrl | tab->fe[i].prop); | 1586 | for (; i < MAX_FILER_IDX && (tab->fe[i].ctrl | tab->fe[i].prop); i++) |
1587 | i++) | ||
1588 | gfar_write_filer(priv, i, tab->fe[i].ctrl, tab->fe[i].prop); | 1587 | gfar_write_filer(priv, i, tab->fe[i].ctrl, tab->fe[i].prop); |
1589 | /* Fill the rest with fall-troughs */ | 1588 | /* Fill the rest with fall-troughs */ |
1590 | for (; i < MAX_FILER_IDX - 1; i++) | 1589 | for (; i < MAX_FILER_IDX; i++) |
1591 | gfar_write_filer(priv, i, 0x60, 0xFFFFFFFF); | 1590 | gfar_write_filer(priv, i, 0x60, 0xFFFFFFFF); |
1592 | /* Last entry must be default accept | 1591 | /* Last entry must be default accept |
1593 | * because that's what people expect | 1592 | * because that's what people expect |