diff options
Diffstat (limited to 'drivers/net/atl1c/atl1c.h')
-rw-r--r-- | drivers/net/atl1c/atl1c.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h index 52abbbdf8a08..925929d764ca 100644 --- a/drivers/net/atl1c/atl1c.h +++ b/drivers/net/atl1c/atl1c.h | |||
@@ -265,7 +265,7 @@ struct atl1c_recv_ret_status { | |||
265 | __le32 word3; | 265 | __le32 word3; |
266 | }; | 266 | }; |
267 | 267 | ||
268 | /* RFD desciptor */ | 268 | /* RFD descriptor */ |
269 | struct atl1c_rx_free_desc { | 269 | struct atl1c_rx_free_desc { |
270 | __le64 buffer_addr; | 270 | __le64 buffer_addr; |
271 | }; | 271 | }; |
@@ -531,7 +531,7 @@ struct atl1c_rfd_ring { | |||
531 | struct atl1c_buffer *buffer_info; | 531 | struct atl1c_buffer *buffer_info; |
532 | }; | 532 | }; |
533 | 533 | ||
534 | /* receive return desciptor (rrd) ring */ | 534 | /* receive return descriptor (rrd) ring */ |
535 | struct atl1c_rrd_ring { | 535 | struct atl1c_rrd_ring { |
536 | void *desc; /* descriptor ring virtual address */ | 536 | void *desc; /* descriptor ring virtual address */ |
537 | dma_addr_t dma; /* descriptor ring physical address */ | 537 | dma_addr_t dma; /* descriptor ring physical address */ |
@@ -559,7 +559,6 @@ struct atl1c_adapter { | |||
559 | struct napi_struct napi; | 559 | struct napi_struct napi; |
560 | struct atl1c_hw hw; | 560 | struct atl1c_hw hw; |
561 | struct atl1c_hw_stats hw_stats; | 561 | struct atl1c_hw_stats hw_stats; |
562 | struct net_device_stats net_stats; | ||
563 | struct mii_if_info mii; /* MII interface info */ | 562 | struct mii_if_info mii; /* MII interface info */ |
564 | u16 rx_buffer_len; | 563 | u16 rx_buffer_len; |
565 | 564 | ||
@@ -567,9 +566,9 @@ struct atl1c_adapter { | |||
567 | #define __AT_TESTING 0x0001 | 566 | #define __AT_TESTING 0x0001 |
568 | #define __AT_RESETTING 0x0002 | 567 | #define __AT_RESETTING 0x0002 |
569 | #define __AT_DOWN 0x0003 | 568 | #define __AT_DOWN 0x0003 |
570 | u8 work_event; | 569 | unsigned long work_event; |
571 | #define ATL1C_WORK_EVENT_RESET 0x01 | 570 | #define ATL1C_WORK_EVENT_RESET 0 |
572 | #define ATL1C_WORK_EVENT_LINK_CHANGE 0x02 | 571 | #define ATL1C_WORK_EVENT_LINK_CHANGE 1 |
573 | u32 msg_enable; | 572 | u32 msg_enable; |
574 | 573 | ||
575 | bool have_msi; | 574 | bool have_msi; |
@@ -632,8 +631,6 @@ struct atl1c_adapter { | |||
632 | extern char atl1c_driver_name[]; | 631 | extern char atl1c_driver_name[]; |
633 | extern char atl1c_driver_version[]; | 632 | extern char atl1c_driver_version[]; |
634 | 633 | ||
635 | extern int atl1c_up(struct atl1c_adapter *adapter); | ||
636 | extern void atl1c_down(struct atl1c_adapter *adapter); | ||
637 | extern void atl1c_reinit_locked(struct atl1c_adapter *adapter); | 634 | extern void atl1c_reinit_locked(struct atl1c_adapter *adapter); |
638 | extern s32 atl1c_reset_hw(struct atl1c_hw *hw); | 635 | extern s32 atl1c_reset_hw(struct atl1c_hw *hw); |
639 | extern void atl1c_set_ethtool_ops(struct net_device *netdev); | 636 | extern void atl1c_set_ethtool_ops(struct net_device *netdev); |