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

[PATCH 9/9] ixgb: remove unused variable

Previous thread: Re: [PATCH net-2.6.26] fib_trie: RCU optimizations by Paul E. McKenney on Friday, March 21, 2008 - 12:01 pm. (5 messages)

Next thread: [PATCH net-2.6.26] netlink: make socket filters work on netlink by Stephen Hemminger on Friday, March 21, 2008 - 2:05 pm. (25 messages)
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 1/9] e1000: Convert boolean_t to bool
Date: Friday, March 21, 2008 - 2:06 pm

From: Joe Perches <joe@perches.com>


boolean_t to bool

TRUE to true

FALSE to false

comment typo ahread to ahead


Signed-off-by: Joe Perches <joe@perches.com>

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

---


 drivers/net/e1000/e1000.h         |   26 ++--

 drivers/net/e1000/e1000_ethtool.c |   17 +--

 drivers/net/e1000/e1000_hw.c      |  223 ++++++++++++++++++-------------------

 drivers/net/e1000/e1000_hw.h      |   62 +++++-----

 drivers/net/e1000/e1000_main.c    |   90 +++++++--------

 drivers/net/e1000/e1000_osdep.h   |    7 -

 6 files changed, 209 insertions(+), 216 deletions(-)


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

index 3b84028..d73a6c1 100644

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

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

