| From 4556dc591691fca743518edb24f15fbc83b5c8ef Mon Sep 17 00:00:00 2001 |
| From: Vlad Yasevich <vyasevich@gmail.com> |
| Date: Fri, 21 Nov 2014 23:52:52 -0800 |
| Subject: ixgbe: Correctly disable VLAN filter in promiscuous mode |
| |
| From: Vlad Yasevich <vyasevich@gmail.com> |
| |
| commit 4556dc591691fca743518edb24f15fbc83b5c8ef upstream. |
| |
| 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: 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |
| +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |
| @@ -4059,8 +4059,8 @@ void ixgbe_set_rx_mode(struct net_device |
| * if SR-IOV and VMDQ are disabled - otherwise ensure |
| * that hardware VLAN filters remain enabled. |
| */ |
| - if (!(adapter->flags & (IXGBE_FLAG_VMDQ_ENABLED | |
| - IXGBE_FLAG_SRIOV_ENABLED))) |
| + if (adapter->flags & (IXGBE_FLAG_VMDQ_ENABLED | |
| + IXGBE_FLAG_SRIOV_ENABLED)) |
| vlnctrl |= (IXGBE_VLNCTRL_VFE | IXGBE_VLNCTRL_CFIEN); |
| } else { |
| if (netdev->flags & IFF_ALLMULTI) { |