diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2008-03-28 12:15:03 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-03-28 22:14:56 -0400 |
commit | ad68076e07fa01bd0c98278a959d0fd2bb26f1ac (patch) | |
tree | f0b664ecdb38478f9b995aff10dcb39a09221fb6 /drivers/net/e1000e/e1000.h | |
parent | 652f093fdf14c7ca1e13c052da429ae385e4dc21 (diff) |
e1000e: reformat comment blocks, cosmetic changes only
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>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
-rw-r--r-- | drivers/net/e1000e/e1000.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index 4bf0c6c045c0..ffba63c95f85 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /******************************************************************************* | 1 | /******************************************************************************* |
2 | 2 | ||
3 | Intel PRO/1000 Linux driver | 3 | Intel PRO/1000 Linux driver |
4 | Copyright(c) 1999 - 2007 Intel Corporation. | 4 | Copyright(c) 1999 - 2008 Intel Corporation. |
5 | 5 | ||
6 | This program is free software; you can redistribute it and/or modify it | 6 | This program is free software; you can redistribute it and/or modify it |
7 | under the terms and conditions of the GNU General Public License, | 7 | under the terms and conditions of the GNU General Public License, |
@@ -61,7 +61,7 @@ struct e1000_info; | |||
61 | ndev_printk(KERN_NOTICE , netdev, format, ## arg) | 61 | ndev_printk(KERN_NOTICE , netdev, format, ## arg) |
62 | 62 | ||
63 | 63 | ||
64 | /* TX/RX descriptor defines */ | 64 | /* Tx/Rx descriptor defines */ |
65 | #define E1000_DEFAULT_TXD 256 | 65 | #define E1000_DEFAULT_TXD 256 |
66 | #define E1000_MAX_TXD 4096 | 66 | #define E1000_MAX_TXD 4096 |
67 | #define E1000_MIN_TXD 80 | 67 | #define E1000_MIN_TXD 80 |
@@ -114,13 +114,13 @@ struct e1000_buffer { | |||
114 | dma_addr_t dma; | 114 | dma_addr_t dma; |
115 | struct sk_buff *skb; | 115 | struct sk_buff *skb; |
116 | union { | 116 | union { |
117 | /* TX */ | 117 | /* Tx */ |
118 | struct { | 118 | struct { |
119 | unsigned long time_stamp; | 119 | unsigned long time_stamp; |
120 | u16 length; | 120 | u16 length; |
121 | u16 next_to_watch; | 121 | u16 next_to_watch; |
122 | }; | 122 | }; |
123 | /* RX */ | 123 | /* Rx */ |
124 | /* arrays of page information for packet split */ | 124 | /* arrays of page information for packet split */ |
125 | struct e1000_ps_page *ps_pages; | 125 | struct e1000_ps_page *ps_pages; |
126 | }; | 126 | }; |
@@ -177,7 +177,7 @@ struct e1000_adapter { | |||
177 | u16 rx_itr; | 177 | u16 rx_itr; |
178 | 178 | ||
179 | /* | 179 | /* |
180 | * TX | 180 | * Tx |
181 | */ | 181 | */ |
182 | struct e1000_ring *tx_ring /* One per active queue */ | 182 | struct e1000_ring *tx_ring /* One per active queue */ |
183 | ____cacheline_aligned_in_smp; | 183 | ____cacheline_aligned_in_smp; |
@@ -199,7 +199,7 @@ struct e1000_adapter { | |||
199 | unsigned int total_rx_bytes; | 199 | unsigned int total_rx_bytes; |
200 | unsigned int total_rx_packets; | 200 | unsigned int total_rx_packets; |
201 | 201 | ||
202 | /* TX stats */ | 202 | /* Tx stats */ |
203 | u64 tpt_old; | 203 | u64 tpt_old; |
204 | u64 colc_old; | 204 | u64 colc_old; |
205 | u64 gotcl_old; | 205 | u64 gotcl_old; |
@@ -211,7 +211,7 @@ struct e1000_adapter { | |||
211 | u32 tx_dma_failed; | 211 | u32 tx_dma_failed; |
212 | 212 | ||
213 | /* | 213 | /* |
214 | * RX | 214 | * Rx |
215 | */ | 215 | */ |
216 | bool (*clean_rx) (struct e1000_adapter *adapter, | 216 | bool (*clean_rx) (struct e1000_adapter *adapter, |
217 | int *work_done, int work_to_do) | 217 | int *work_done, int work_to_do) |
@@ -223,7 +223,7 @@ struct e1000_adapter { | |||
223 | u32 rx_int_delay; | 223 | u32 rx_int_delay; |
224 | u32 rx_abs_int_delay; | 224 | u32 rx_abs_int_delay; |
225 | 225 | ||
226 | /* RX stats */ | 226 | /* Rx stats */ |
227 | u64 hw_csum_err; | 227 | u64 hw_csum_err; |
228 | u64 hw_csum_good; | 228 | u64 hw_csum_good; |
229 | u64 rx_hdr_split; | 229 | u64 rx_hdr_split; |