Home » Mailing list archives » linux-netdev » 2008 » March » 28

[PATCH 1/8] e1000e: reformat comment blocks, cosmetic changes only

Previous thread: [patch] net: Comment dev_kfree_skb_irq and dev_kfree_skb_any better by Matti Linnanvuori on Friday, March 28, 2008 - 11:13 am. (2 messages)

Next thread: [PATCH] [2.6.26 / RFC] e1000: remove PCI Express device IDs by Auke Kok on Friday, March 28, 2008 - 1:41 pm. (4 messages)
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 1/8] e1000e: reformat comment blocks, cosmetic changes only
Date: Friday, March 28, 2008 - 12:15 pm

From: Bruce Allan <bruce.w.allan@intel.com>


Adjusting the comment blocks here to be code-style compliant. no

code changes.


Changed some copyright dates to 2008.


Indentation fixes.


Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---


 drivers/net/e1000e/82571.c   |  105 +++++++---

 drivers/net/e1000e/Makefile  |    2

 drivers/net/e1000e/defines.h |  109 ++++++-----

 drivers/net/e1000e/e1000.h   |   16 +-

 drivers/net/e1000e/es2lan.c  |   89 +++++----

 drivers/net/e1000e/ethtool.c |   97 ++++++----

 drivers/net/e1000e/hw.h      |  145 +++++++-------

 drivers/net/e1000e/ich8lan.c |  262 ++++++++++++++++----------

 drivers/net/e1000e/lib.c     |  213 +++++++++++++--------

 drivers/net/e1000e/netdev.c  |  428 +++++++++++++++++++++++++++---------------

 drivers/net/e1000e/param.c   |   33 ++-

 drivers/net/e1000e/phy.c     |  152 ++++++++++-----

 12 files changed, 1009 insertions(+), 642 deletions(-)


diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c

index 7fe2031..c58dc2e 100644

--- a/drivers/net/e1000e/82571.c

+++ b/drivers/net/e1000e/82571.c

@@ -1,7 +1,7 @@

 /*******************************************************************************


   Intel PRO/1000 Linux driver

-  Copyright(c) 1999 - 2007 Intel Corporation.

+  Copyright(c) 1999 - 2008 Intel Corporation.


   This program is free software; you can redistribute it and/or modify it

   under the terms and conditions of the GNU General Public License,

@@ -29,6 +29,9 @@

 /*

  * 82571EB Gigabit Ethernet Controller

  * 82571EB Gigabit Ethernet Controller (Fiber)

+ * 82571EB Dual Port Gigabit Mezzanine Adapter

+ * 82571EB Quad Port Gigabit Mezzanine Adapter

+ * 82571PT Gigabit PT Quad Port Server ExpressModule

  * 82572EI Gigabit Ethernet Controller (Copper)

  * 82572EI Gigabit Ethernet Controller (Fiber)

  * 82572EI Gigabit Ethernet Controller

@@ -150,7 +153,8 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw...
[ message continues ]
[view original message]
From: Jeff Garzik <jeff@...>
To: Auke Kok <auke-jan.h.kok@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: Re: [PATCH 1/8] e1000e: reformat comment blocks, cosmetic changes only
Date: Friday, March 28, 2008 - 10:16 pm

applied 1-3 of 8 (waiting on responses, for the others)


--
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 4/8] e1000e: limit EEPROM size accesses
Date: Friday, March 28, 2008 - 12:15 pm

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>


Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---


 drivers/net/e1000e/82571.c  |    4 ++++

 drivers/net/e1000e/es2lan.c |    4 ++++

 2 files changed, 8 insertions(+), 0 deletions(-)


diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c

index f7e1619..9b46a00 100644

--- a/drivers/net/e1000e/82571.c

+++ b/drivers/net/e1000e/82571.c

@@ -171,6 +171,10 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)

 		 * for setting word_size.

 		 */

 		size += NVM_WORD_SIZE_BASE_SHIFT;

+

+		/* EEPROM access above 16k is unsupported */

+		if (size > 14)

+			size = 14;

 		nvm->word_size	= 1 << size;

 		break;

 	}

diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c

index e3f4aee..2689e4b 100644

--- a/drivers/net/e1000e/es2lan.c

+++ b/drivers/net/e1000e/es2lan.c

@@ -178,6 +178,10 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw)

 	 * for setting word_size.

 	 */

 	size += NVM_WORD_SIZE_BASE_SHIFT;

+

+	/* EEPROM access above 16k is unsupported */

