Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / drivers / net / e1000e / 82571.c

diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 9b46a00bb5f1fbcac4730122a9ad145b5fdec55c..462351ca2c81ac991a088b971a0bc46b1f51c5a7 100644 (file)
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -248,7 +248,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
        return 0;
 }
 
-static s32 e1000_get_invariants_82571(struct e1000_adapter *adapter)
+static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)
 {
        struct e1000_hw *hw = &adapter->hw;
        static int global_quad_port_a; /* global port a indication */
@@ -836,19 +836,19 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
        ret_val = e1000_setup_link_82571(hw);
 
        /* Set the transmit descriptor write-back policy */
-       reg_data = er32(TXDCTL);
+       reg_data = er32(TXDCTL(0));
        reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
                   E1000_TXDCTL_FULL_TX_DESC_WB |
                   E1000_TXDCTL_COUNT_DESC;
-       ew32(TXDCTL, reg_data);
+       ew32(TXDCTL(0), reg_data);
 
        /* ...for both queues. */
        if (mac->type != e1000_82573) {
-               reg_data = er32(TXDCTL1);
+               reg_data = er32(TXDCTL(1));
                reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
                           E1000_TXDCTL_FULL_TX_DESC_WB |
                           E1000_TXDCTL_COUNT_DESC;
-               ew32(TXDCTL1, reg_data);
+               ew32(TXDCTL(1), reg_data);
        } else {
                e1000e_enable_tx_pkt_filtering(hw);
                reg_data = er32(GCR);
@@ -878,17 +878,17 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
        u32 reg;
 
        /* Transmit Descriptor Control 0 */
-       reg = er32(TXDCTL);
+       reg = er32(TXDCTL(0));
        reg |= (1 << 22);
-       ew32(TXDCTL, reg);
+       ew32(TXDCTL(0), reg);
 
        /* Transmit Descriptor Control 1 */
-       reg = er32(TXDCTL1);
+       reg = er32(TXDCTL(1));
        reg |= (1 << 22);
-       ew32(TXDCTL1, reg);
+       ew32(TXDCTL(1), reg);
 
        /* Transmit Arbitration Control 0 */
-       reg = er32(TARC0);
+       reg = er32(TARC(0));
        reg &= ~(0xF << 27); /* 30:27 */
        switch (hw->mac.type) {
        case e1000_82571:
@@ -898,10 +898,10 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
        default:
                break;
        }
-       ew32(TARC0, reg);
+       ew32(TARC(0), reg);
 
        /* Transmit Arbitration Control 1 */
-       reg = er32(TARC1);
+       reg = er32(TARC(1));
        switch (hw->mac.type) {
        case e1000_82571:
        case e1000_82572:
@@ -911,7 +911,7 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
                        reg &= ~(1 << 28);
                else
                        reg |= (1 << 28);
-               ew32(TARC1, reg);
+               ew32(TARC(1), reg);
                break;
        default:
                break;
@@ -1326,18 +1326,16 @@ struct e1000_info e1000_82571_info = {
        .mac                    = e1000_82571,
        .flags                  = FLAG_HAS_HW_VLAN_FILTER
                                  | FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_HAS_STATS_PTC_PRC
                                  | FLAG_HAS_WOL
                                  | FLAG_APME_IN_CTRL3
                                  | FLAG_RX_CSUM_ENABLED
                                  | FLAG_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_HAS_STATS_ICR_ICT
                                  | FLAG_HAS_SMART_POWER_DOWN
                                  | FLAG_RESET_OVERWRITES_LAA /* errata */
                                  | FLAG_TARC_SPEED_MODE_BIT /* errata */
                                  | FLAG_APME_CHECK_PORT_B,
        .pba                    = 38,
-       .get_invariants         = e1000_get_invariants_82571,
+       .get_variants           = e1000_get_variants_82571,
        .mac_ops                = &e82571_mac_ops,
        .phy_ops                = &e82_phy_ops_igp,
        .nvm_ops                = &e82571_nvm_ops,
@@ -1347,15 +1345,13 @@ struct e1000_info e1000_82572_info = {
        .mac                    = e1000_82572,
        .flags                  = FLAG_HAS_HW_VLAN_FILTER
                                  | FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_HAS_STATS_PTC_PRC
                                  | FLAG_HAS_WOL
                                  | FLAG_APME_IN_CTRL3
                                  | FLAG_RX_CSUM_ENABLED
                                  | FLAG_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_HAS_STATS_ICR_ICT
                                  | FLAG_TARC_SPEED_MODE_BIT, /* errata */
        .pba                    = 38,
-       .get_invariants         = e1000_get_invariants_82571,
+       .get_variants           = e1000_get_variants_82571,
        .mac_ops                = &e82571_mac_ops,
        .phy_ops                = &e82_phy_ops_igp,
        .nvm_ops                = &e82571_nvm_ops,
@@ -1365,17 +1361,15 @@ struct e1000_info e1000_82573_info = {
        .mac                    = e1000_82573,
        .flags                  = FLAG_HAS_HW_VLAN_FILTER
                                  | FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_HAS_STATS_PTC_PRC
                                  | FLAG_HAS_WOL
                                  | FLAG_APME_IN_CTRL3
                                  | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_STATS_ICR_ICT
                                  | FLAG_HAS_SMART_POWER_DOWN
                                  | FLAG_HAS_AMT
                                  | FLAG_HAS_ERT
                                  | FLAG_HAS_SWSM_ON_LOAD,
        .pba                    = 20,
-       .get_invariants         = e1000_get_invariants_82571,
+       .get_variants           = e1000_get_variants_82571,
        .mac_ops                = &e82571_mac_ops,
        .phy_ops                = &e82_phy_ops_m88,
        .nvm_ops                = &e82571_nvm_ops,