diff --git a/kernel.spec b/kernel.spec index 9bedf761d..176dbfcde 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # When changing real_sublevel below, reset this by hand to 1 # (or to 0 and then use rpmdev-bumpspec). # -%global baserelease 3 +%global baserelease 0 %global fedora_build %{baserelease} # real_sublevel is the 3.x kernel version we're starting with @@ -51,7 +51,7 @@ Summary: The Linux kernel %define fake_sublevel %(echo $((40 + %{real_sublevel}))) # Do we have a -stable update to apply? -%define stable_update 6 +%define stable_update 7 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -602,7 +602,6 @@ Patch540: x86-pci-reduce-severity-of-host-bridge-window-conflict-warnings.patch Patch610: hda_intel-prealloc-4mb-dmabuffer.patch Patch700: linux-2.6-e1000-ich9-montevina.patch -Patch701: net-3-4-e1000e-workaround-for-packet-drop-on-82579-at-100Mbps.patch Patch800: linux-2.6-crash-driver.patch @@ -1201,7 +1200,6 @@ ApplyPatch linux-2.6-crash-driver.patch # Hack e1000e to work on Montevina SDV ApplyPatch linux-2.6-e1000-ich9-montevina.patch -ApplyPatch net-3-4-e1000e-workaround-for-packet-drop-on-82579-at-100Mbps.patch # crypto/ @@ -1910,7 +1908,8 @@ fi # and build. %changelog -* Mon Oct 17 2011 Josh Boyer +* Mon Oct 17 2011 Josh Boyer 2.6.40.7-0 +- Linux 3.0.7 stable release - Add two patches to fix stalls in khugepaged (rhbz 735946) * Thu Oct 13 2011 Josh Boyer diff --git a/net-3-4-e1000e-workaround-for-packet-drop-on-82579-at-100Mbps.patch b/net-3-4-e1000e-workaround-for-packet-drop-on-82579-at-100Mbps.patch deleted file mode 100644 index 626362416..000000000 --- a/net-3-4-e1000e-workaround-for-packet-drop-on-82579-at-100Mbps.patch +++ /dev/null @@ -1,63 +0,0 @@ -http://patchwork.ozlabs.org/patch/109926/ - -From: Bruce Allan - -The MAC can drop short packets when the PHY detects noise on the line at -100Mbps due to a timing issue. Workaround the issue by increasing the PLL -counter so the PHY properly recognizes the synchronization pattern from the -MAC. - -Signed-off-by: Bruce Allan -Tested-by: Jeff Pieper -Signed-off-by: Jeff Kirsher ---- - drivers/net/e1000e/ich8lan.c | 19 ++++++++++++++----- - 1 files changed, 14 insertions(+), 5 deletions(-) - -diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c -index 7525e37..46a5277 100644 ---- a/drivers/net/e1000e/ich8lan.c -+++ b/drivers/net/e1000e/ich8lan.c -@@ -137,8 +137,9 @@ - #define HV_PM_CTRL PHY_REG(770, 17) - - /* PHY Low Power Idle Control */ --#define I82579_LPI_CTRL PHY_REG(772, 20) --#define I82579_LPI_CTRL_ENABLE_MASK 0x6000 -+#define I82579_LPI_CTRL PHY_REG(772, 20) -+#define I82579_LPI_CTRL_ENABLE_MASK 0x6000 -+#define I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT 0x80 - - /* EMI Registers */ - #define I82579_EMI_ADDR 0x10 -@@ -1670,6 +1671,7 @@ static s32 e1000_k1_workaround_lv(struct e1000_hw *hw) - s32 ret_val = 0; - u16 status_reg = 0; - u32 mac_reg; -+ u16 phy_reg; - - if (hw->mac.type != e1000_pch2lan) - goto out; -@@ -1684,12 +1686,19 @@ static s32 e1000_k1_workaround_lv(struct e1000_hw *hw) - mac_reg = er32(FEXTNVM4); - mac_reg &= ~E1000_FEXTNVM4_BEACON_DURATION_MASK; - -- if (status_reg & HV_M_STATUS_SPEED_1000) -+ ret_val = e1e_rphy(hw, I82579_LPI_CTRL, &phy_reg); -+ if (ret_val) -+ goto out; -+ -+ if (status_reg & HV_M_STATUS_SPEED_1000) { - mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_8USEC; -- else -+ phy_reg &= ~I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT; -+ } else { - mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_16USEC; -- -+ phy_reg |= I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT; -+ } - ew32(FEXTNVM4, mac_reg); -+ ret_val = e1e_wphy(hw, I82579_LPI_CTRL, phy_reg); - } - - out: diff --git a/sources b/sources index 296c54af1..882a51334 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -4751b440e1c840229468e16617d5b539 patch-3.0.6.bz2 +34c883ae9b6f112029879c8672b590ad patch-3.0.7.bz2