+	if (size > 14)

+		size = 14;

 	nvm->word_size	= 1 << size;


 	return 0;


--
[view original message]
From: Jeff Garzik <jeff@...>
To: Auke Kok <auke-jan.h.kok@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: Re: [PATCH 4/8] e1000e: limit EEPROM size accesses
Date: Friday, March 28, 2008 - 9:58 pm

Is this 2.6.25-rc material?


--
[view original message]
From: Kok, Auke <auke-jan.h.kok@...>
To: Jeff Garzik <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: Re: [PATCH 4/8] e1000e: limit EEPROM size accesses
Date: Monday, March 31, 2008 - 12:33 pm

hardly, there are no known bugs again us reading too far in the eeprom. 2.6.26+ is

fine.


Auke

--
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 7/8] e1000e: rename a few functions
Date: Friday, March 28, 2008 - 12:15 pm

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>


Several minor cosmetic function renames.


Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---


 drivers/net/e1000e/82571.c   |    8 ++++----

 drivers/net/e1000e/e1000.h   |    4 ++--

 drivers/net/e1000e/es2lan.c  |    4 ++--

 drivers/net/e1000e/ich8lan.c |    6 +++---

 drivers/net/e1000e/lib.c     |    6 +++---

 drivers/net/e1000e/netdev.c  |    8 ++++----

 6 files changed, 18 insertions(+), 18 deletions(-)


diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c

index 85e4764..01c8866 100644

--- a/drivers/net/e1000e/82571.c

+++ b/drivers/net/e1000e/82571.c

@@ -248,7 +248,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)

 	return 0;

 }


-static s32 e1000_get_invariants_82571(struct e1000_adapter *adapter)

