rpms/kernel/devel linux-2.6-e1000e-add-support-for-new-82574L-part.patch, 1.1, 1.2
Kyle McMartin
kyle at fedoraproject.org
Thu Oct 2 12:38:37 UTC 2008
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10347
Modified Files:
linux-2.6-e1000e-add-support-for-new-82574L-part.patch
Log Message:
rediff e1000e junk
linux-2.6-e1000e-add-support-for-new-82574L-part.patch:
Index: linux-2.6-e1000e-add-support-for-new-82574L-part.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-e1000e-add-support-for-new-82574L-part.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-e1000e-add-support-for-new-82574L-part.patch 10 Sep 2008 16:59:58 -0000 1.1
+++ linux-2.6-e1000e-add-support-for-new-82574L-part.patch 2 Oct 2008 12:38:36 -0000 1.2
@@ -10,18 +10,18 @@
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---
- drivers/net/e1000e/82571.c | 153 ++++++++++++++--
- drivers/net/e1000e/defines.h | 13 ++
- drivers/net/e1000e/e1000.h | 28 +++-
- drivers/net/e1000e/es2lan.c | 2 +-
- drivers/net/e1000e/ethtool.c | 38 +++-
- drivers/net/e1000e/hw.h | 11 +-
- drivers/net/e1000e/ich8lan.c | 18 ++-
- drivers/net/e1000e/lib.c | 7 +-
- drivers/net/e1000e/netdev.c | 409 +++++++++++++++++++++++++++++++++++++-----
- drivers/net/e1000e/param.c | 27 +++
- drivers/net/e1000e/phy.c | 109 +++++++++++-
- 11 files changed, 738 insertions(+), 77 deletions(-)
+ 82571.c | 153 +++++++++++++++++++++--
+ defines.h | 13 +
+ e1000.h | 28 ++++
+ es2lan.c | 2
+ ethtool.c | 38 ++++-
+ hw.h | 11 +
+ ich8lan.c | 18 ++
+ lib.c | 7 -
+ netdev.c | 405 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ param.c | 27 ++++
+ phy.c | 109 ++++++++++++++++
+ 11 files changed, 736 insertions(+), 75 deletions(-)
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 462351c..b2c910c 100644
@@ -357,7 +357,7 @@
+};
+
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
-index 4b21fa9..48f79ec 100644
+index 14b0e6c..a0c378a 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/e1000e/defines.h
@@ -71,9 +71,11 @@
@@ -405,7 +405,7 @@
/* Interrupt Cause Set */
#define E1000_ICS_LSC E1000_ICR_LSC /* Link Status Change */
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
-index ef66dc4..0a1916b 100644
+index f0c48a2..43443d3 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -62,6 +62,11 @@ struct e1000_info;
@@ -428,7 +428,7 @@
board_80003es2lan,
board_ich8lan,
board_ich9lan,
-@@ -147,6 +153,12 @@ struct e1000_ring {
+@@ -146,6 +152,12 @@ struct e1000_ring {
/* array of buffer information structs */
struct e1000_buffer *buffer_info;
@@ -441,7 +441,7 @@
struct sk_buff *rx_skb_top;
struct e1000_queue_stats stats;
-@@ -275,6 +287,9 @@ struct e1000_adapter {
+@@ -274,6 +286,9 @@ struct e1000_adapter {
u32 test_icr;
u32 msg_enable;
@@ -452,8 +452,8 @@
u32 eeprom_wol;
u32 wol;
@@ -307,6 +322,7 @@ struct e1000_info {
- #define FLAG_HAS_SWSM_ON_LOAD (1 << 6)
#define FLAG_HAS_JUMBO_FRAMES (1 << 7)
+ #define FLAG_READ_ONLY_NVM (1 << 8)
#define FLAG_IS_ICH (1 << 9)
+#define FLAG_HAS_MSIX (1 << 10)
#define FLAG_HAS_SMART_POWER_DOWN (1 << 11)
@@ -475,8 +475,8 @@
+extern struct e1000_info e1000_82574_info;
extern struct e1000_info e1000_ich8_info;
extern struct e1000_info e1000_ich9_info;
- extern struct e1000_info e1000_ich10_info;
-@@ -453,6 +472,8 @@ extern enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id);
+ extern struct e1000_info e1000_es2_info;
+@@ -452,6 +471,8 @@ extern enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id);
extern s32 e1000e_determine_phy_address(struct e1000_hw *hw);
extern s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data);
extern s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data);
@@ -485,7 +485,7 @@
extern void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);
extern s32 e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);
extern s32 e1000e_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);
-@@ -523,7 +544,12 @@ static inline s32 e1000_get_phy_info(struct e1000_hw *hw)
+@@ -522,7 +543,12 @@ static inline s32 e1000_get_phy_info(struct e1000_hw *hw)
return hw->phy.ops.get_phy_info(hw);
}
@@ -513,10 +513,10 @@
.cleanup_led = e1000e_cleanup_led_generic,
.clear_hw_cntrs = e1000_clear_hw_cntrs_80003es2lan,
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
-index a89498d..52b762e 100644
+index 5ed8e13..67b8cef 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
-@@ -568,6 +568,7 @@ static int e1000_set_eeprom(struct net_device *netdev,
+@@ -571,6 +571,7 @@ static int e1000_set_eeprom(struct net_device *netdev,
* and flush shadow RAM for 82573 controllers
*/
if ((ret_val == 0) && ((first_word <= NVM_CHECKSUM_REG) ||
@@ -524,14 +524,14 @@
(hw->mac.type == e1000_82573)))
e1000e_update_nvm_checksum(hw);
-@@ -779,6 +780,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
+@@ -782,6 +783,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
toggle = 0x7FFFF3FF;
break;
case e1000_82573:
+ case e1000_82574:
case e1000_ich8lan:
case e1000_ich9lan:
- case e1000_ich10lan:
+ toggle = 0x7FFFF033;
@@ -887,10 +889,18 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
u32 shared_int = 1;
u32 irq = adapter->pdev->irq;
@@ -562,7 +562,7 @@
}
e_info("testing %s interrupt\n", (shared_int ? "shared" : "unshared"));
-@@ -988,7 +999,14 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
+@@ -977,7 +988,14 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
/* Unhook test interrupt handler */
free_irq(irq, netdev);
@@ -578,7 +578,7 @@
}
static void e1000_free_desc_rings(struct e1000_adapter *adapter)
-@@ -1769,11 +1787,13 @@ static void e1000_led_blink_callback(unsigned long data)
+@@ -1758,11 +1776,13 @@ static void e1000_led_blink_callback(unsigned long data)
static int e1000_phys_id(struct net_device *netdev, u32 data)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -593,7 +593,7 @@
if (!adapter->blink_timer.function) {
init_timer(&adapter->blink_timer);
adapter->blink_timer.function =
-@@ -1783,16 +1803,16 @@ static int e1000_phys_id(struct net_device *netdev, u32 data)
+@@ -1772,16 +1792,16 @@ static int e1000_phys_id(struct net_device *netdev, u32 data)
mod_timer(&adapter->blink_timer, jiffies);
msleep_interruptible(data * 1000);
del_timer_sync(&adapter->blink_timer);
@@ -616,7 +616,7 @@
return 0;
}
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
-index 5d2acc5..f66ed37 100644
+index 74f263a..dfc43af 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -65,7 +65,11 @@ enum e1e_registers {
@@ -639,9 +639,9 @@
#define E1000_DEV_ID_80003ES2LAN_COPPER_DPT 0x1096
#define E1000_DEV_ID_80003ES2LAN_SERDES_DPT 0x1098
-@@ -360,12 +365,15 @@ enum e1e_registers {
- #define E1000_DEV_ID_ICH10_D_BM_LM 0x10DE
- #define E1000_DEV_ID_ICH10_D_BM_LF 0x10DF
+@@ -357,12 +362,15 @@ enum e1e_registers {
+ #define E1000_DEV_ID_ICH10_R_BM_LF 0x10CD
+ #define E1000_DEV_ID_ICH10_R_BM_V 0x10CE
+#define E1000_REVISION_4 4
+
@@ -655,7 +655,7 @@
e1000_80003es2lan,
e1000_ich8lan,
e1000_ich9lan,
-@@ -700,8 +708,7 @@ struct e1000_host_mng_command_info {
+@@ -696,8 +704,7 @@ struct e1000_host_mng_command_info {
/* Function pointers and static data for the MAC. */
struct e1000_mac_operations {
@@ -666,10 +666,10 @@
s32 (*cleanup_led)(struct e1000_hw *);
void (*clear_hw_cntrs)(struct e1000_hw *);
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
-index 0e76bb0..019b9c0 100644
+index d8efba8..67ffdfc 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
-@@ -422,6 +422,22 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw)
+@@ -431,6 +431,22 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw)
}
/**
@@ -692,7 +692,7 @@
* e1000_check_reset_block_ich8lan - Check if PHY reset is blocked
* @hw: pointer to the HW structure
*
-@@ -2400,7 +2416,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
+@@ -2340,7 +2356,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
}
static struct e1000_mac_operations ich8_mac_ops = {
@@ -728,7 +728,7 @@
/**
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
-index 2d9bcb0..0925204 100644
+index 1f767fe..14b8e26 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -55,6 +55,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
@@ -739,7 +739,7 @@
[board_80003es2lan] = &e1000_es2_info,
[board_ich8lan] = &e1000_ich8_info,
[board_ich9lan] = &e1000_ich9_info,
-@@ -1180,8 +1181,8 @@ static irqreturn_t e1000_intr(int irq, void *data)
+@@ -1179,8 +1180,8 @@ static irqreturn_t e1000_intr(int irq, void *data)
struct net_device *netdev = data;
struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
@@ -749,7 +749,7 @@
if (!icr)
return IRQ_NONE; /* Not our interrupt */
-@@ -1237,6 +1238,263 @@ static irqreturn_t e1000_intr(int irq, void *data)
+@@ -1236,6 +1237,263 @@ static irqreturn_t e1000_intr(int irq, void *data)
return IRQ_HANDLED;
}
@@ -1013,7 +1013,7 @@
/**
* e1000_request_irq - initialize interrupts
*
-@@ -1246,29 +1504,33 @@ static irqreturn_t e1000_intr(int irq, void *data)
+@@ -1245,29 +1503,33 @@ static irqreturn_t e1000_intr(int irq, void *data)
static int e1000_request_irq(struct e1000_adapter *adapter)
{
struct net_device *netdev = adapter->netdev;
@@ -1064,7 +1064,7 @@
return err;
}
-@@ -1276,11 +1538,21 @@ static void e1000_free_irq(struct e1000_adapter *adapter)
+@@ -1275,11 +1537,21 @@ static void e1000_free_irq(struct e1000_adapter *adapter)
{
struct net_device *netdev = adapter->netdev;
@@ -1090,7 +1090,7 @@
}
/**
-@@ -1291,6 +1563,8 @@ static void e1000_irq_disable(struct e1000_adapter *adapter)
+@@ -1290,6 +1562,8 @@ static void e1000_irq_disable(struct e1000_adapter *adapter)
struct e1000_hw *hw = &adapter->hw;
ew32(IMC, ~0);
@@ -1099,7 +1099,7 @@
e1e_flush();
synchronize_irq(adapter->pdev->irq);
}
-@@ -1302,7 +1576,12 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
+@@ -1301,7 +1575,12 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
{
struct e1000_hw *hw = &adapter->hw;
@@ -1113,7 +1113,7 @@
e1e_flush();
}
-@@ -1552,9 +1831,8 @@ void e1000e_free_rx_resources(struct e1000_adapter *adapter)
+@@ -1551,9 +1830,8 @@ void e1000e_free_rx_resources(struct e1000_adapter *adapter)
* traffic pattern. Constants in this function were computed
* based on theoretical maximum wire speed and thresholds were set based
* on testing data as well as attempting to minimize response time
@@ -1125,7 +1125,7 @@
**/
static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
u16 itr_setting, int packets,
-@@ -1662,11 +1940,37 @@ set_itr_now:
+@@ -1661,11 +1939,37 @@ set_itr_now:
min(adapter->itr + (new_itr >> 2), new_itr) :
new_itr;
adapter->itr = new_itr;
@@ -1164,7 +1164,7 @@
* e1000_clean - NAPI Rx polling callback
* @napi: struct associated with this polling callback
* @budget: amount of packets driver is allowed to process this poll
-@@ -1674,12 +1978,17 @@ set_itr_now:
+@@ -1673,12 +1977,17 @@ set_itr_now:
static int e1000_clean(struct napi_struct *napi, int budget)
{
struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
@@ -1182,7 +1182,7 @@
/*
* e1000_clean is called per-cpu. This lock protects
* tx_ring from being cleaned by multiple cpus
-@@ -1691,6 +2000,7 @@ static int e1000_clean(struct napi_struct *napi, int budget)
+@@ -1690,6 +1999,7 @@ static int e1000_clean(struct napi_struct *napi, int budget)
spin_unlock(&adapter->tx_queue_lock);
}
@@ -1190,7 +1190,7 @@
adapter->clean_rx(adapter, &work_done, budget);
if (tx_cleaned)
-@@ -1701,7 +2011,10 @@ static int e1000_clean(struct napi_struct *napi, int budget)
+@@ -1700,7 +2010,10 @@ static int e1000_clean(struct napi_struct *napi, int budget)
if (adapter->itr_setting & 3)
e1000_set_itr(adapter);
netif_rx_complete(poll_dev, napi);
@@ -1202,7 +1202,7 @@
}
return work_done;
-@@ -2497,6 +2810,8 @@ int e1000e_up(struct e1000_adapter *adapter)
+@@ -2496,6 +2809,8 @@ int e1000e_up(struct e1000_adapter *adapter)
clear_bit(__E1000_DOWN, &adapter->state);
napi_enable(&adapter->napi);
@@ -1211,7 +1211,7 @@
e1000_irq_enable(adapter);
/* fire a link change interrupt to start the watchdog */
-@@ -2580,13 +2895,10 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
+@@ -2579,13 +2894,10 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
@@ -1228,7 +1228,7 @@
spin_lock_init(&adapter->tx_queue_lock);
-@@ -2597,12 +2909,6 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
+@@ -2596,12 +2908,6 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
set_bit(__E1000_DOWN, &adapter->state);
return 0;
@@ -1241,7 +1241,7 @@
}
/**
-@@ -2644,6 +2950,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
+@@ -2643,6 +2949,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
/* free the real vector and request a test handler */
e1000_free_irq(adapter);
@@ -1249,7 +1249,7 @@
/* Assume that the test fails, if it succeeds then the test
* MSI irq handler will unset this flag */
-@@ -2674,6 +2981,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
+@@ -2673,6 +2980,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
rmb();
if (adapter->flags & FLAG_MSI_TEST_FAILED) {
@@ -1257,7 +1257,7 @@
err = -EIO;
e_info("MSI interrupt test failed!\n");
}
-@@ -2687,7 +2995,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
+@@ -2686,7 +2994,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
/* okay so the test worked, restore settings */
e_dbg("%s: MSI interrupt test succeeded!\n", netdev->name);
msi_test_failed:
@@ -1266,7 +1266,7 @@
e1000_request_irq(adapter);
return err;
}
-@@ -2797,7 +3105,7 @@ static int e1000_open(struct net_device *netdev)
+@@ -2796,7 +3104,7 @@ static int e1000_open(struct net_device *netdev)
* ignore e1000e MSI messages, which means we need to test our MSI
* interrupt now
*/
@@ -1275,7 +1275,7 @@
err = e1000_test_msi(adapter);
if (err) {
e_err("Interrupt allocation failed\n");
-@@ -2989,7 +3297,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
+@@ -2988,7 +3296,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
adapter->stats.algnerrc += er32(ALGNERRC);
adapter->stats.rxerrc += er32(RXERRC);
@@ -1285,7 +1285,7 @@
adapter->stats.cexterr += er32(CEXTERR);
adapter->stats.tsctc += er32(TSCTC);
adapter->stats.tsctfc += er32(TSCTFC);
-@@ -3337,7 +3646,10 @@ link_up:
+@@ -3315,7 +3624,10 @@ link_up:
}
/* Cause software interrupt to ensure Rx ring is cleaned */
@@ -1297,7 +1297,7 @@
/* Force detection of hung controller every watchdog period */
adapter->detect_tx_hung = 1;
-@@ -4054,6 +4366,7 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
+@@ -4032,6 +4344,7 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
e1000e_down(adapter);
e1000_free_irq(adapter);
}
@@ -1305,7 +1305,7 @@
retval = pci_save_state(pdev);
if (retval)
-@@ -4180,6 +4493,7 @@ static int e1000_resume(struct pci_dev *pdev)
+@@ -4158,6 +4471,7 @@ static int e1000_resume(struct pci_dev *pdev)
pci_enable_wake(pdev, PCI_D3hot, 0);
pci_enable_wake(pdev, PCI_D3cold, 0);
@@ -1313,25 +1313,7 @@
if (netif_running(netdev)) {
err = e1000_request_irq(adapter);
if (err)
-@@ -4489,6 +4803,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
-
- adapter->bd_number = cards_found++;
-
-+ e1000e_check_options(adapter);
-+
- /* setup adapter struct */
- err = e1000_sw_init(adapter);
- if (err)
-@@ -4595,8 +4911,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
- INIT_WORK(&adapter->reset_task, e1000_reset_task);
- INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
-
-- e1000e_check_options(adapter);
--
- /* Initialize link parameters. User can change them with ethtool */
- adapter->hw.mac.autoneg = 1;
- adapter->fc_autoneg = 1;
-@@ -4726,6 +5040,7 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
+@@ -4708,6 +5022,7 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
if (!e1000_check_reset_block(&adapter->hw))
e1000_phy_hw_reset(&adapter->hw);
@@ -1339,7 +1321,7 @@
kfree(adapter->tx_ring);
kfree(adapter->rx_ring);
-@@ -4767,6 +5082,8 @@ static struct pci_device_id e1000_pci_tbl[] = {
+@@ -4749,6 +5064,8 @@ static struct pci_device_id e1000_pci_tbl[] = {
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E_IAMT), board_82573 },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82573L), board_82573 },
@@ -1349,7 +1331,7 @@
board_80003es2lan },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_SPT),
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
-index ed912e0..f46db6c 100644
+index d91dbf7..77a3d72 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -114,6 +114,15 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
@@ -1368,7 +1350,7 @@
/*
* Enable Smart Power Down of the PHY
-@@ -352,6 +361,24 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
+@@ -361,6 +370,24 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
adapter->itr = 20000;
}
}
@@ -1394,7 +1376,7 @@
const struct e1000_option opt = {
.type = enable_option,
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
-index 16724f8..6cd333a 100644
+index b133dcf..5e988c9 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -476,7 +476,9 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
@@ -1427,7 +1409,7 @@
/* Commit the changes. */
ret_val = e1000e_commit_phy(hw);
if (ret_val)
-@@ -2054,6 +2068,99 @@ out:
+@@ -1969,6 +1983,99 @@ out:
}
/**
@@ -1527,6 +1509,3 @@
* e1000_access_phy_wakeup_reg_bm - Read BM PHY wakeup register
* @hw: pointer to the HW structure
* @offset: register offset to be read or written
---
-1.5.4.1
-
More information about the fedora-extras-commits
mailing list