From: David S. Miller Date: Fri, 2 Oct 2015 01:24:12 +0000 (-0700) Subject: Merge branch 'bridge_vlan_cleanups_fixes' X-Git-Tag: MMI-PSA29.97-13-9~9125^2~240 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'bridge_vlan_cleanups_fixes' Nikolay Aleksandrov says: ==================== bridge: vlan: cleanups & fixes This is the first follow-up set, patch 01 reduces the default rhashtable size and the number of locks that can be allocated. Patch 02 and 04 fix possible null pointer dereferences due to the new ordering and initialization on port add/del, and patch 03 moves the "pvid" member in the net_bridge_vlan_group struct in order to simplify code (similar to how it was with the older struct). Patch 05 fixes adding a vlan on a port which is pvid and doesn't have a global context yet. Please review carefully, I think this is the first use of rhashtable's "locks_mul" member in the tree and I'd like to make sure it's correct. Another thing that needs special attention is the nbp_vlan_flush() move after the rx_handler unregister. ==================== Signed-off-by: David S. Miller --- 2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb