diff options
| author | Dave Jones <davej@redhat.com> | 2010-09-29 17:58:18 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2010-09-29 17:58:18 -0400 |
| commit | f737348ecbc174fedd88eebcdb4c32ced27d22d5 (patch) | |
| tree | 166200a74bf50064668fd0fab2a9ad0b2fd2d1c3 /linux-2.6-e1000-ich9-montevina.patch | |
| parent | 503653df9ef399a427f93ce6317b7b56b418566f (diff) | |
| download | kernel-f737348ecbc174fedd88eebcdb4c32ced27d22d5.tar.gz kernel-f737348ecbc174fedd88eebcdb4c32ced27d22d5.tar.xz kernel-f737348ecbc174fedd88eebcdb4c32ced27d22d5.zip | |
Add back an old hack to make an SDV e1000e variant work.
Diffstat (limited to 'linux-2.6-e1000-ich9-montevina.patch')
| -rw-r--r-- | linux-2.6-e1000-ich9-montevina.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/linux-2.6-e1000-ich9-montevina.patch b/linux-2.6-e1000-ich9-montevina.patch new file mode 100644 index 000000000..888d0a766 --- /dev/null +++ b/linux-2.6-e1000-ich9-montevina.patch @@ -0,0 +1,30 @@ +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. + +--- linux-2.6.35.noarch/drivers/net/e1000e/ich8lan.c~ 2010-09-29 17:53:13.000000000 -0400 ++++ linux-2.6.35.noarch/drivers/net/e1000e/ich8lan.c 2010-09-29 17:54:00.000000000 -0400 +@@ -424,6 +424,12 @@ static s32 e1000_init_phy_params_ich8lan + + /* Verify phy id */ + switch (phy->id) { ++ case 0: ++ if (hw->adapter->pdev->device == 0x10be) ++ hw_dbg(hw, "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; +--- linux-2.6.35.noarch/drivers/net/e1000e/netdev.c~ 2010-09-29 17:54:07.000000000 -0400 ++++ linux-2.6.35.noarch/drivers/net/e1000e/netdev.c 2010-09-29 17:54:29.000000000 -0400 +@@ -5994,6 +5994,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci + { 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 }, |