diff --git a/src/ixgbe_dcb_nl.c b/src/ixgbe_dcb_nl.c index f964ff5..00b9d2c 100644 --- a/src/ixgbe_dcb_nl.c +++ b/src/ixgbe_dcb_nl.c @@ -353,7 +353,7 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) #endif #if IS_ENABLED(CONFIG_FCOE) - if (adapter->netdev->features & NETIF_F_FCOE_MTU) + if (adapter->netdev->features & netdev->fcoe_mtu) max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE); #endif diff --git a/src/ixgbe_fcoe.c b/src/ixgbe_fcoe.c index 207040a..bdaf253 100644 --- a/src/ixgbe_fcoe.c +++ b/src/ixgbe_fcoe.c @@ -892,7 +892,7 @@ int ixgbe_fcoe_enable(struct net_device *netdev) /* enable FCoE and notify stack */ adapter->flags |= IXGBE_FLAG_FCOE_ENABLED; - netdev->features |= NETIF_F_FCOE_MTU; + netdev->features |= netdev->fcoe_mtu; netdev_features_change(netdev); /* release existing queues and reallocate them */ @@ -932,7 +932,7 @@ int ixgbe_fcoe_disable(struct net_device *netdev) /* disable FCoE and notify stack */ adapter->flags &= ~IXGBE_FLAG_FCOE_ENABLED; - netdev->features &= ~NETIF_F_FCOE_MTU; + netdev->features &= ~netdev->fcoe_mtu; netdev_features_change(netdev); diff --git a/src/ixgbe_main.c b/src/ixgbe_main.c index 5bd35bd..a0702bf 100644 --- a/src/ixgbe_main.c +++ b/src/ixgbe_main.c @@ -6632,7 +6632,7 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter) } #if IS_ENABLED(CONFIG_FCOE) - if (netdev->features & NETIF_F_FCOE_MTU) + if (netdev->features & netdev->fcoe_mtu) max_frame = max_t(int, max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE); #endif /* CONFIG_FCOE */ @@ -6837,7 +6837,7 @@ static int ixgbe_hpbthresh(struct ixgbe_adapter *adapter, int pb) #if IS_ENABLED(CONFIG_FCOE) /* FCoE traffic class uses FCOE jumbo frames */ - if ((dev->features & NETIF_F_FCOE_MTU) && + if ((dev->features & dev->fcoe_mtu) && (tc < IXGBE_FCOE_JUMBO_FRAME_SIZE) && (pb == netdev_get_prio_tc_map(dev, adapter->fcoe.up))) tc = IXGBE_FCOE_JUMBO_FRAME_SIZE; @@ -6900,7 +6900,7 @@ static int ixgbe_lpbthresh(struct ixgbe_adapter *adapter, int __maybe_unused pb) #if IS_ENABLED(CONFIG_FCOE) /* FCoE traffic class uses FCOE jumbo frames */ - if ((dev->features & NETIF_F_FCOE_MTU) && + if ((dev->features & dev->fcoe_mtu) && (tc < IXGBE_FCOE_JUMBO_FRAME_SIZE) && (pb == netdev_get_prio_tc_map(dev, adapter->fcoe.up))) tc = IXGBE_FCOE_JUMBO_FRAME_SIZE; @@ -14310,7 +14310,7 @@ static int ixgbe_probe(struct pci_dev *pdev, #ifndef HAVE_NETDEV_OPS_FCOE_ENABLE ixgbe_fcoe_ddp_enable(adapter); adapter->flags |= IXGBE_FLAG_FCOE_ENABLED; - netdev->features |= NETIF_F_FCOE_MTU; + netdev->features |= netdev->fcoe_mtu; #endif /* HAVE_NETDEV_OPS_FCOE_ENABLE */ } @@ -14320,7 +14320,7 @@ static int ixgbe_probe(struct pci_dev *pdev, #ifdef HAVE_NETDEV_VLAN_FEATURES netdev->vlan_features |= NETIF_F_FSO | NETIF_F_FCOE_CRC | - NETIF_F_FCOE_MTU; + netdev->fcoe_mtu; #endif /* HAVE_NETDEV_VLAN_FEATURES */ } #endif /* NETIF_F_FSO */ diff --git a/src/ixgbe_sriov.c b/src/ixgbe_sriov.c index cb9ebd7..d5730c8 100644 --- a/src/ixgbe_sriov.c +++ b/src/ixgbe_sriov.c @@ -534,7 +534,7 @@ static int ixgbe_set_vf_lpe(struct ixgbe_adapter *adapter, u32 max_frame, u32 vf s32 err = 0; #if IS_ENABLED(CONFIG_FCOE) - if (dev->features & NETIF_F_FCOE_MTU) + if (dev->features & dev->fcoe_mtu) pf_max_frame = max_t(int, pf_max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE); #endif /* CONFIG_FCOE */ @@ -1888,7 +1888,7 @@ static void ixgbe_set_vf_rx_tx(struct ixgbe_adapter *adapter, int vf) int pf_max_frame = dev->mtu + ETH_HLEN; #if IS_ENABLED(CONFIG_FCOE) - if (dev->features & NETIF_F_FCOE_MTU) + if (dev->features & dev->fcoe_mtu) pf_max_frame = max_t(int, pf_max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE); #endif /* CONFIG_FCOE */