diff options
| author | Dave Jones <davej@redhat.com> | 2013-01-10 14:28:14 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2013-01-10 14:28:14 -0500 |
| commit | 793b41f2850c0029784e5226d3a71d33448c2625 (patch) | |
| tree | a2df86a20274d901b6c0254308ee895fb5685131 | |
| parent | efd70b8f77b7a7adf3add772e424ce95f289b50e (diff) | |
Drop no longer needed workaround.
| -rw-r--r-- | e1000-ich9-montevina.patch | 46 | ||||
| -rw-r--r-- | kernel.spec | 8 |
2 files changed, 3 insertions, 51 deletions
diff --git a/e1000-ich9-montevina.patch b/e1000-ich9-montevina.patch deleted file mode 100644 index ec38a390..00000000 --- a/e1000-ich9-montevina.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 802e6d8c8477a553a677b23a247d6d2638e01958 Mon Sep 17 00:00:00 2001 -From: Dave Jones <davej@redhat.com> -Date: Wed, 26 Oct 2011 13:31:47 -0400 -Subject: [PATCH] e1000e: ich9 montevina - -This only showed up in one SDV (Montevina). -The PCIE slots don't seem to like network cards, so this is the only hope -to get networking working. It's never going upstream, but it's low impact -enough to carry just to keep those SDVs working. ---- - drivers/net/ethernet/intel/e1000e/ich8lan.c | 6 ++++++ - drivers/net/ethernet/intel/e1000e/netdev.c | 1 + - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c -index 6a17c62..0e40975 100644 ---- a/drivers/net/ethernet/intel/e1000e/ich8lan.c -+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c -@@ -452,6 +452,12 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw) - - /* Verify phy id */ - switch (phy->id) { -+ case 0: -+ if (hw->adapter->pdev->device == 0x10be) -+ e_dbg("got 0 phy id, trying anyway"); -+ /* Fall through to IGP03E1000 case below */ -+ else -+ return -E1000_ERR_PHY; - case IGP03E1000_E_PHY_ID: - phy->type = e1000_phy_igp_3; - phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT; -diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c -index a855db1..edac30b 100644 ---- a/drivers/net/ethernet/intel/e1000e/netdev.c -+++ b/drivers/net/ethernet/intel/e1000e/netdev.c -@@ -6359,6 +6359,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = { - { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan }, -+ { PCI_VDEVICE(INTEL, 0x10be), board_ich9lan }, - - { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LM), board_ich9lan }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan }, --- -1.7.6.4 - diff --git a/kernel.spec b/kernel.spec index 1fda0b6a..bf487b02 100644 --- a/kernel.spec +++ b/kernel.spec @@ -664,8 +664,6 @@ Patch510: silence-noise.patch Patch520: quite-apm.patch Patch530: silence-fbcon-logo.patch -Patch700: e1000-ich9-montevina.patch - Patch800: crash-driver.patch # crypto/ @@ -1371,9 +1369,6 @@ ApplyPatch silence-fbcon-logo.patch # /dev/crash driver. ApplyPatch crash-driver.patch -# Hack e1000e to work on Montevina SDV -ApplyPatch e1000-ich9-montevina.patch - # crypto/ # secure boot @@ -2306,6 +2301,9 @@ fi # ||----w | # || || %changelog +* Thu Jan 10 2013 Dave Jones <davej@redhat.com> +- Drop old Montevina era E1000 workaround. + * Thu Jan 10 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc3.git0.1 - Linux v3.8-rc3 - Disable debugging options. |