]> git.dujemihanovic.xyz Git - linux.git/commit
vlan: conditional inclusion of FCoE hooks to match netdevice.h and bnx2x
authorChris Leech <cleech@redhat.com>
Tue, 2 Apr 2019 22:06:12 +0000 (15:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 5 Apr 2019 00:18:34 +0000 (17:18 -0700)
commit0a89eb92d8c335da92bd5f54d8463b87dd440d45
treedfee9349f6c5377e78f0ba286af068d80f523a65
parent5ba578011702f7872509794e70b92ee12bcf433c
vlan: conditional inclusion of FCoE hooks to match netdevice.h and bnx2x

Way back in 3c9c36bcedd426f2be2826da43e5163de61735f7 the
ndo_fcoe_get_wwn pointer was switched from depending on CONFIG_FCOE to
CONFIG_LIBFCOE in order to allow building FCoE support into the bnx2x
driver and used by bnx2fc without including the generic software fcoe
module.

But, FCoE is generally used over an 802.1q VLAN, and the implementation
of ndo_fcoe_get_wwn in the 8021q module was not similarly changed.  The
result is that if CONFIG_FCOE is disabled, then bnz2fc cannot make a
call to ndo_fcoe_get_wwn through the 8021q interface to the underlying
bnx2x interface.  The bnx2fc driver then falls back to a potentially
different mapping of Ethernet MAC to Fibre Channel WWN, creating an
incompatibility with the fabric and target configurations when compared
to the WWNs used by pre-boot firmware and differently-configured
kernels.

So make the conditional inclusion of FCoE code in 8021q match the
conditional inclusion in netdevice.h

Signed-off-by: Chris Leech <cleech@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/8021q/vlan_dev.c