packages/i40e
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove ptp_system_timestamp for fix build failure

Browse Source
This commit is contained in:
chengyechun 2023-11-24 10:27:30 +08:00
parent c8e2467038
commit 579feafc82
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
backport-remove-ptp_system_timestamp-for-fix-build-failure.patch Normal file
View File

@ -0,0 +1,43 @@
From 6943a3815c6384baa20c72e860f47c29e1932e45 Mon Sep 17 00:00:00 2001
From: e1000-devel <e1000-devel@lists.sf.net>
Date: Fri, 6 Oct 2023 16:14:53 +0200
Subject: [PATCH] remove ptp_system_timestamp for fix build failure
Conflict:NA
Reference:https://github.com/dmarion/i40e/commit/6943a3815c6384baa20c72e860f47c29e1932e45
---
src/kcompat.h | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/src/kcompat.h b/src/kcompat.h
index 8a2d5e0..7a0a66e 100644
--- a/src/kcompat.h
+++ b/src/kcompat.h
@@ -6936,23 +6936,6 @@ _kc_dev_change_flags(struct net_device *netdev, unsigned int flags,
RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8,0)) || \
(RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8,1)))
#define HAVE_PTP_SYS_OFFSET_EXTENDED_IOCTL
-#else /* RHEL >= 7.7 && RHEL < 8.0 || RHEL >= 8.1 */
-struct ptp_system_timestamp {
- struct timespec64 pre_ts;
- struct timespec64 post_ts;
-};
-
-static inline void
-ptp_read_system_prets(struct ptp_system_timestamp __always_unused *sts)
-{
- ;
-}
-
-static inline void
-ptp_read_system_postts(struct ptp_system_timestamp __always_unused *sts)
-{
- ;
-}
#endif /* !(RHEL >= 7.7 && RHEL != 8.0) */
#if (RHEL_RELEASE_CODE && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8,1)))
#define HAVE_NDO_BRIDGE_SETLINK_EXTACK
--
2.23.0

12
i40e.spec
View File

@ -9,12 +9,14 @@
Name: i40e
Summary: Intel(R) 40-10 Gigabit Ethernet Connection Network Driver
Version: 2.14.13
Release: 3
Release: 4
Vendor: Intel Corporation
License: GPL-2.0
URL: http://support.intel.com
Source0: https://downloadcenter.intel.com/download/24411/Intel-Network-Adapter-Driver-for-PCIe-40-Gigabit-Ethernet-Network-Connections-Under-Linux-/%{name}-%{version}.tar.gz
Patch6000: backport-remove-ptp_system_timestamp-for-fix-build-failure.patch
Requires: kernel, findutils, gawk, bash hwdata
BuildRequires: kernel-devel hwdata elfutils-devel uname-build-checks
@ -23,7 +25,7 @@ BuildRequires: kernel-devel hwdata elfutils-devel uname-build-checks
This package contains the Intel(R) 40-10 Gigabit Ethernet Connection Network Driver.
%prep
%setup
%autosetup -n %{name}-%{version} -p1
%build
make -C src clean
@ -381,6 +383,12 @@ else
fi
%changelog
* Thu Nov 23 2023 chengyechun <chengyechun1@huawei.com> - 2.14.13-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:remove ptp_system_timestamp for fix build failure
* Fri Oct 13 2023 chengyechun <chengyechun1@huawei.com> - 2.14.13-3
- Type:bugfix
- ID:NA