@@ -188,7 +188,7 @@ struct e1000_tx_ring {

 	spinlock_t tx_lock;

 	uint16_t tdh;

 	uint16_t tdt;

-	boolean_t last_tx_tso;

+	bool last_tx_tso;

 };


 struct e1000_rx_ring {

@@ -283,17 +283,17 @@ struct e1000_adapter {

 	uint32_t tx_fifo_size;

 	uint8_t  tx_timeout_factor;

 	atomic_t tx_fifo_stall;

-	boolean_t pcix_82544;

-	boolean_t detect_tx_hung;

+	bool pcix_82544;

+	bool detect_tx_hung;


 	/* RX */

 #ifdef CONFIG_E1000_NAPI

-	boolean_t (*clean_rx) (struct e1000_adapter *adapter,

-			       struct e1000_rx_ring *rx_ring,

-			       int *work_done, int work_to_do);

+	bool (*clean_rx) (struct e1000_adapter *adapter,

+			  struct e1000_rx_ring *rx_ring,

+			  int *work_done, int work_to_do);

 #else

-	boolean_t (*clean_rx) (struct e1000_adapter *adapter,

-			       struct e1000_rx_ring *rx_ring);

+	bool (*clean_rx) (struct e1000_adapter *adapter,

+			  struct e1000_rx_ring *rx_ring);

 #endif

 	void (*alloc_rx_buf) (struct e1000_adapter *adapter,

 			      struct e1000_rx_ring *rx_ring,

@@ -312,7 +312,7 @@ struct e1000_adapter {

 	uint32_t alloc_rx_buff_failed;

 	uint32_t rx_int_delay;

 	uint32_t rx_abs_int_delay;

-	boolean_t rx_csum;

+	bool rx_csum;

 	unsigned int rx_ps_pages;

 	uint32_t g...
[ message continues ]
[view original message]
From: Jeff Garzik <jeff@...>
To: Auke Kok <auke-jan.h.kok@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: Re: [PATCH 1/9] e1000: Convert boolean_t to bool
Date: Wednesday, March 26, 2008 - 12:34 am

applied 1-8 of 9


sent #9 via #upstream-fixes (it arrived via a separate cover from you, too)


--
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 8/9] ixgb: remove irq_sem
Date: Friday, March 21, 2008 - 2:07 pm

From: Jesse Brandeburg <jesse.brandeburg@intel.com>


ixgb can remove irq_sem by auditing all the call sites to make sure

that each of them makes sure the adapter is in the correct state

before re-enabling interrupts.  after doing this to all of our other

drivers it is becoming easier.


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

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

---


 drivers/net/ixgb/ixgb.h      |    1 -

 drivers/net/ixgb/ixgb_main.c |   18 ++++++------------

 2 files changed, 6 insertions(+), 13 deletions(-)


diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h

index a95ab55..f2fff90 100644

--- a/drivers/net/ixgb/ixgb.h

+++ b/drivers/net/ixgb/ixgb.h

@@ -158,7 +158,6 @@ struct ixgb_adapter {

 	uint16_t link_speed;

 	uint16_t link_duplex;

 	spinlock_t tx_lock;

-	atomic_t irq_sem;

 	struct work_struct tx_timeout_task;


 	struct timer_list blink_timer;

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c

index d9688bb..9c9bf31 100644

--- a/drivers/net/ixgb/ixgb_main.c

+++ b/drivers/net/ixgb/ixgb_main.c

@@ -197,7 +197,6 @@ module_exit(ixgb_exit_module);

 static void

 ixgb_irq_disable(struct ixgb_adapter *adapter)

 {

-	atomic_inc(&adapter->irq_sem);

 	IXGB_WRITE_REG(&adapter->hw, IMC, ~0);

 	IXGB_WRITE_FLUSH(&adapter->hw);

 	synchronize_irq(adapter->pdev->irq);

@@ -211,14 +210,12 @@ ixgb_irq_disable(struct ixgb_adapter *adapter)

 static void

 ixgb_irq_enable(struct ixgb_adapter *adapter)

 {

-	if(atomic_dec_and_test(&adapter->irq_sem)) {

-		u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 |

-			  IXGB_INT_TXDW | IXGB_INT_LSC;

-		if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID)

-			val |= IXGB_INT_GPI0;

-		IXGB_WRITE_REG(&adapter->hw, IMS, val);

-		IXGB_WRITE_FLUSH(&adapter->hw);

-	}

+	u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 |

+		  IXGB_INT_TXDW | IXGB_INT_LSC;

+	if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID)

+		val |=...
[ message continues ]
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 9/9] ixgb: remove unused variable
Date: Friday, March 21, 2008 - 2:07 pm

From: Julia Lawall <julia@diku.dk>


The variable num_group_tail_writes is initialized but never used otherwise.


The semantic patch that makes this change is as follows:

(http://www.emn.fr/x-info/coccinelle/)


// <smpl>

@@

type T;

identifier i;

constant C;

@@


(

extern T i;

|

- T i;

  <+... when != i

- i = C;

  ...+>

)

// </smpl>


Signed-off-by: Julia Lawall <julia@diku.dk>

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

---


 drivers/net/ixgb/ixgb_main.c |    2 --

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


diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c

index 9c9bf31..c68b182 100644

--- a/drivers/net/ixgb/ixgb_main.c

+++ b/drivers/net/ixgb/ixgb_main.c

@@ -2092,14 +2092,12 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)

 	struct ixgb_buffer *buffer_info;

 	struct sk_buff *skb;

 	unsigned int i;

-	int num_group_tail_writes;

 	long cleancount;


 	i = rx_ring->next_to_use;

 	buffer_info = &rx_ring->buffer_info[i];

 	cleancount = IXGB_DESC_UNUSED(rx_ring);


-	num_group_tail_writes = IXGB_RX_BUFFER_WRITE;


 	/* leave three descriptors unused */

 	while(--cleancount > 2) {


--
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 6/9] e1000e: remove irq_sem
Date: Friday, March 21, 2008 - 2:06 pm

From: Jesse Brandeburg <jesse.brandeburg@intel.com>


irq_sem can safely be removed by auditing all irq.*able sites to

make sure that interrupts don't get enabled unexpectedly when the

interface is down.


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

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

---


 drivers/net/e1000e/e1000.h  |    3 ---

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

 2 files changed, 14 insertions(+), 26 deletions(-)


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

index 6e0c6ed..4bf0c6c 100644

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

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

@@ -167,9 +167,6 @@ struct e1000_adapter {


 	spinlock_t tx_queue_lock; /* prevent concurrent tail updates */


-	/* this is still needed for 82571 and above */

-	atomic_t irq_sem;

-

 	/* track device up/down/testing state */

 	unsigned long state;


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

index fc5c63f..f501dd5 100644

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

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

@@ -836,9 +836,7 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)

 	struct e1000_hw *hw = &adapter->hw;

 	u32 icr = er32(ICR);


-	/* read ICR disables interrupts using IAM, so keep up with our

-	 * enable/disable accounting */

-	atomic_inc(&adapter->irq_sem);

+	/* read ICR disables interrupts using IAM */


 	if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {

 		hw->mac.get_link_status = 1;

@@ -868,8 +866,6 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)

 		adapter->total_rx_bytes = 0;

 		adapter->total_rx_packets = 0;

 		__netif_rx_schedule(netdev, &adapter->napi);

-	} else {

-		atomic_dec(&adapter->irq_sem);

 	}


 	return IRQ_HANDLED;

@@ -895,11 +891,8 @@ static irqreturn_t e1000_intr(int irq, void *data)

 	if (!(icr & E1000_ICR_INT_ASSERTED))

 		return IRQ_NONE;


-	/* Interrupt Auto-Mask...upon reading ICR,

-	 * interrupt...
[ message continues ]
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 5/9] e1000e: remove no longer used e1000e_read_nvm_spi
Date: Friday, March 21, 2008 - 2:06 pm

This function is no longer used now that 82573 uses the eerd

read method as well. Thanks to Adrian Bunk for pointing this out.


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

---


 drivers/net/e1000e/e1000.h |    1 -

 drivers/net/e1000e/lib.c   |   56 --------------------------------------------

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


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

index 327c062..6e0c6ed 100644

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

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

@@ -462,7 +462,6 @@ extern s32 e1000e_acquire_nvm(struct e1000_hw *hw);

 extern s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

 extern s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);

 extern s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);

-extern s32 e1000e_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

 extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

 extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);

 extern void e1000e_release_nvm(struct e1000_hw *hw);

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

index 95f75a4..073934c 100644

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

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

@@ -1852,62 +1852,6 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)

 }


 /**

- *  e1000e_read_nvm_spi - Reads EEPROM using SPI

- *  @hw: pointer to the HW structure

- *  @offset: offset of word in the EEPROM to read

- *  @words: number of words to read

- *  @data: word read from the EEPROM

- *

- *  Reads a 16 bit word from the EEPROM.

- **/

-s32 e1000e_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)

-{

-	struct e1000_nvm_info *nvm = &hw->nvm;

-	u32 i = 0;

-	s32 ret_val;

-	u16 word_in;

-	u8 read_opcode = NVM_READ_OPCODE_SPI;

-

-	/* A check for invalid values:  offset too large, too many words,

-	 * and not enough words. */

-	if ((offset >= nvm->word_size) || (wor...
[ message continues ]
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 3/9] ixgb: convert boolean_t to bool
Date: Friday, March 21, 2008 - 2:06 pm

boolean_t to bool

TRUE to true

FALSE to false


Signed-off-by: Joe Perches <joe@perches.com>

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

---


 drivers/net/ixgb/ixgb.h         |    8 +++--

 drivers/net/ixgb/ixgb_ee.c      |   50 +++++++++++++++++-----------------

 drivers/net/ixgb/ixgb_ee.h      |    2 +

 drivers/net/ixgb/ixgb_ethtool.c |   10 +++----

 drivers/net/ixgb/ixgb_hw.c      |   57 +++++++++++++++++++--------------------

 drivers/net/ixgb/ixgb_hw.h      |   18 ++++++------

 drivers/net/ixgb/ixgb_main.c    |   44 +++++++++++++++---------------

 drivers/net/ixgb/ixgb_osdep.h   |    7 -----

 8 files changed, 94 insertions(+), 102 deletions(-)


diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h

index 0078136..fad4e99 100644

--- a/drivers/net/ixgb/ixgb.h

+++ b/drivers/net/ixgb/ixgb.h

@@ -173,15 +173,15 @@ struct ixgb_adapter {

 	uint64_t hw_csum_tx_error;

 	uint32_t tx_int_delay;

 	uint32_t tx_timeout_count;

-	boolean_t tx_int_delay_enable;

-	boolean_t detect_tx_hung;

+	bool tx_int_delay_enable;

+	bool detect_tx_hung;


 	/* RX */

 	struct ixgb_desc_ring rx_ring;

 	uint64_t hw_csum_rx_error;

 	uint64_t hw_csum_rx_good;

 	uint32_t rx_int_delay;

-	boolean_t rx_csum;

+	bool rx_csum;


 	/* OS defined structs */

 	struct napi_struct napi;

@@ -194,7 +194,7 @@ struct ixgb_adapter {

 	u16 msg_enable;

 	struct ixgb_hw_stats stats;

 	uint32_t alloc_rx_buff_failed;

-	boolean_t have_msi;

+	bool have_msi;

 	unsigned long flags;

 };


diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c

index e8eb0fd..8e9302f 100644

--- a/drivers/net/ixgb/ixgb_ee.c

+++ b/drivers/net/ixgb/ixgb_ee.c

@@ -36,7 +36,7 @@ static void ixgb_shift_out_bits(struct ixgb_hw *hw,

 				uint16_t count);

 static void ixgb_standby_eeprom(struct ixgb_hw *hw);


-static boolean_t ixgb_wait_eeprom_command(struct ixgb_hw *hw);

+static bool ixgb_wait_eeprom_command(struct ixgb_hw *hw);


 static void ixgb_cleanup_eeprom(struct ixgb_hw *hw);


@@ -279,10...
[ message continues ]
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 2/9] ixgb: add explicit state checking
Date: Friday, March 21, 2008 - 2:06 pm

From: Jesse Brandeburg <jesse.brandeburg@intel.com>


In order to remove the irq_sem code we need to implement strict

adapter state checking to prevent accidental double up or downs

or resets. This code is largely copied from e1000/e1000e.


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

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

---


 drivers/net/ixgb/ixgb.h      |    9 +++++++++

 drivers/net/ixgb/ixgb_main.c |   34 ++++++++++++++++++++++++----------

 2 files changed, 33 insertions(+), 10 deletions(-)


diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h

index 3d2e721..0078136 100644

--- a/drivers/net/ixgb/ixgb.h

+++ b/drivers/net/ixgb/ixgb.h

@@ -195,6 +195,15 @@ struct ixgb_adapter {

 	struct ixgb_hw_stats stats;

 	uint32_t alloc_rx_buff_failed;

 	boolean_t have_msi;

+	unsigned long flags;

+};

+

+enum ixgb_state_t {

+	/* TBD

+	__IXGB_TESTING,

+	__IXGB_RESETTING,

+	*/

+	__IXGB_DOWN

 };


 /* Exported from other modules */

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c

index 269e6f8..548c248 100644

--- a/drivers/net/ixgb/ixgb_main.c

+++ b/drivers/net/ixgb/ixgb_main.c

@@ -283,13 +283,15 @@ ixgb_up(struct ixgb_adapter *adapter)

 		}

 	}


-	mod_timer(&adapter->watchdog_timer, jiffies);

+	clear_bit(__IXGB_DOWN, &adapter->flags);


 #ifdef CONFIG_IXGB_NAPI

 	napi_enable(&adapter->napi);

 #endif

 	ixgb_irq_enable(adapter);


+	mod_timer(&adapter->watchdog_timer, jiffies);

+

 	return 0;

 }


