tree 72e93abc50fa837e1e73b0a4601c84ef5ebe10a8
parent fb36938de4d61d7a06c08054d0a0f885a4fd2f3c
parent 61ba1a2da9693b88bf5f2bb8e7a99a29cd139122
author David S. Miller <davem@davemloft.net> 1471587522 -0700
committer David S. Miller <davem@davemloft.net> 1471587522 -0700

Merge branch 'bridge-vlan-stats-with-flags'

Nikolay Aleksandrov says:

====================
net: bridge: export vlan stats per-port with flags

This set adds the ability to export vlan stats per-port. Patch 01 makes
that possible by consolidating the bridge and port linkxstats calls. Then
patch 02 allows to dump the vlan entry flags in order to be able to
distinguish between bridge and port vlan entries when dumping the master
device vlan stats. That is needed because that call was implemented when
the stats API didn't have slave dumping capabilities and it dumps all vlan
stats (for both bridge and port entries). We also need it in order to print
the vlan flags when dumping the stats.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>