Skip to content

Fixed building intel-ixgbe driver for Linux kernel 6.12.10 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GermanAizek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed building intel-ixgbe driver for Linux kernel 6.12.10 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ixgbe_dcb_nl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/ixgbe_fcoe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);

Expand Down
10 changes: 5 additions & 5 deletions src/ixgbe_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 */
}

Expand All @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions src/ixgbe_sriov.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down