Skip to content

Commit 1040bc6

Browse files
committed
Fix compilation on kernel 7
1 parent 8d2df4c commit 1040bc6

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

drivers/intel/ixgbe/ixgbe-5.19.6-zc/src/kcompat_impl.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,6 +1091,11 @@ _kc_xsk_buff_dma_sync_for_cpu(struct xdp_buff *xdp,
10911091
#endif /* HAVE_MEM_TYPE_XSK_BUFF_POOL */
10921092
#endif /* NEED_XSK_BUFF_DMA_SYNC_FOR_CPU */
10931093

1094+
#ifdef NEED_NAPI_ALLOC_SKB_NO_GFP
1095+
/* __napi_alloc_skb() removed in kernel 7.x */
1096+
#define __napi_alloc_skb(napi, len, gfp) napi_alloc_skb(napi, len)
1097+
#endif /* NEED_NAPI_ALLOC_SKB_NO_GFP */
1098+
10941099
#ifdef NEED_XSK_BUFF_POOL_RENAME
10951100
#define XDP_SETUP_XSK_POOL XDP_SETUP_XSK_UMEM
10961101
#define xsk_get_pool_from_qid xdp_get_umem_from_qid

drivers/intel/ixgbe/ixgbe-5.19.6-zc/src/kcompat_std_defs.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,4 +269,12 @@
269269
#define HAVE_TTY_TERMIOS_CONST_STRUCT
270270
#endif /* 6.1.0 */
271271

272+
/*****************************************************************************/
273+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7,0,0))
274+
/* __napi_alloc_skb() was removed; use napi_alloc_skb() instead */
275+
#define NEED_NAPI_ALLOC_SKB_NO_GFP
276+
/* xsk_buff_dma_sync_for_cpu() dropped the pool argument */
277+
#define NEED_XSK_BUFF_DMA_SYNC_FOR_CPU
278+
#endif /* 7.0.0 */
279+
272280
#endif /* _KCOMPAT_STD_DEFS_H_ */

0 commit comments

Comments
 (0)