diff --git a/drivers/intel/e1000e/e1000e-3.8.7-zc/src/kcompat.h b/drivers/intel/e1000e/e1000e-3.8.7-zc/src/kcompat.h index 51811ab71f..49fc22c2fd 100644 --- a/drivers/intel/e1000e/e1000e-3.8.7-zc/src/kcompat.h +++ b/drivers/intel/e1000e/e1000e-3.8.7-zc/src/kcompat.h @@ -7461,6 +7461,20 @@ _kc_netif_napi_add(struct net_device *dev, struct napi_struct *napi, #endif +/*****************************************************************************/ +/* HAVE_PF_RING */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0)) + +#define HAVE_HW_TIME_STAMP +#define strlcpy(...) (void)(strscpy(__VA_ARGS__)) +static inline int pci_enable_pcie_error_reporting(struct pci_dev __always_unused *dev) +{ + return 0; +} +#define pci_disable_pcie_error_reporting(dev) do {} while (0) + +#endif + /*****************************************************************************/ #if RHEL_RELEASE_CODE && (RHEL_RELEASE_CODE > 0) #if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8,6)) diff --git a/drivers/intel/e1000e/e1000e-3.8.7-zc/src/netdev.c b/drivers/intel/e1000e/e1000e-3.8.7-zc/src/netdev.c index 898dabbe78..38c92cbfbb 100644 --- a/drivers/intel/e1000e/e1000e-3.8.7-zc/src/netdev.c +++ b/drivers/intel/e1000e/e1000e-3.8.7-zc/src/netdev.c @@ -7516,8 +7516,8 @@ static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) #if defined(SIOCSHWTSTAMP) && defined(HAVE_HW_TIME_STAMP) case SIOCSHWTSTAMP: return e1000e_hwtstamp_set(netdev, ifr); -#endif -#ifdef SIOCGHWTSTAMP +//#endif +//#ifdef SIOCGHWTSTAMP case SIOCGHWTSTAMP: return e1000e_hwtstamp_get(netdev, ifr); #endif