vlan: conditional inclusion of FCoE hooks to match netdevice.h and bnx2x
Subsystems (2)
PATCH 1/1 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
--- net/8021q/vlan_dev.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
net/8021q/vlan_dev.c +16 -12
@@ -443,17 +443,6 @@ static int vlan_dev_fcoe_disable(struct net_device *dev)return rc; } -static int vlan_dev_fcoe_get_wwn (struct net_device *dev,u64 *wwn,int type) -{ -struct net_device *real_dev =vlan_dev_priv (dev)->real_dev; -const struct net_device_ops *ops = real_dev->netdev_ops; -int rc = -EINVAL ; - -if (ops->ndo_fcoe_get_wwn) - rc = ops->ndo_fcoe_get_wwn (real_dev, wwn, type); -return rc; -} -static int vlan_dev_fcoe_ddp_target (struct net_device *dev,u16 xid,struct scatterlist *sgl,unsigned int sgc) {
@@ -468,6 +457,19 @@ static int vlan_dev_fcoe_ddp_target(struct net_device *dev, u16 xid, }#endif +#ifdef NETDEV_FCOE_WWNN +static int vlan_dev_fcoe_get_wwn (struct net_device *dev,u64 *wwn,int type) +{ +struct net_device *real_dev =vlan_dev_priv (dev)->real_dev; +const struct net_device_ops *ops = real_dev->netdev_ops; +int rc = -EINVAL ; + +if (ops->ndo_fcoe_get_wwn) + rc = ops->ndo_fcoe_get_wwn (real_dev, wwn, type); +return rc; +} +#endif +static void vlan_dev_change_rx_flags (struct net_device *dev,int change) {struct net_device *real_dev =vlan_dev_priv (dev)->real_dev;
@@ -794,9 +796,11 @@ static const struct net_device_ops vlan_netdev_ops = { .ndo_fcoe_ddp_done = vlan_dev_fcoe_ddp_done, .ndo_fcoe_enable = vlan_dev_fcoe_enable, .ndo_fcoe_disable = vlan_dev_fcoe_disable, - .ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn, .ndo_fcoe_ddp_target = vlan_dev_fcoe_ddp_target,#endif +#ifdef NETDEV_FCOE_WWNN + .ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn, +#endif #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = vlan_dev_poll_controller, .ndo_netpoll_setup = vlan_dev_netpoll_setup,
Signature · 1 line
2.17.2
From: Chris Leech <[email protected]>
Date: Tue, 2 Apr 2019 15:06:12 -0700
Quoted 16 lines
Way back in
3c9c36bcedd426f2be2826da43e5163de61735f7thendo_fcoe_get_wwnpointer was switched from depending onCONFIG_FCOEtoCONFIG_LIBFCOEin 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_wwnin the 8021q module was not similarly changed. The result is that ifCONFIG_FCOEis disabled, then bnz2fc cannot make a call tondo_fcoe_get_wwnthrough 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.
Quoted 4 lines
So make the conditional inclusion of FCoE code in 8021q match the conditional inclusion in
netdevice.hSigned-off-by Chris Leech <[email protected]>
Applied, thanks Chris.