From mboxrd@z Thu Jan 1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
b3b5bbb95a48106dd370e5e5003bacb488e4efb7
Date: Fri, 01 Apr 2016 13:10:59 +0100
Message-ID: <20160401121059.DA2B81081BA6@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2403669804058669802=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============2403669804058669802==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via b3b5bbb95a48106dd370e5e5003bacb488e4efb7 (commit)
via b580a05b05302ab7931ca8d92e0b64fb9b23ed74 (commit)
via c91595a143f9ed878be2dfc326be9a968b38eecc (commit)
via b64110cfd55f841ea11b1f43d019b84e9a6121fd (commit)
via f9855d6d55f33be3bdefec3e756667fbdb538b31 (commit)
from 4ffb9f95ad615e741954464e764ff4a70c38bf9b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b3b5bbb95a48106dd370e5e5003bacb488e4efb7
Merge: 4ffb9f9 b580a05
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 1 13:29:40 2016 +0200
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes:
lfs/e1000e | 6 ++--
lfs/igb | 5 ++--
lfs/linux | 2 +-
.../igb-5.3.4.4_fix_hung_at_dev_get_stats.patch | 35 ++++++++++++++++++++=
++
4 files changed, 42 insertions(+), 6 deletions(-)
create mode 100644 src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch
Difference in files:
diff --git a/lfs/e1000e b/lfs/e1000e
index 5f284ce..37b0c41 100644
--- a/lfs/e1000e
+++ b/lfs/e1000e
@@ -1,7 +1,7 @@
############################################################################=
###
# =
#
# IPFire.org - A linux based firewall =
#
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> =
#
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> =
#
# =
#
# This program is free software: you can redistribute it and/or modify =
#
# it under the terms of the GNU General Public License as published by =
#
@@ -27,7 +27,7 @@ include Config
VERSUFIX =3D ipfire$(KCFG)
MODPATH =3D /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/int=
el/e1000e
=20
-VER =3D 3.2.7.1
+VER =3D 3.3.3
=20
THISAPP =3D e1000e-$(VER)
DL_FILE =3D $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects =3D $(DL_FILE)
=20
$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 8f62c220d763fa92473365e40d55bd86
+$(DL_FILE)_MD5 =3D 01274408a0f987457600dc7993c9d59a
=20
install : $(TARGET)
=20
diff --git a/lfs/igb b/lfs/igb
index 85d228c..d00a1e1 100644
--- a/lfs/igb
+++ b/lfs/igb
@@ -27,7 +27,7 @@ include Config
VERSUFIX =3D ipfire$(KCFG)
MODPATH =3D /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/int=
el/igb/
=20
-VER =3D 5.3.3.2
+VER =3D 5.3.4.4
=20
THISAPP =3D igb-$(VER)
DL_FILE =3D $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects =3D $(DL_FILE)
=20
$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 2d753a0bd03c949ec08d68c27540044d
+$(DL_FILE)_MD5 =3D 6c0d7dfdb161128da7c039fc83bbdba0
=20
install : $(TARGET)
=20
@@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-mv $(MODPATH)/igb.ko \
$(MODPATH)/igb.ko.org
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igb-5.3.4.4_fix_hung_a=
t_dev_get_stats.patch
cd $(DIR_APP)/src && make BUILD_KERNEL=3D$(KVER)-$(VERSUFIX)
cd $(DIR_APP)/src && install -m 644 igb.ko $(MODPATH)
@rm -rf $(DIR_APP)
diff --git a/lfs/linux b/lfs/linux
index f7782ff..be2e105 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -37,7 +37,7 @@ DIR_APP =3D $(DIR_SRC)/$(THISAPP)
CFLAGS =3D
CXXFLAGS =3D
=20
-PAK_VER =3D 66
+PAK_VER =3D 67
DEPS =3D ""
=20
KERNEL_ARCH =3D $(MACHINE)
diff --git a/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch b/src/pa=
tches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch
new file mode 100644
index 0000000..a92c441
--- /dev/null
+++ b/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch
@@ -0,0 +1,35 @@
+Don't read phy_idle_errors at dev_get_stats() because this can
+hung the userspace.
+
+https://sourceforge.net/p/e1000/bugs/500/
+Why this is set to wont-fix?
+
+I think it is better when phy errors are not reportet in the stats
+than a random hanging of the whole sytem.
+
+diff -Naur igb-5.3.4.4.org/src/igb_main.c igb-5.3.4.4/src/igb_main.c
+--- igb-5.3.4.4.org/src/igb_main.c 2016-02-26 01:48:39.000000000 +0100
++++ igb-5.3.4.4/src/igb_main.c 2016-03-31 09:22:10.671794282 +0200
+@@ -6032,14 +6032,14 @@
+=20
+ /* Tx Dropped needs to be maintained elsewhere */
+=20
+- /* Phy Stats */
+- if (hw->phy.media_type =3D=3D e1000_media_type_copper) {
+- if ((adapter->link_speed =3D=3D SPEED_1000) &&
+- (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
+- phy_tmp &=3D PHY_IDLE_ERROR_COUNT_MASK;
+- adapter->phy_stats.idle_errors +=3D phy_tmp;
+- }
+- }
++// /* Phy Stats */
++// if (hw->phy.media_type =3D=3D e1000_media_type_copper) {
++// if ((adapter->link_speed =3D=3D SPEED_1000) &&
++// (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
++// phy_tmp &=3D PHY_IDLE_ERROR_COUNT_MASK;
++// adapter->phy_stats.idle_errors +=3D phy_tmp;
++// }
++// }
+=20
+ /* Management Stats */
+ adapter->stats.mgptc +=3D E1000_READ_REG(hw, E1000_MGTPTC);
hooks/post-receive
--
IPFire 2.x development tree
--===============2403669804058669802==--