ixgbe: Correctly disable VLAN filter in promiscuous mode
authorVlad Yasevich <vyasevich@gmail.com>
Sat, 22 Nov 2014 07:52:52 +0000 (23:52 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 23 Nov 2014 19:26:12 +0000 (14:26 -0500)
commit4556dc591691fca743518edb24f15fbc83b5c8ef
treebbba198da10de1a0ca257817ed439640c103fcb8
parentb6fef4c6b8c1994ffe050dcdb9391427bf0d9882
ixgbe: Correctly disable VLAN filter in promiscuous mode

IXGBE adapter seems to require that VLAN filtering be enabled if
VMDQ or SRIOV are enabled.  When those functions are disabled,
VLAN filtering may be disabled in promiscuous mode.

Prior to commit a9b8943ee129 ("ixgbe: remove vlan_filter_disable
and enable functions")

The logic was correct.  However, after the commit the logic
got reversed and VLAN filtered in now turned on when VMDQ/SRIOV
is disabled.

This patch changes the condition to enable hw vlan filtered
when VMDQ or SRIOV is enabled.

Fixes: a9b8943ee129 ("ixgbe: remove vlan_filter_disable and enable functions")
Cc: stable <stable@vger.kernel.org>
CC: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
Acked-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c