@@ -298,11 +300,14 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)

 {

 	struct net_device *netdev = adapter->netdev;


+	/* prevent the interrupt handler from restarting watchdog */

+	set_bit(__IXGB_DOWN, &adapter->flags);

+

 #ifdef CONFIG_IXGB_NAPI

 	napi_disable(&adapter->napi);

 	atomic_set(&adapter->irq_sem, 0);

 #endif

-

+	/* waiting for NAPI to complete can re-enable interrupts */

 	ixgb_irq_disable(adapter);

 	fre...
[ message continues ]
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 7/9] e1000: remove irq_sem
Date: Friday, March 21, 2008 - 2:06 pm

From: Jesse Brandeburg <jesse.brandeburg@intel.com>


irq_sem was just a hack to prevent interrupts from being enabled

unexpectedly in deep call paths.  Simply finding those call paths and

fixing them by hand results in a driver that behaves as we expect and

doesn't need the atomic at all.


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

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

---


 drivers/net/e1000/e1000.h      |    1 -

 drivers/net/e1000/e1000_main.c |   41 +++++++++++++++-------------------------

 2 files changed, 15 insertions(+), 27 deletions(-)


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

index d73a6c1..a05aa51 100644

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

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

@@ -249,7 +249,6 @@ struct e1000_adapter {

 #ifdef CONFIG_E1000_NAPI

 	spinlock_t tx_queue_lock;

 #endif

-	atomic_t irq_sem;

 	unsigned int total_tx_bytes;

 	unsigned int total_tx_packets;

 	unsigned int total_rx_bytes;

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c

index 37c4655..757d02f 100644

--- a/drivers/net/e1000/e1000_main.c

+++ b/drivers/net/e1000/e1000_main.c

@@ -347,7 +347,6 @@ static void e1000_free_irq(struct e1000_adapter *adapter)

 static void

 e1000_irq_disable(struct e1000_adapter *adapter)

 {

-	atomic_inc(&adapter->irq_sem);

 	E1000_WRITE_REG(&adapter->hw, IMC, ~0);

 	E1000_WRITE_FLUSH(&adapter->hw);

 	synchronize_irq(adapter->pdev->irq);

@@ -361,10 +360,8 @@ e1000_irq_disable(struct e1000_adapter *adapter)

 static void

 e1000_irq_enable(struct e1000_adapter *adapter)

 {

-	if (likely(atomic_dec_and_test(&adapter->irq_sem))) {

-		E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK);

-		E1000_WRITE_FLUSH(&adapter->hw);

-	}

+	E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK);

+	E1000_WRITE_FLUSH(&adapter->hw);

 }


 static void

