Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelbump.git;a=commitdiff;h=ce19d07627010aa190554d93448c5372dc0b7426
commit ce19d07627010aa190554d93448c5372dc0b7426 Author: DeX77 <[email protected]> Date: Wed Jan 31 10:12:25 2018 +0100 e1000e-3.4.0.2-13-x86_64 * fix build with kernel 4.15 diff --git a/source/network-extra/e1000e/FrugalBuild b/source/network-extra/e1000e/FrugalBuild index ccc74e6..18c3551 100644 --- a/source/network-extra/e1000e/FrugalBuild +++ b/source/network-extra/e1000e/FrugalBuild @@ -10,7 +10,9 @@ groups=('network-extra') _F_sourceforge_dirname="e1000" _F_sourceforge_rss_limit=100 Finclude sourceforge kernel-module -sha1sums=('5d538b0296181e02b97201d60fe4b897d8adf6e2') +source+=(timers.patch) +sha1sums=('5d538b0296181e02b97201d60fe4b897d8adf6e2' \ + '2be39a4cac8f22cfb0a0ef17f1d293f2d7e2aced') options+=('nostrip') _F_cd_path="$pkgname-$pkgver/src" diff --git a/source/network-extra/e1000e/timers.patch b/source/network-extra/e1000e/timers.patch new file mode 100644 index 0000000..a10c25b --- /dev/null +++ b/source/network-extra/e1000e/timers.patch @@ -0,0 +1,42 @@ +--- src/netdev.c 2017-10-23 07:42:32.000000000 +0200 ++++ src/netdev.c 2018-01-31 10:09:59.937716875 +0100 +@@ -5386,9 +5386,9 @@ + * Need to wait a few seconds after link up to get diagnostic information from + * the phy + **/ +-static void e1000_update_phy_info(unsigned long data) ++static void e1000_update_phy_info(struct timer_list *t) + { +- struct e1000_adapter *adapter = (struct e1000_adapter *)data; ++ struct e1000_adapter *adapter = from_timer(adapter, t, phy_info_timer); + + if (test_bit(__E1000_DOWN, &adapter->state)) + return; +@@ -5771,9 +5771,9 @@ + * e1000_watchdog - Timer Call-back + * @data: pointer to adapter cast into an unsigned long + **/ +-static void e1000_watchdog(unsigned long data) ++static void e1000_watchdog(struct timer_list *t) + { +- struct e1000_adapter *adapter = (struct e1000_adapter *)data; ++ struct e1000_adapter *adapter = from_timer(adapter, t, watchdog_timer); + + /* Do the rest outside of interrupt context */ + schedule_work(&adapter->watchdog_task); +@@ -8341,13 +8341,11 @@ + goto err_eeprom; + } + +- init_timer(&adapter->watchdog_timer); ++ timer_setup(&adapter->watchdog_timer, NULL, 0); + adapter->watchdog_timer.function = e1000_watchdog; +- adapter->watchdog_timer.data = (unsigned long)adapter; + +- init_timer(&adapter->phy_info_timer); ++ timer_setup(&adapter->phy_info_timer, NULL, 0); + adapter->phy_info_timer.function = e1000_update_phy_info; +- adapter->phy_info_timer.data = (unsigned long)adapter; + + INIT_WORK(&adapter->reset_task, e1000_reset_task); + INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
