AA: generic: ar8216: fix port number check in 'ar8xxx_mib_work_func'
authorGabor Juhos <juhosg@openwrt.org>
Sun, 25 Nov 2012 16:23:02 +0000 (16:23 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Sun, 25 Nov 2012 16:23:02 +0000 (16:23 +0000)
Backport of r34283.

Also add a WARN_ON to 'ar8216_mib_fetch_port_stat'

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34371

target/linux/generic/files/drivers/net/phy/ar8216.c

index 8fc1f4b37e62b212294665e7f6c40e9bffbae3ec..6187d523ab61efe1cd875683e80dedca9a7de4bc 100644 (file)
@@ -425,6 +425,8 @@ ar8216_mib_fetch_port_stat(struct ar8216_priv *priv, int port, bool flush)
        u64 *mib_stats;
        int i;
 
+       WARN_ON(port >= priv->dev.ports);
+
        lockdep_assert_held(&priv->mib_lock);
 
        if (chip_is_ar8327(priv))
@@ -1710,7 +1712,7 @@ ar8xxx_mib_work_func(struct work_struct *work)
 
 next_port:
        priv->mib_next_port++;
-       if (priv->mib_next_port > priv->dev.ports)
+       if (priv->mib_next_port >= priv->dev.ports)
                priv->mib_next_port = 0;
 
        mutex_unlock(&priv->mib_lock);