1 files changed, 19 insertions, 18 deletions

diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index 327c0620da31..5a89dff52264 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -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,
@@ -61,7 +61,7 @@ struct e1000_info;
         ndev_printk(KERN_NOTICE , netdev, format, ## arg)
 
 
-/* TX/RX descriptor defines */
+/* Tx/Rx descriptor defines */
 #define E1000_DEFAULT_TXD               256
 #define E1000_MAX_TXD                   4096
 #define E1000_MIN_TXD                   80
@@ -114,13 +114,13 @@ struct e1000_buffer {
         dma_addr_t dma;
         struct sk_buff *skb;
         union {
-                /* TX */
+                /* Tx */
                 struct {
                         unsigned long time_stamp;
                         u16 length;
                         u16 next_to_watch;
                 };
-                /* RX */
+                /* Rx */
                 /* arrays of page information for packet split */
                 struct e1000_ps_page *ps_pages;
         };
@@ -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;
 
@@ -180,7 +177,7 @@ struct e1000_adapter {
         u16 rx_itr;
 
         /*
-         * TX
+         * Tx
          */
         struct e1000_ring *tx_ring /* One per active queue */
                                                 ____cacheline_aligned_in_smp;
@@ -202,7 +199,7 @@ struct e1000_adapter {
         unsigned int total_rx_bytes;
         unsigned int total_rx_packets;
 
-        /* TX stats */
+        /* Tx stats */
         u64 tpt_old;
         u64 colc_old;
         u64 gotcl_old;
@@ -214,7 +211,7 @@ struct e1000_adapter {
         u32 tx_dma_failed;
 
         /*
-         * RX
+         * Rx
          */
         bool (*clean_rx) (struct e1000_adapter *adapter,
                           int *work_done, int work_to_do)
@@ -226,7 +223,7 @@ struct e1000_adapter {
         u32 rx_int_delay;
         u32 rx_abs_int_delay;
 
-        /* RX stats */
+        /* Rx stats */
         u64 hw_csum_err;
         u64 hw_csum_good;
         u64 rx_hdr_split;
@@ -237,6 +234,8 @@ struct e1000_adapter {
 
         unsigned int rx_ps_pages;
         u16 rx_ps_bsize0;
+        u32 max_frame_size;
+        u32 min_frame_size;
 
         /* OS defined structs */
         struct net_device *netdev;
@@ -261,7 +260,7 @@ struct e1000_adapter {
         u32 wol;
         u32 pba;
 
-        u8 fc_autoneg;
+        bool fc_autoneg;
 
         unsigned long led_status;
 
@@ -272,7 +271,7 @@ struct e1000_info {
         enum e1000_mac_type     mac;
         unsigned int            flags;
         u32                     pba;
-        s32                     (*get_invariants)(struct e1000_adapter *);
+        s32                     (*get_variants)(struct e1000_adapter *);
         struct e1000_mac_operations *mac_ops;
         struct e1000_phy_operations *phy_ops;
         struct e1000_nvm_operations *nvm_ops;
@@ -308,6 +307,7 @@ struct e1000_info {
 #define FLAG_MSI_ENABLED                  (1 << 27)
 #define FLAG_RX_CSUM_ENABLED              (1 << 28)
 #define FLAG_TSO_FORCE                    (1 << 29)
+#define FLAG_RX_RESTART_NOW               (1 << 30)
 
 #define E1000_RX_DESC_PS(R, i)      \
         (&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
@@ -357,7 +357,7 @@ extern struct e1000_info e1000_ich8_info;
 extern struct e1000_info e1000_ich9_info;
 extern struct e1000_info e1000_es2_info;
 
-extern s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num);
+extern s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num);
 
 extern s32  e1000e_commit_phy(struct e1000_hw *hw);
 
@@ -390,9 +390,11 @@ extern s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw);
 extern s32 e1000e_setup_link(struct e1000_hw *hw);
 extern void e1000e_clear_vfta(struct e1000_hw *hw);
 extern void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);
-extern void e1000e_mc_addr_list_update_generic(struct e1000_hw *hw,
-                                       u8 *mc_addr_list, u32 mc_addr_count,
-                                       u32 rar_used_count, u32 rar_count);
+extern void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
+                                               u8 *mc_addr_list,
+                                               u32 mc_addr_count,
+                                               u32 rar_used_count,
+                                               u32 rar_count);
 extern void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
 extern s32 e1000e_set_fc_watermarks(struct e1000_hw *hw);
 extern void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);
@@ -462,7 +464,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);