@@ -638,7 +635,6 @@ e1000_down(struct e1000_adapter *adapter)


 #ifdef CONFIG_E10...
[ message continues ]
[view original message]
From: Auke Kok <auke-jan.h.kok@...>
To: <jeff@...>
Cc: <netdev@...>, <e1000-devel@...>
Subject: [PATCH 4/9] ixgb: move externs out of .c files
Date: Friday, March 21, 2008 - 2:06 pm

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

---


 drivers/net/ixgb/ixgb.h         |   10 ++++++++++

 drivers/net/ixgb/ixgb_ethtool.c |    9 ---------

 2 files changed, 10 insertions(+), 9 deletions(-)


diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h

index fad4e99..a95ab55 100644

--- a/drivers/net/ixgb/ixgb.h

+++ b/drivers/net/ixgb/ixgb.h

@@ -212,4 +212,14 @@ extern void ixgb_set_ethtool_ops(struct net_device *netdev);

 extern char ixgb_driver_name[];

 extern const char ixgb_driver_version[];


+extern int ixgb_up(struct ixgb_adapter *adapter);

+extern void ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog);

+extern void ixgb_reset(struct ixgb_adapter *adapter);

+extern int ixgb_setup_rx_resources(struct ixgb_adapter *adapter);

+extern int ixgb_setup_tx_resources(struct ixgb_adapter *adapter);

