diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-11-25 16:23:02 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-11-25 16:23:02 +0000 |
| commit | 098e7156fe030ed92090d206ef6c72fd5d47347e (patch) | |
| tree | 25c382d027d3806ad4eea0929744ccbf9f374d42 | |
| parent | 2cf006968c81ff8c2e6a4bff79bc23e63d9eb944 (diff) | |
| download | upstream-098e7156fe030ed92090d206ef6c72fd5d47347e.tar.gz upstream-098e7156fe030ed92090d206ef6c72fd5d47347e.tar.bz2 upstream-098e7156fe030ed92090d206ef6c72fd5d47347e.zip | |
AA: generic: ar8216: fix port number check in 'ar8xxx_mib_work_func'
Backport of r34283.
Also add a WARN_ON to 'ar8216_mib_fetch_port_stat'
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34371 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/ar8216.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index 8fc1f4b37e..6187d523ab 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -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); |