+static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)

 {

 	struct e1000_hw *hw = &adapter->hw;

 	static int global_quad_port_a; /* global port a indication */

@@ -1337,7 +1337,7 @@ struct e1000_info e1000_82571_info = {

 				  | FLAG_TARC_SPEED_MODE_BIT /* errata */

 				  | FLAG_APME_CHECK_PORT_B,

 	.pba			= 38,

-	.get_invariants		= e1000_get_invariants_82571,

+	.get_variants		= e1000_get_variants_82571,

 	.mac_ops		= &e82571_mac_ops,

 	.phy_ops		= &e82_phy_ops_igp,

 	.nvm_ops		= &e82571_nvm_ops,

@@ -1355,7 +1355,7 @@ struct e1000_info e1000_82572_info = {

 				  | FLAG_HAS_STATS_ICR_ICT

 				  | FLAG_TARC_SPEED_MODE_BIT, /* errata */

 	.pba			= 38,

-	.get_invariants		= e1000_get_invariants_82571,

+	.get_variants		= e1000_get_variants_82571,

 	.mac_ops		= &e82571_mac_ops,

 	.phy_ops		= &e82_phy_ops_igp,

 	.nvm_ops		= &e82571_nvm_ops,

@@ -1375,7 +1375,7 @@ struct e1000_info e1000_82573_info = {

 				  | FLAG_HAS_ERT

 				  | FLAG_HAS_SWSM_ON_LOAD,

 	.pba			= 20,

-	.get_invariants		= e1000_get_invariants_82571,

+	.get_variants		= e1000_get_variants_8257...
[ message continues ]
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 6/8] e1000e: convert ndev_ printks to something smaller
Date: Friday, March 28, 2008 - 12:15 pm

From: Bruce Allan <bruce.w.allan@intel.com>


The ndev_* printk's are too lenghty and we don't need to specify

the adapter/netdev struct at all, making this a lot more readable.


Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---


 drivers/net/e1000e/e1000.h   |   27 ++++----

 drivers/net/e1000e/ethtool.c |   38 +++++------

 drivers/net/e1000e/netdev.c  |  148 +++++++++++++++++++-----------------------

 drivers/net/e1000e/param.c   |   31 +++------

 4 files changed, 108 insertions(+), 136 deletions(-)


diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h

index b941a6b..e48e353 100644

--- a/drivers/net/e1000e/e1000.h

+++ b/drivers/net/e1000e/e1000.h

@@ -41,24 +41,25 @@


 struct e1000_info;


-#define ndev_printk(level, netdev, format, arg...) \

-	printk(level "%s: " format, (netdev)->name, ## arg)

+#define e_printk(level, adapter, format, arg...) \

+	printk(level "%s: %s: " format, pci_name(adapter->pdev), \

+	       adapter->netdev->name, ## arg)


 #ifdef DEBUG

-#define ndev_dbg(netdev, format, arg...) \

-	ndev_printk(KERN_DEBUG , netdev, format, ## arg)

+#define e_dbg(format, arg...) \

+	e_printk(KERN_DEBUG , adapter, format, ## arg)

 #else

-#define ndev_dbg(netdev, format, arg...) do { (void)(netdev); } while (0)

+#define e_dbg(format, arg...) do { (void)(adapter); } while (0)

 #endif


-#define ndev_err(netdev, format, arg...) \

-	ndev_printk(KERN_ERR , netdev, format, ## arg)

-#define ndev_info(netdev, format, arg...) \

-	ndev_printk(KERN_INFO , netdev, format, ## arg)

-#define ndev_warn(netdev, format, arg...) \

-	ndev_printk(KERN_WARNING , netdev, format, ## arg)

-#define ndev_notice(netdev, format, arg...) \

-	ndev_printk(KERN_NOTICE , netdev, format, ## arg)

+#define e_err(format, arg...) \

+	e_printk(KERN_ERR, adapter, format, ## arg)

+#define e_info(format, arg...) \

+	e_printk(KERN_INFO, adapter, format, ## arg)

+#define e_warn(format, arg...) \

+	e...
[ message continues ]
[view original message]
From: Jeff Garzik <jeff@...>
To: Auke Kok <auke-jan.h.kok@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: Re: [PATCH 6/8] e1000e: convert ndev_ printks to something smaller
Date: Friday, March 28, 2008 - 10:03 pm

This stuff should just be removed.


Either the code should be outputting "ethX: blahblah" via printk(), or

the code should be outputting the standard dev_printk() prefix [driver

name, PCI device info].


Also, it is recommended to use the NETIF_MSG_xxx bits to permit

fine-grained control over which messages are output, on a per-port basis

(controlled via ethtool).  grep around for 'msg_enable'


	Jeff


--
[view original message]
From: Kok, Auke <auke-jan.h.kok@...>
To: Jeff Garzik <jeff@...>
Cc: <e1000-devel@...>, <netdev@...>
Subject: Re: [E1000-devel] [PATCH 6/8] e1000e: convert ndev_ printks to something smaller
Date: Monday, March 31, 2008 - 2:36 pm

yes and I even tried pushing for a generic netdev printk that incorporates the

msg_enable bits properly


I also got absolutely unwelcome responses to that, if not none :)


once we get such a thing, we can incorporate this into e1000 with this patch by

changing 2 lines. so I think this patch is still a good thing, and it certainly

removes a lot of wrapped lines.


Auke


--
[view original message]
From: Kok, Auke <auke-jan.h.kok@...>
To: Jeff Garzik <jeff@...>
Cc: <e1000-devel@...>, <netdev@...>
Subject: Re: [E1000-devel] [PATCH 6/8] e1000e: convert ndev_ printks to something smaller
Date: Wednesday, April 2, 2008 - 2:55 pm

Jeff,


I'm not sure how to proceed with this mess cleanup so I'm removing that patch from

the series I sent, and I will revisit this issue later.


I'm resending the ones I have sent once but are on hold pending this discussion.

They are all meant for #upstream and should apply OK.


thanks,


Auke


--
[view original message]
From: Joe Perches <joe@...>
To: Kok, Auke <auke-jan.h.kok@...>
Cc: Jeff Garzik <jeff@...>, <e1000-devel@...>, <netdev@...>
Subject: Re: [E1000-devel] [PATCH 6/8] e1000e: convert ndev_ printks to something smaller
Date: Monday, March 31, 2008 - 3:09 pm

http://www.mail-archive.com/netdev@vger.kernel.org/msg40070.html


It still makes sense to me.


I think the overall amount of churn is low,

readability would improve, existing errors in

msg_enable would be eliminated during the churn

and the newly introduced error rate would be lower.


--
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 5/8] e1000e: Make arrays out of these Rx/Tx registers
Date: Friday, March 28, 2008 - 12:15 pm

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>


With multiple queues coming into the code these base control

registers need to be made into arrays.


Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---


 drivers/net/e1000e/82571.c   |   24 ++++++++++++------------

 drivers/net/e1000e/es2lan.c  |   24 ++++++++++++------------

 drivers/net/e1000e/hw.h      |   10 ++++++----

 drivers/net/e1000e/ich8lan.c |   24 ++++++++++++------------

 drivers/net/e1000e/netdev.c  |   16 ++++++++--------

 5 files changed, 50 insertions(+), 48 deletions(-)


diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c

index 9b46a00..85e4764 100644

--- a/drivers/net/e1000e/82571.c

+++ b/drivers/net/e1000e/82571.c

@@ -836,19 +836,19 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)

 	ret_val = e1000_setup_link_82571(hw);


 	/* Set the transmit descriptor write-back policy */

-	reg_data = er32(TXDCTL);

+	reg_data = er32(TXDCTL(0));

 	reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |

 		   E1000_TXDCTL_FULL_TX_DESC_WB |

 		   E1000_TXDCTL_COUNT_DESC;

-	ew32(TXDCTL, reg_data);

+	ew32(TXDCTL(0), reg_data);


 	/* ...for both queues. */

 	if (mac->type != e1000_82573) {

-		reg_data = er32(TXDCTL1);

+		reg_data = er32(TXDCTL(1));

 		reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |

 			   E1000_TXDCTL_FULL_TX_DESC_WB |

 			   E1000_TXDCTL_COUNT_DESC;

-		ew32(TXDCTL1, reg_data);

+		ew32(TXDCTL(1), reg_data);

 	} else {

 		e1000e_enable_tx_pkt_filtering(hw);

 		reg_data = er32(GCR);

@@ -878,17 +878,17 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)

 	u32 reg;


 	/* Transmit Descriptor Control 0 */

-	reg = er32(TXDCTL);

+	reg = er32(TXDCTL(0));

 	reg |= (1 << 22);

-	ew32(TXDCTL, reg);

+	ew32(TXDCTL(0), reg);


 	/* Transmit Descriptor Control 1 */

-	reg = er32(TXDCTL1);

+	reg = er32(TXDCTL(1));

 	reg |= (1 << 22);

-	ew32(TXDCTL1, reg);

+	ew32(TXDCTL(1), re...
[ message continues ]
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 8/8] e1000e: reformat register test code, fix some minor initialization
Date: Friday, March 28, 2008 - 12:15 pm

From: Bruce Allan <bruce.w.allan@intel.com>


The register tests should be run with all the proper flags enabled

to maximize the test coverage code and make sure we are as close

as we can get to testing regular traffic.


Reformat the code for readability. Minor cleanups in the descriptor

ring setup.


Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---


 drivers/net/e1000e/ethtool.c |  126 +++++++++++++++++++++---------------------

 1 files changed, 64 insertions(+), 62 deletions(-)


diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c

index 8398dbc..2b660b6 100644

--- a/drivers/net/e1000e/ethtool.c

+++ b/drivers/net/e1000e/ethtool.c

@@ -638,10 +638,17 @@ static int e1000_set_ringparam(struct net_device *netdev,

 	tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);

 	if (!tx_ring)

 		goto err_alloc_tx;

+	/*

+	 * use a memcpy to save any previously configured

+	 * items like napi structs from having to be

+	 * reinitialized

+	 */

+	memcpy(tx_ring, tx_old, sizeof(struct e1000_ring));


 	rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);

 	if (!rx_ring)

 		goto err_alloc_rx;

+	memcpy(rx_ring, rx_old, sizeof(struct e1000_ring));


 	adapter->tx_ring = tx_ring;

 	adapter->rx_ring = rx_ring;

@@ -697,61 +704,54 @@ err_setup:

 	return err;

 }


-static bool reg_pattern_test_array(struct e1000_adapter *adapter, u64 *data,

-				   int reg, int offset, u32 mask, u32 write)

+static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,

+			     int reg, int offset, u32 mask, u32 write)

 {

-	int i;

-	u32 read;

+	u32 pat, val;

 	static const u32 test[] =

 		{0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};

-	for (i = 0; i < ARRAY_SIZE(test); i++) {

+	for (pat = 0; pat < ARRAY_SIZE(test); pat++) {

 		E1000_WRITE_REG_ARRAY(&adapter->hw, reg, offset,

-				      (test[i] & write));

-		read = E1000_READ_REG_ARRAY(&adapter->hw, reg, of...
[ message continues ]
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 2/8] e1000e: rename mc_addr_list_update
Date: Friday, March 28, 2008 - 12:15 pm

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>


Rename this function to be consistent with function naming (verb first)


Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---


 drivers/net/e1000e/82571.c   |   10 +++++-----

 drivers/net/e1000e/e1000.h   |    8 +++++---

 drivers/net/e1000e/es2lan.c  |    2 +-

 drivers/net/e1000e/hw.h      |    2 +-

 drivers/net/e1000e/ich8lan.c |    2 +-

 drivers/net/e1000e/lib.c     |    8 ++++----

 drivers/net/e1000e/netdev.c  |   15 +++++++--------

 7 files changed, 24 insertions(+), 23 deletions(-)


diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c

index c58dc2e..f5a4d40 100644

--- a/drivers/net/e1000e/82571.c

+++ b/drivers/net/e1000e/82571.c

@@ -972,7 +972,7 @@ void e1000e_clear_vfta(struct e1000_hw *hw)

 }


 /**

- *  e1000_mc_addr_list_update_82571 - Update Multicast addresses

+ *  e1000_update_mc_addr_list_82571 - Update Multicast addresses

  *  @hw: pointer to the HW structure

  *  @mc_addr_list: array of multicast addresses to program

  *  @mc_addr_count: number of multicast addresses to program

@@ -984,7 +984,7 @@ void e1000e_clear_vfta(struct e1000_hw *hw)

  *  The parameter rar_count will usually be hw->mac.rar_entry_count

  *  unless there are workarounds that change this.

  **/

-static void e1000_mc_addr_list_update_82571(struct e1000_hw *hw,

+static void e1000_update_mc_addr_list_82571(struct e1000_hw *hw,

 					    u8 *mc_addr_list,

 					    u32 mc_addr_count,

 					    u32 rar_used_count,

@@ -993,8 +993,8 @@ static void e1000_mc_addr_list_update_82571(struct e1000_hw *hw,

 	if (e1000e_get_laa_state_82571(hw))

 		rar_count--;


-	e1000e_mc_addr_list_update_generic(hw, mc_addr_list, mc_addr_count,

-					  rar_used_count, rar_count);

+	e1000e_update_mc_addr_list_generic(hw, mc_addr_list, mc_addr_count,

+					   rar_used_count, rar_count);

 }


 /**

@@ -1269,7 +1269,7 @@ static struct e1000_mac_operations e82571_mac_o...
[ message continues ]
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 3/8] e1000e: reorganize PHY and flow control interface
Date: Friday, March 28, 2008 - 12:15 pm

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>


This reorganization moves the PHY status into a separate

struct. Flow Control setup is moved into this struct as well

and frame size away from here into the adapter struct where its

inly use is.


The post-link-up code is now a separate function and moved out

of the watchdog function itself. This allows us to track the

es2lan restart issue a bit easier.


Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---


 drivers/net/e1000e/82571.c   |   12 ++-

 drivers/net/e1000e/e1000.h   |    5 +

 drivers/net/e1000e/es2lan.c  |   14 ++--

 drivers/net/e1000e/ethtool.c |   64 +++++++++---------

 drivers/net/e1000e/hw.h      |   26 ++++---

 drivers/net/e1000e/ich8lan.c |   15 ++--

 drivers/net/e1000e/lib.c     |   65 +++++++++---------

 drivers/net/e1000e/netdev.c  |  151 +++++++++++++++++++++++++++---------------

 drivers/net/e1000e/phy.c     |   12 ++-

 9 files changed, 205 insertions(+), 159 deletions(-)


diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c

index f5a4d40..f7e1619 100644

--- a/drivers/net/e1000e/82571.c

+++ b/drivers/net/e1000e/82571.c

@@ -75,7 +75,7 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)

 	struct e1000_phy_info *phy = &hw->phy;

 	s32 ret_val;


-	if (hw->media_type != e1000_media_type_copper) {

+	if (hw->phy.media_type != e1000_media_type_copper) {

 		phy->type = e1000_phy_none;

 		return 0;

 	}

@@ -195,16 +195,16 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)

 	case E1000_DEV_ID_82571EB_FIBER:

 	case E1000_DEV_ID_82572EI_FIBER:

 	case E1000_DEV_ID_82571EB_QUAD_FIBER:

-		hw->media_type = e1000_media_type_fiber;

+		hw->phy.media_type = e1000_media_type_fiber;

 		break;

 	case E1000_DEV_ID_82571EB_SERDES:

 	case E1000_DEV_ID_8...
[ message continues ]
Previous thread: [patch] net: Comment dev_kfree_skb_irq and dev_kfree_skb_any better by Matti Linnanvuori on Friday, March 28, 2008 - 11:13 am. (2 messages)

Next thread: [PATCH] [2.6.26 / RFC] e1000: remove PCI Express device IDs by Auke Kok on Friday, March 28, 2008 - 1:41 pm. (4 messages)