Fix igb compilation on centos7

ntop · Sep 29, 2023 · 269fcd8 · 269fcd8
1 parent 36f7756
commit 269fcd8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/drivers/intel/igb/igb-5.14.16-zc/src/igb_ptp.c b/drivers/intel/igb/igb-5.14.16-zc/src/igb_ptp.c
@@ -249,7 +249,7 @@ static int igb_ptp_adjfreq_82576(struct ptp_clock_info *ptp, s32 ppb)
 	 *    scaled_ppm = ppb * 2^13 / 125
 	 */
 	scaled_ppm = ((long)ppb << 13) / 125;
-	return ixgbe_ptp_adjfine_82576(info, scaled_ppm);
+	return igb_ptp_adjfine_82576(ptp, scaled_ppm);
 }
 #endif /* HAVE_PTP_CLOCK_INFO_ADJFINE */
 
@@ -317,7 +317,7 @@ static int igb_ptp_adjfreq_82580(struct ptp_clock_info *ptp, s32 ppb)
 	 *    scaled_ppm = ppb * 2^13 / 125
 	 */
 	scaled_ppm = ((long)ppb << 13) / 125;
-	return igb_ptp_adjfine_82580(info, scaled_ppm);
+	return igb_ptp_adjfine_82580(ptp, scaled_ppm);
 }
 #endif /* HAVE_PTP_CLOCK_INFO_ADJFINE */
 

diff --git a/drivers/intel/igb/igb-5.14.16-zc/src/kcompat_gcc.h b/drivers/intel/igb/igb-5.14.16-zc/src/kcompat_gcc.h
@@ -73,20 +73,19 @@
 
 #undef STATIC_KEY_INIT_TRUE
 
-	{ .enabled = { 1 },					\
-	  { .type = 1UL } }
+//	{ .enabled = { 1 }, { .type = 1UL } }
 
 #undef STATIC_KEY_INIT_FALSE
 
-	{ .enabled = { 0 } }
+//	{ .enabled = { 0 } }
 
 #undef STATIC_KEY_TRUE_INIT
 
-	/* (struct static_key_true) */ { .key = STATIC_KEY_INIT_TRUE }
+//	/* (struct static_key_true) */ { .key = STATIC_KEY_INIT_TRUE }
 
 #undef STATIC_KEY_FALSE_INIT
 
-	/* (struct static_key_false) */ { .key = STATIC_KEY_INIT_FALSE }
+//	/* (struct static_key_false) */ { .key = STATIC_KEY_INIT_FALSE }
 
 #ifdef HAVE_JUMP_LABEL
 /* dd_key_init() is used (indirectly) with arg like "(STATIC_KEY_INIT_FALSE)"