Merge branch 'bridge_vlan_fixes'
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 Nov 2015 20:40:11 +0000 (15:40 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Nov 2015 20:40:11 +0000 (15:40 -0500)
commit21086b990ba51d12670eba342eec76d4bba55d33
tree1a20ed79515da4b5b6c6c13e753d9e27a844c2c3
parentce1050089c969b96c797118f9cb0cf5a421ddc69
parentddd611d3fffb90b967e50f5aa6d45d55eb0e1d3f
Merge branch 'bridge_vlan_fixes'

Nikolay Aleksandrov says:

====================
bridge: vlan: failure path and comment fixes

This is a set from Ido which takes care of one failure path error in
nbp_vlan_init (patch 1) and a few comment errors (patch 2).
I must admit I didn't expect the port init continues after a vlan init
failure but should've checked to make sure. Thanks to Ido for catching
these!
====================

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