aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/igb_main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-27 02:48:40 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-27 02:48:40 -0500
commit5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch)
tree22d29905c148d2d743b3eccb585fbe60fb91e25a /drivers/net/igb/igb_main.c
parent851fd7bd88524bb4e20f3def3127cd9167d6d0cf (diff)
parent3ec192559033ed457f0d7856838654c100fc659f (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/hp-plus.c drivers/net/wireless/ath5k/base.c drivers/net/wireless/ath9k/recv.c net/wireless/reg.c
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r--drivers/net/igb/igb_main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index ab37ab03a45c..d7daf12ab07d 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1975,7 +1975,6 @@ static void igb_configure_rx(struct igb_adapter *adapter)
1975 1975
1976/** 1976/**
1977 * igb_free_tx_resources - Free Tx Resources per Queue 1977 * igb_free_tx_resources - Free Tx Resources per Queue
1978 * @adapter: board private structure
1979 * @tx_ring: Tx descriptor ring for a specific queue 1978 * @tx_ring: Tx descriptor ring for a specific queue
1980 * 1979 *
1981 * Free all transmit software resources 1980 * Free all transmit software resources
@@ -2028,7 +2027,6 @@ static void igb_unmap_and_free_tx_resource(struct igb_adapter *adapter,
2028 2027
2029/** 2028/**
2030 * igb_clean_tx_ring - Free Tx Buffers 2029 * igb_clean_tx_ring - Free Tx Buffers
2031 * @adapter: board private structure
2032 * @tx_ring: ring to be cleaned 2030 * @tx_ring: ring to be cleaned
2033 **/ 2031 **/
2034static void igb_clean_tx_ring(struct igb_ring *tx_ring) 2032static void igb_clean_tx_ring(struct igb_ring *tx_ring)
@@ -2075,7 +2073,6 @@ static void igb_clean_all_tx_rings(struct igb_adapter *adapter)
2075 2073
2076/** 2074/**
2077 * igb_free_rx_resources - Free Rx Resources 2075 * igb_free_rx_resources - Free Rx Resources
2078 * @adapter: board private structure
2079 * @rx_ring: ring to clean the resources from 2076 * @rx_ring: ring to clean the resources from
2080 * 2077 *
2081 * Free all receive software resources 2078 * Free all receive software resources
@@ -2115,7 +2112,6 @@ static void igb_free_all_rx_resources(struct igb_adapter *adapter)
2115 2112
2116/** 2113/**
2117 * igb_clean_rx_ring - Free Rx Buffers per Queue 2114 * igb_clean_rx_ring - Free Rx Buffers per Queue
2118 * @adapter: board private structure
2119 * @rx_ring: ring to free buffers from 2115 * @rx_ring: ring to free buffers from
2120 **/ 2116 **/
2121static void igb_clean_rx_ring(struct igb_ring *rx_ring) 2117static void igb_clean_rx_ring(struct igb_ring *rx_ring)