Skip to content

Build for Linux v6.17 and v6.18 #49

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
quitschbo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Build for Linux v6.17 and v6.18 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d37cf6c
kmod: igb_main: Add a parameter to report whether notification was sent
quitschbo Oct 21, 2025
5d242c6
kmod: igb_main: Switch/rename to timer_delete[_sync]()
quitschbo Oct 21, 2025
8bef55e
kmod: igb_ptp: Fix the lie that struct cyclecounter is const
quitschbo Oct 22, 2025
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
15 changes: 9 additions & 6 deletions kmod/igb_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1915,7 +1915,7 @@ void igb_down(struct igb_adapter *adapter)
and watchdog - performing required actions
before altering the adapter state and registers
*/
del_timer_sync(&adapter->watchdog_timer);
timer_delete_sync(&adapter->watchdog_timer);
cancel_work_sync(&adapter->watchdog_task);

/* signal that we're down so the interrupt handler does not
Expand Down Expand Up @@ -1947,8 +1947,8 @@ void igb_down(struct igb_adapter *adapter)
adapter->flags &= ~IGB_FLAG_NEED_LINK_UPDATE;

if (adapter->flags & IGB_FLAG_DETECT_BAD_DMA)
del_timer_sync(&adapter->dma_err_timer);
del_timer_sync(&adapter->phy_info_timer);
timer_delete_sync(&adapter->dma_err_timer);
timer_delete_sync(&adapter->phy_info_timer);

/* record the stats before reset*/
igb_update_stats(adapter);
Expand Down Expand Up @@ -2215,6 +2215,9 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
u16 vid,
#endif
u16 flags
#ifdef HAVE_NDO_FDB_ADD_NOTIFIED
, bool *notified
#endif
#ifdef HAVE_NDO_FDB_ADD_EXT_ACK
, struct netlink_ext_ack *extack
#endif
Expand Down Expand Up @@ -3260,10 +3263,10 @@ static void igb_remove(struct pci_dev *pdev)
* disable watchdog from being rescheduled.
*/
set_bit(__IGB_DOWN, &adapter->state);
del_timer_sync(&adapter->watchdog_timer);
timer_delete_sync(&adapter->watchdog_timer);
if (adapter->flags & IGB_FLAG_DETECT_BAD_DMA)
del_timer_sync(&adapter->dma_err_timer);
del_timer_sync(&adapter->phy_info_timer);
timer_delete_sync(&adapter->dma_err_timer);
timer_delete_sync(&adapter->phy_info_timer);

cancel_work_sync(&adapter->reset_task);
if (adapter->flags & IGB_FLAG_DETECT_BAD_DMA)
Expand Down
8 changes: 8 additions & 0 deletions kmod/igb_ptp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@
* SYSTIM read access for the 82576
*/

#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,17,0)
static u64 igb_ptp_read_82576(struct cyclecounter *cc)
#else
static cycle_t igb_ptp_read_82576(const struct cyclecounter *cc)
#endif
{
struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
struct e1000_hw *hw = &igb->hw;
Expand All @@ -113,7 +117,11 @@ static cycle_t igb_ptp_read_82576(const struct cyclecounter *cc)
* SYSTIM read access for the 82580
*/

#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,17,0)
static u64 igb_ptp_read_82580(struct cyclecounter *cc)
#else
static cycle_t igb_ptp_read_82580(const struct cyclecounter *cc)
#endif
{
struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
struct e1000_hw *hw = &igb->hw;
Expand Down
9 changes: 9 additions & 0 deletions kmod/kcompat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4809,4 +4809,13 @@ static inline void skb_frag_off_add(skb_frag_t *frag, int delta)
#define HAVE_FS_NO_LLSEEK
#endif /* 6.12.0 */

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,13,0))
#define HAVE_NDO_FDB_ADD_NOTIFIED
#endif /* 6.13.0 */

#if (LINUX_VERSION_CODE < KERNEL_VERSION(6,15,0))
#define timer_delete_sync(timer) del_timer_sync(timer)
#endif /* 6.15.0 */


#endif /* _KCOMPAT_H_ */