+extern void ixgb_free_rx_resources(struct ixgb_adapter *adapter);

+extern void ixgb_free_tx_resources(struct ixgb_adapter *adapter);

+extern void ixgb_update_stats(struct ixgb_adapter *adapter);

+

+

 #endif /* _IXGB_H_ */

diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c

index 5d61c2e..45ddf80 100644

--- a/drivers/net/ixgb/ixgb_ethtool.c

+++ b/drivers/net/ixgb/ixgb_ethtool.c

@@ -32,15 +32,6 @@


 #include <asm/uaccess.h>


-extern int ixgb_up(struct ixgb_adapter *adapter);

-extern void ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog);

-extern void ixgb_reset(struct ixgb_adapter *adapter);

-extern int ixgb_setup_rx_resources(struct ixgb_adapter *adapter);

-extern int ixgb_setup_tx_resources(struct ixgb_adapter *adapter);

-extern void ixgb_free_rx_resources(struct ixgb_adapter *adapter);

-extern void ixgb_free_tx_resources(struct ixgb_adapter *adapter);

-extern void ixgb_update_stats(struct ixgb_adapter *adapter);

-

 #define IXGB_ALL_RAR_ENTRIES 16


 struct ixgb_stats {


--
Previous thread: Re: [PATCH net-2.6.26] fib_trie: RCU optimizations by Paul E. McKenney on Friday, March 21, 2008 - 12:01 pm. (5 messages)

Next thread: [PATCH net-2.6.26] netlink: make socket filters work on netlink by Stephen Hemminger on Friday, March 21, 2008 - 2:05 pm. (25 messages)