mlx4: do vlan cleanup

- unify vlan and nonvlan path
- kill priv->vlgrp and mlx4_en_vlan_rx_register

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/mlx4/en_netdev.c
Simple merge

diff --cc drivers/net/mlx4/en_port.c
Simple merge

diff --cc drivers/net/mlx4/en_rx.c
Simple merge

diff --cc drivers/net/mlx4/mlx4_en.h
Simple merge