]> www.infradead.org Git - users/jedix/linux-maple.git/commit
ixgbe: fix flags relating to perfect filters to support coexistence
authorAlexander Duyck <alexander.h.duyck@intel.com>
Fri, 20 May 2011 07:36:17 +0000 (07:36 +0000)
committerJoe Jin <joe.jin@oracle.com>
Fri, 3 Feb 2012 01:13:21 +0000 (09:13 +0800)
commit1976cfcf1925a571a20fe891a8a4d2f4c5be95b9
tree742cc3629435778f3bab2a775f5e81d895346dd4
parent61b336d7339c90794a5d7012b9f19936c064bc3e
ixgbe: fix flags relating to perfect filters to support coexistence

I am removing the requirement that Ntuple filters have the same
number of queues and requirements as ATR.  As a result this change will
make it so that all the Ntuple flag does is disable ATR for now.

This change fixes an issue in which we were incorrectly re-enabling ATR
when we exited perfect filter mode.  This was due to the fact that the
logic assumed RSS and DCB were mutually exclusive which is no longer the
case.

To correct this we just need to add a check to guarantee DCB is disabled
before re-enabling ATR.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 03ecf91aae757eeb70763a3393227c4597c87b23)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/ixgbe/ixgbe_dcb_nl.c
drivers/net/ixgbe/ixgbe_ethtool.c
drivers/net/ixgbe/ixgbe_main.c