diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-10 21:11:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-10 21:11:16 +0200 |
| commit | 3b2b69efeca734b78bc85fd02253b0465bb2bec7 (patch) | |
| tree | 57fd8b5b0e9c04f24f5f9ec70ceb0a706cecfb47 /drivers/net/ethernet | |
| parent | Merge branch 'rtnetlink-fix-initial-rtnl-pushdown-fallout' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-3b2b69efeca734b78bc85fd02253b0465bb2bec7.tar.xz linux-3b2b69efeca734b78bc85fd02253b0465bb2bec7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.
Minor context conflict in bcmsysport statistics bug fix.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index bf9ca3c79d1a..b3a21418f511 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -457,6 +457,8 @@ static void bcm_sysport_get_stats(struct net_device *dev, else p = (char *)priv; + if (priv->is_lite && !bcm_sysport_lite_stat_valid(s->type)) + continue; p += s->stat_offset; if (s->stat_sizeof == sizeof(u64)) |