162 files changed, 12878 insertions, 6356 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 16fe4f9b719b..f4b39274308a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -238,8 +238,8 @@ source "drivers/net/arm/Kconfig"
 config AX88796
        tristate "ASIX AX88796 NE2000 clone support"
        depends on ARM || MIPS || SUPERH
-        select CRC32
+        select PHYLIB
-        select MII
+        select MDIO_BITBANG
        help
          AX88796 driver, using platform bus to provide
          chip detection and resources
@@ -1944,7 +1944,8 @@ config 68360_ENET
 config FEC
        bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
        depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
-                MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28
+                IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC
+        default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
        select PHYLIB
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
@@ -2864,7 +2865,7 @@ config MLX4_CORE
        default n
 config MLX4_DEBUG
-        bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED)
+        bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
        depends on MLX4_CORE
        default y
        ---help---
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index 62d6f88cbab5..aa07657744c3 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -1644,7 +1644,7 @@ ks8695_cleanup(void)
 module_init(ks8695_init);
 module_exit(ks8695_cleanup);
-MODULE_AUTHOR("Simtec Electronics")
+MODULE_AUTHOR("Simtec Electronics");
 MODULE_DESCRIPTION("Micrel KS8695 (Centaur) Ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" MODULENAME);
diff --git a/drivers/net/atl1c/atl1c_hw.c b/drivers/net/atl1c/atl1c_hw.c
index 1bf672009948..23f2ab0f2fa8 100644
--- a/drivers/net/atl1c/atl1c_hw.c
+++ b/drivers/net/atl1c/atl1c_hw.c
@@ -345,7 +345,7 @@ int atl1c_write_phy_reg(struct atl1c_hw *hw, u32 reg_addr, u16 phy_data)
 */
 static int atl1c_phy_setup_adv(struct atl1c_hw *hw)
 {
-        u16 mii_adv_data = ADVERTISE_DEFAULT_CAP & ~ADVERTISE_SPEED_MASK;
+        u16 mii_adv_data = ADVERTISE_DEFAULT_CAP & ~ADVERTISE_ALL;
        u16 mii_giga_ctrl_data = GIGA_CR_1000T_DEFAULT_CAP &
                                ~GIGA_CR_1000T_SPEED_MASK;
@@ -373,7 +373,7 @@ static int atl1c_phy_setup_adv(struct atl1c_hw *hw)
        }
        if (atl1c_write_phy_reg(hw, MII_ADVERTISE, mii_adv_data) != 0 ||
-            atl1c_write_phy_reg(hw, MII_GIGA_CR, mii_giga_ctrl_data) != 0)
+            atl1c_write_phy_reg(hw, MII_CTRL1000, mii_giga_ctrl_data) != 0)
                return -1;
        return 0;
 }
@@ -517,19 +517,18 @@ int atl1c_phy_init(struct atl1c_hw *hw)
                                        "Error Setting up Auto-Negotiation\n");
                        return ret_val;
                }
-                mii_bmcr_data |= BMCR_AUTO_NEG_EN | BMCR_RESTART_AUTO_NEG;
+                mii_bmcr_data |= BMCR_ANENABLE | BMCR_ANRESTART;
                break;
        case MEDIA_TYPE_100M_FULL:
-                mii_bmcr_data |= BMCR_SPEED_100 | BMCR_FULL_DUPLEX;
+                mii_bmcr_data |= BMCR_SPEED100 | BMCR_FULLDPLX;
                break;
        case MEDIA_TYPE_100M_HALF:
-                mii_bmcr_data |= BMCR_SPEED_100;
+                mii_bmcr_data |= BMCR_SPEED100;
                break;
        case MEDIA_TYPE_10M_FULL:
-                mii_bmcr_data |= BMCR_SPEED_10 | BMCR_FULL_DUPLEX;
+                mii_bmcr_data |= BMCR_FULLDPLX;
                break;
        case MEDIA_TYPE_10M_HALF:
-                mii_bmcr_data |= BMCR_SPEED_10;
                break;
        default:
                if (netif_msg_link(adapter))
@@ -657,7 +656,7 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw)
        err = atl1c_phy_setup_adv(hw);
        if (err)
                return err;
-        mii_bmcr_data |= BMCR_AUTO_NEG_EN | BMCR_RESTART_AUTO_NEG;
+        mii_bmcr_data |= BMCR_ANENABLE | BMCR_ANRESTART;
        return atl1c_write_phy_reg(hw, MII_BMCR, mii_bmcr_data);
 }
diff --git a/drivers/net/atl1c/atl1c_hw.h b/drivers/net/atl1c/atl1c_hw.h
index 3dd675979aa1..655fc6c4a8a4 100644
--- a/drivers/net/atl1c/atl1c_hw.h
+++ b/drivers/net/atl1c/atl1c_hw.h
@@ -736,55 +736,16 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define REG_DEBUG_DATA0                 0x1900
 #define REG_DEBUG_DATA1                 0x1904
-/* PHY Control Register */
-#define MII_BMCR                        0x00
-#define BMCR_SPEED_SELECT_MSB           0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define BMCR_COLL_TEST_ENABLE           0x0080  /* Collision test enable */
-#define BMCR_FULL_DUPLEX                0x0100  /* FDX =1, half duplex =0 */
-#define BMCR_RESTART_AUTO_NEG           0x0200  /* Restart auto negotiation */
-#define BMCR_ISOLATE                    0x0400  /* Isolate PHY from MII */
-#define BMCR_POWER_DOWN                 0x0800  /* Power down */
-#define BMCR_AUTO_NEG_EN                0x1000  /* Auto Neg Enable */
-#define BMCR_SPEED_SELECT_LSB           0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define BMCR_LOOPBACK                   0x4000  /* 0 = normal, 1 = loopback */
-#define BMCR_RESET                      0x8000  /* 0 = normal, 1 = PHY reset */
-#define BMCR_SPEED_MASK                 0x2040
-#define BMCR_SPEED_1000                 0x0040
-#define BMCR_SPEED_100                  0x2000
-#define BMCR_SPEED_10                   0x0000
-/* PHY Status Register */
-#define MII_BMSR                        0x01
-#define BMMSR_EXTENDED_CAPS             0x0001  /* Extended register capabilities */
-#define BMSR_JABBER_DETECT              0x0002  /* Jabber Detected */
-#define BMSR_LINK_STATUS                0x0004  /* Link Status 1 = link */
-#define BMSR_AUTONEG_CAPS               0x0008  /* Auto Neg Capable */
-#define BMSR_REMOTE_FAULT               0x0010  /* Remote Fault Detect */
-#define BMSR_AUTONEG_COMPLETE           0x0020  /* Auto Neg Complete */
-#define BMSR_PREAMBLE_SUPPRESS          0x0040  /* Preamble may be suppressed */
-#define BMSR_EXTENDED_STATUS            0x0100  /* Ext. status info in Reg 0x0F */
-#define BMSR_100T2_HD_CAPS              0x0200  /* 100T2 Half Duplex Capable */
-#define BMSR_100T2_FD_CAPS              0x0400  /* 100T2 Full Duplex Capable */
-#define BMSR_10T_HD_CAPS                0x0800  /* 10T   Half Duplex Capable */
-#define BMSR_10T_FD_CAPS                0x1000  /* 10T   Full Duplex Capable */
-#define BMSR_100X_HD_CAPS               0x2000  /* 100X  Half Duplex Capable */
-#define BMMII_SR_100X_FD_CAPS           0x4000  /* 100X  Full Duplex Capable */
-#define BMMII_SR_100T4_CAPS             0x8000  /* 100T4 Capable */
-#define MII_PHYSID1                     0x02
-#define MII_PHYSID2                     0x03
 #define L1D_MPW_PHYID1                  0xD01C  /* V7 */
 #define L1D_MPW_PHYID2                  0xD01D  /* V1-V6 */
 #define L1D_MPW_PHYID3                  0xD01E  /* V8 */
 /* Autoneg Advertisement Register */
-#define MII_ADVERTISE                   0x04
+#define ADVERTISE_DEFAULT_CAP \
-#define ADVERTISE_SPEED_MASK            0x01E0
+        (ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)
-#define ADVERTISE_DEFAULT_CAP           0x0DE0
 /* 1000BASE-T Control Register */
-#define MII_GIGA_CR                     0x09
 #define GIGA_CR_1000T_REPEATER_DTE      0x0400  /* 1=Repeater/switch device port 0=DTE device */
 #define GIGA_CR_1000T_MS_VALUE          0x0800  /* 1=Configure PHY as Master 0=Configure PHY as Slave */
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index a699bbf20eb5..e60595f0247c 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -48,6 +48,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
        {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)},
        {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B2)},
        {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D_2_0)},
        /* required last entry */
        { 0 }
 };
@@ -2717,7 +2718,6 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
                goto err_reset;
        }
-        device_init_wakeup(&pdev->dev, 1);
        /* reset the controller to
         * put the device in a known good starting state */
        err = atl1c_phy_init(&adapter->hw);
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c
index 6943a6c3b948..1209297433b8 100644
--- a/drivers/net/atl1e/atl1e_ethtool.c
+++ b/drivers/net/atl1e/atl1e_ethtool.c
@@ -95,18 +95,18 @@ static int atl1e_set_settings(struct net_device *netdev,
                ecmd->advertising = hw->autoneg_advertised |
                                    ADVERTISED_TP | ADVERTISED_Autoneg;
-                adv4 = hw->mii_autoneg_adv_reg & ~MII_AR_SPEED_MASK;
+                adv4 = hw->mii_autoneg_adv_reg & ~ADVERTISE_ALL;
                adv9 = hw->mii_1000t_ctrl_reg & ~MII_AT001_CR_1000T_SPEED_MASK;
                if (hw->autoneg_advertised & ADVERTISE_10_HALF)
-                        adv4 |= MII_AR_10T_HD_CAPS;
+                        adv4 |= ADVERTISE_10HALF;
                if (hw->autoneg_advertised & ADVERTISE_10_FULL)
-                        adv4 |= MII_AR_10T_FD_CAPS;
+                        adv4 |= ADVERTISE_10FULL;
                if (hw->autoneg_advertised & ADVERTISE_100_HALF)
-                        adv4 |= MII_AR_100TX_HD_CAPS;
+                        adv4 |= ADVERTISE_100HALF;
                if (hw->autoneg_advertised & ADVERTISE_100_FULL)
-                        adv4 |= MII_AR_100TX_FD_CAPS;
+                        adv4 |= ADVERTISE_100FULL;
                if (hw->autoneg_advertised & ADVERTISE_1000_FULL)
-                        adv9 |= MII_AT001_CR_1000T_FD_CAPS;
+                        adv9 |= ADVERTISE_1000FULL;
                if (adv4 != hw->mii_autoneg_adv_reg ||
                                adv9 != hw->mii_1000t_ctrl_reg) {
diff --git a/drivers/net/atl1e/atl1e_hw.c b/drivers/net/atl1e/atl1e_hw.c
index 76cc043def8c..923063d2e5bb 100644
--- a/drivers/net/atl1e/atl1e_hw.c
+++ b/drivers/net/atl1e/atl1e_hw.c
@@ -318,7 +318,7 @@ static int atl1e_phy_setup_autoneg_adv(struct atl1e_hw *hw)
         * Advertisement Register (Address 4) and the 1000 mb speed bits in
         * the  1000Base-T control Register (Address 9).
         */
-        mii_autoneg_adv_reg &= ~MII_AR_SPEED_MASK;
+        mii_autoneg_adv_reg &= ~ADVERTISE_ALL;
        mii_1000t_ctrl_reg  &= ~MII_AT001_CR_1000T_SPEED_MASK;
        /*
@@ -327,44 +327,37 @@ static int atl1e_phy_setup_autoneg_adv(struct atl1e_hw *hw)
         */
        switch (hw->media_type) {
        case MEDIA_TYPE_AUTO_SENSOR:
-                mii_autoneg_adv_reg |= (MII_AR_10T_HD_CAPS   |
+                mii_autoneg_adv_reg |= ADVERTISE_ALL;
-                                        MII_AR_10T_FD_CAPS   |
+                hw->autoneg_advertised = ADVERTISE_ALL;
-                                        MII_AR_100TX_HD_CAPS |
-                                        MII_AR_100TX_FD_CAPS);
-                hw->autoneg_advertised = ADVERTISE_10_HALF  |
-                                         ADVERTISE_10_FULL  |
-                                         ADVERTISE_100_HALF |
-                                         ADVERTISE_100_FULL;
                if (hw->nic_type == athr_l1e) {
-                        mii_1000t_ctrl_reg |=
+                        mii_1000t_ctrl_reg |= ADVERTISE_1000FULL;
-                                MII_AT001_CR_1000T_FD_CAPS;
                        hw->autoneg_advertised |= ADVERTISE_1000_FULL;
                }
                break;
        case MEDIA_TYPE_100M_FULL:
-                mii_autoneg_adv_reg   |= MII_AR_100TX_FD_CAPS;
+                mii_autoneg_adv_reg   |= ADVERTISE_100FULL;
                hw->autoneg_advertised = ADVERTISE_100_FULL;
                break;
        case MEDIA_TYPE_100M_HALF:
-                mii_autoneg_adv_reg   |= MII_AR_100TX_HD_CAPS;
+                mii_autoneg_adv_reg   |= ADVERTISE_100_HALF;
                hw->autoneg_advertised = ADVERTISE_100_HALF;
                break;
        case MEDIA_TYPE_10M_FULL:
-                mii_autoneg_adv_reg   |= MII_AR_10T_FD_CAPS;
+                mii_autoneg_adv_reg   |= ADVERTISE_10_FULL;
                hw->autoneg_advertised = ADVERTISE_10_FULL;
                break;
        default:
-                mii_autoneg_adv_reg   |= MII_AR_10T_HD_CAPS;
+                mii_autoneg_adv_reg   |= ADVERTISE_10_HALF;
                hw->autoneg_advertised = ADVERTISE_10_HALF;
                break;
        }
        /* flow control fixed to enable all */
-        mii_autoneg_adv_reg |= (MII_AR_ASM_DIR | MII_AR_PAUSE);
+        mii_autoneg_adv_reg |= (ADVERTISE_PAUSE_ASYM | ADVERTISE_PAUSE_CAP);
        hw->mii_autoneg_adv_reg = mii_autoneg_adv_reg;
        hw->mii_1000t_ctrl_reg  = mii_1000t_ctrl_reg;
@@ -374,7 +367,7 @@ static int atl1e_phy_setup_autoneg_adv(struct atl1e_hw *hw)
                return ret_val;
        if (hw->nic_type == athr_l1e || hw->nic_type == athr_l2e_revA) {
-                ret_val = atl1e_write_phy_reg(hw, MII_AT001_CR,
+                ret_val = atl1e_write_phy_reg(hw, MII_CTRL1000,
                                           mii_1000t_ctrl_reg);
                if (ret_val)
                        return ret_val;
@@ -397,7 +390,7 @@ int atl1e_phy_commit(struct atl1e_hw *hw)
        int ret_val;
        u16 phy_data;
-        phy_data = MII_CR_RESET | MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG;
+        phy_data = BMCR_RESET | BMCR_ANENABLE | BMCR_ANRESTART;
        ret_val = atl1e_write_phy_reg(hw, MII_BMCR, phy_data);
        if (ret_val) {
@@ -645,15 +638,14 @@ int atl1e_restart_autoneg(struct atl1e_hw *hw)
                return err;
        if (hw->nic_type == athr_l1e || hw->nic_type == athr_l2e_revA) {
-                err = atl1e_write_phy_reg(hw, MII_AT001_CR,
+                err = atl1e_write_phy_reg(hw, MII_CTRL1000,
                                       hw->mii_1000t_ctrl_reg);
                if (err)
                        return err;
        }
        err = atl1e_write_phy_reg(hw, MII_BMCR,
-                        MII_CR_RESET | MII_CR_AUTO_NEG_EN |
+                        BMCR_RESET | BMCR_ANENABLE | BMCR_ANRESTART);
-                        MII_CR_RESTART_AUTO_NEG);
        return err;
 }
diff --git a/drivers/net/atl1e/atl1e_hw.h b/drivers/net/atl1e/atl1e_hw.h
index 5ea2f4d86cfa..74df16aef793 100644
--- a/drivers/net/atl1e/atl1e_hw.h
+++ b/drivers/net/atl1e/atl1e_hw.h
@@ -629,127 +629,24 @@ s32 atl1e_restart_autoneg(struct atl1e_hw *hw);
 /***************************** MII definition ***************************************/
 /* PHY Common Register */
-#define MII_BMCR                        0x00
-#define MII_BMSR                        0x01
-#define MII_PHYSID1                     0x02
-#define MII_PHYSID2                     0x03
-#define MII_ADVERTISE                   0x04
-#define MII_LPA                         0x05
-#define MII_EXPANSION                   0x06
-#define MII_AT001_CR                    0x09
-#define MII_AT001_SR                    0x0A
-#define MII_AT001_ESR                   0x0F
 #define MII_AT001_PSCR                  0x10
 #define MII_AT001_PSSR                  0x11
 #define MII_INT_CTRL                    0x12
 #define MII_INT_STATUS                  0x13
 #define MII_SMARTSPEED                  0x14
-#define MII_RERRCOUNTER                 0x15
-#define MII_SREVISION                   0x16
-#define MII_RESV1                       0x17
 #define MII_LBRERROR                    0x18
-#define MII_PHYADDR                     0x19
 #define MII_RESV2                       0x1a
-#define MII_TPISTATUS                   0x1b
-#define MII_NCONFIG                     0x1c
 #define MII_DBG_ADDR                    0x1D
 #define MII_DBG_DATA                    0x1E
-/* PHY Control Register */
-#define MII_CR_SPEED_SELECT_MSB                  0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_COLL_TEST_ENABLE                  0x0080  /* Collision test enable */
-#define MII_CR_FULL_DUPLEX                       0x0100  /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG                  0x0200  /* Restart auto negotiation */
-#define MII_CR_ISOLATE                           0x0400  /* Isolate PHY from MII */
-#define MII_CR_POWER_DOWN                        0x0800  /* Power down */
-#define MII_CR_AUTO_NEG_EN                       0x1000  /* Auto Neg Enable */
-#define MII_CR_SPEED_SELECT_LSB                  0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_LOOPBACK                          0x4000  /* 0 = normal, 1 = loopback */
-#define MII_CR_RESET                             0x8000  /* 0 = normal, 1 = PHY reset */
-#define MII_CR_SPEED_MASK                        0x2040
-#define MII_CR_SPEED_1000                        0x0040
-#define MII_CR_SPEED_100                         0x2000
-#define MII_CR_SPEED_10                          0x0000
-/* PHY Status Register */
-#define MII_SR_EXTENDED_CAPS                     0x0001  /* Extended register capabilities */
-#define MII_SR_JABBER_DETECT                     0x0002  /* Jabber Detected */
-#define MII_SR_LINK_STATUS                       0x0004  /* Link Status 1 = link */
-#define MII_SR_AUTONEG_CAPS                      0x0008  /* Auto Neg Capable */
-#define MII_SR_REMOTE_FAULT                      0x0010  /* Remote Fault Detect */
-#define MII_SR_AUTONEG_COMPLETE                  0x0020  /* Auto Neg Complete */
-#define MII_SR_PREAMBLE_SUPPRESS                 0x0040  /* Preamble may be suppressed */
-#define MII_SR_EXTENDED_STATUS                   0x0100  /* Ext. status info in Reg 0x0F */
-#define MII_SR_100T2_HD_CAPS                     0x0200  /* 100T2 Half Duplex Capable */
-#define MII_SR_100T2_FD_CAPS                     0x0400  /* 100T2 Full Duplex Capable */
-#define MII_SR_10T_HD_CAPS                       0x0800  /* 10T   Half Duplex Capable */
-#define MII_SR_10T_FD_CAPS                       0x1000  /* 10T   Full Duplex Capable */
-#define MII_SR_100X_HD_CAPS                      0x2000  /* 100X  Half Duplex Capable */
-#define MII_SR_100X_FD_CAPS                      0x4000  /* 100X  Full Duplex Capable */
-#define MII_SR_100T4_CAPS                        0x8000  /* 100T4 Capable */
-/* Link partner ability register. */
-#define MII_LPA_SLCT                             0x001f  /* Same as advertise selector  */
-#define MII_LPA_10HALF                           0x0020  /* Can do 10mbps half-duplex   */
-#define MII_LPA_10FULL                           0x0040  /* Can do 10mbps full-duplex   */
-#define MII_LPA_100HALF                          0x0080  /* Can do 100mbps half-duplex  */
-#define MII_LPA_100FULL                          0x0100  /* Can do 100mbps full-duplex  */
-#define MII_LPA_100BASE4                         0x0200  /* 100BASE-T4  */
-#define MII_LPA_PAUSE                            0x0400  /* PAUSE */
-#define MII_LPA_ASYPAUSE                         0x0800  /* Asymmetrical PAUSE */
-#define MII_LPA_RFAULT                           0x2000  /* Link partner faulted        */
-#define MII_LPA_LPACK                            0x4000  /* Link partner acked us       */
-#define MII_LPA_NPAGE                            0x8000  /* Next page bit               */
 /* Autoneg Advertisement Register */
-#define MII_AR_SELECTOR_FIELD                   0x0001  /* indicates IEEE 802.3 CSMA/CD */
+#define MII_AR_DEFAULT_CAP_MASK                 0
-#define MII_AR_10T_HD_CAPS                      0x0020  /* 10T   Half Duplex Capable */
-#define MII_AR_10T_FD_CAPS                      0x0040  /* 10T   Full Duplex Capable */
-#define MII_AR_100TX_HD_CAPS                    0x0080  /* 100TX Half Duplex Capable */
-#define MII_AR_100TX_FD_CAPS                    0x0100  /* 100TX Full Duplex Capable */
-#define MII_AR_100T4_CAPS                       0x0200  /* 100T4 Capable */
-#define MII_AR_PAUSE                            0x0400  /* Pause operation desired */
-#define MII_AR_ASM_DIR                          0x0800  /* Asymmetric Pause Direction bit */
-#define MII_AR_REMOTE_FAULT                     0x2000  /* Remote Fault detected */
-#define MII_AR_NEXT_PAGE                        0x8000  /* Next Page ability supported */
-#define MII_AR_SPEED_MASK                       0x01E0
-#define MII_AR_DEFAULT_CAP_MASK                 0x0DE0
 /* 1000BASE-T Control Register */
-#define MII_AT001_CR_1000T_HD_CAPS              0x0100  /* Advertise 1000T HD capability */
+#define MII_AT001_CR_1000T_SPEED_MASK \
-#define MII_AT001_CR_1000T_FD_CAPS              0x0200  /* Advertise 1000T FD capability  */
+        (ADVERTISE_1000FULL | ADVERTISE_1000HALF)
-#define MII_AT001_CR_1000T_REPEATER_DTE         0x0400  /* 1=Repeater/switch device port */
+#define MII_AT001_CR_1000T_DEFAULT_CAP_MASK     MII_AT001_CR_1000T_SPEED_MASK
-/* 0=DTE device */
-#define MII_AT001_CR_1000T_MS_VALUE             0x0800  /* 1=Configure PHY as Master */
-/* 0=Configure PHY as Slave */
-#define MII_AT001_CR_1000T_MS_ENABLE            0x1000  /* 1=Master/Slave manual config value */
-/* 0=Automatic Master/Slave config */
-#define MII_AT001_CR_1000T_TEST_MODE_NORMAL     0x0000  /* Normal Operation */
-#define MII_AT001_CR_1000T_TEST_MODE_1          0x2000  /* Transmit Waveform test */
-#define MII_AT001_CR_1000T_TEST_MODE_2          0x4000  /* Master Transmit Jitter test */
-#define MII_AT001_CR_1000T_TEST_MODE_3          0x6000  /* Slave Transmit Jitter test */
-#define MII_AT001_CR_1000T_TEST_MODE_4          0x8000  /* Transmitter Distortion test */
-#define MII_AT001_CR_1000T_SPEED_MASK           0x0300
-#define MII_AT001_CR_1000T_DEFAULT_CAP_MASK     0x0300
-/* 1000BASE-T Status Register */
-#define MII_AT001_SR_1000T_LP_HD_CAPS           0x0400  /* LP is 1000T HD capable */
-#define MII_AT001_SR_1000T_LP_FD_CAPS           0x0800  /* LP is 1000T FD capable */
-#define MII_AT001_SR_1000T_REMOTE_RX_STATUS     0x1000  /* Remote receiver OK */
-#define MII_AT001_SR_1000T_LOCAL_RX_STATUS      0x2000  /* Local receiver OK */
-#define MII_AT001_SR_1000T_MS_CONFIG_RES        0x4000  /* 1=Local TX is Master, 0=Slave */
-#define MII_AT001_SR_1000T_MS_CONFIG_FAULT      0x8000  /* Master/Slave config fault */
-#define MII_AT001_SR_1000T_REMOTE_RX_STATUS_SHIFT   12
-#define MII_AT001_SR_1000T_LOCAL_RX_STATUS_SHIFT    13
-/* Extended Status Register */
-#define MII_AT001_ESR_1000T_HD_CAPS             0x1000  /* 1000T HD capable */
-#define MII_AT001_ESR_1000T_FD_CAPS             0x2000  /* 1000T FD capable */
-#define MII_AT001_ESR_1000X_HD_CAPS             0x4000  /* 1000X HD capable */
-#define MII_AT001_ESR_1000X_FD_CAPS             0x8000  /* 1000X FD capable */
 /* AT001 PHY Specific Control Register */
 #define MII_AT001_PSCR_JABBER_DISABLE           0x0001  /* 1=Jabber Function disabled */
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index e28f8baf394e..bf7500ccd73f 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -2051,9 +2051,9 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
                atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
                atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
-                mii_advertise_data = MII_AR_10T_HD_CAPS;
+                mii_advertise_data = ADVERTISE_10HALF;
-                if ((atl1e_write_phy_reg(hw, MII_AT001_CR, 0) != 0) ||
+                if ((atl1e_write_phy_reg(hw, MII_CTRL1000, 0) != 0) ||
                    (atl1e_write_phy_reg(hw,
                           MII_ADVERTISE, mii_advertise_data) != 0) ||
                    (atl1e_phy_commit(hw)) != 0) {
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 3b527687c28f..67f40b9c16ed 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -950,6 +950,7 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter)
        hw->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
        adapter->wol = 0;
+        device_set_wakeup_enable(&adapter->pdev->dev, false);
        adapter->rx_buffer_len = (hw->max_frame_size + 7) & ~7;
        adapter->ict = 50000;           /* 100ms */
        adapter->link_speed = SPEED_0;  /* hardware init */
@@ -2735,15 +2736,15 @@ static int atl1_close(struct net_device *netdev)
 }
 #ifdef CONFIG_PM
-static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
+static int atl1_suspend(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
        struct net_device *netdev = pci_get_drvdata(pdev);
        struct atl1_adapter *adapter = netdev_priv(netdev);
        struct atl1_hw *hw = &adapter->hw;
        u32 ctrl = 0;
        u32 wufc = adapter->wol;
        u32 val;
-        int retval;
        u16 speed;
        u16 duplex;
@@ -2751,17 +2752,15 @@ static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
        if (netif_running(netdev))
                atl1_down(adapter);
-        retval = pci_save_state(pdev);
-        if (retval)
-                return retval;
        atl1_read_phy_reg(hw, MII_BMSR, (u16 *) & ctrl);
        atl1_read_phy_reg(hw, MII_BMSR, (u16 *) & ctrl);
        val = ctrl & BMSR_LSTATUS;
        if (val)
                wufc &= ~ATLX_WUFC_LNKC;
+        if (!wufc)
+                goto disable_wol;
-        if (val && wufc) {
+        if (val) {
                val = atl1_get_speed_and_duplex(hw, &speed, &duplex);
                if (val) {
                        if (netif_msg_ifdown(adapter))
@@ -2798,23 +2797,18 @@ static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
                ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;
                iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC);
                ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
+        } else {
-                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
-                goto exit;
-        }
-        if (!val && wufc) {
                ctrl |= (WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN);
                iowrite32(ctrl, hw->hw_addr + REG_WOL_CTRL);
                ioread32(hw->hw_addr + REG_WOL_CTRL);
                iowrite32(0, hw->hw_addr + REG_MAC_CTRL);
                ioread32(hw->hw_addr + REG_MAC_CTRL);
                hw->phy_configured = false;
-                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
-                goto exit;
        }
-disable_wol:
+        return 0;
+ disable_wol:
        iowrite32(0, hw->hw_addr + REG_WOL_CTRL);
        ioread32(hw->hw_addr + REG_WOL_CTRL);
        ctrl = ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
@@ -2822,37 +2816,17 @@ disable_wol:
        iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC);
        ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
        hw->phy_configured = false;
-        pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
-exit:
-        if (netif_running(netdev))
-                pci_disable_msi(adapter->pdev);
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
        return 0;
 }
-static int atl1_resume(struct pci_dev *pdev)
+static int atl1_resume(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
        struct net_device *netdev = pci_get_drvdata(pdev);
        struct atl1_adapter *adapter = netdev_priv(netdev);
-        u32 err;
-        pci_set_power_state(pdev, PCI_D0);
-        pci_restore_state(pdev);
-        err = pci_enable_device(pdev);
-        if (err) {
-                if (netif_msg_ifup(adapter))
-                        dev_printk(KERN_DEBUG, &pdev->dev,
-                                "error enabling pci device\n");
-                return err;
-        }
-        pci_set_master(pdev);
        iowrite32(0, adapter->hw.hw_addr + REG_WOL_CTRL);
-        pci_enable_wake(pdev, PCI_D3hot, 0);
-        pci_enable_wake(pdev, PCI_D3cold, 0);
        atl1_reset_hw(&adapter->hw);
@@ -2864,16 +2838,25 @@ static int atl1_resume(struct pci_dev *pdev)
        return 0;
 }
+static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume);
+#define ATL1_PM_OPS     (&atl1_pm_ops)
 #else
-#define atl1_suspend NULL
-#define atl1_resume NULL
+static int atl1_suspend(struct device *dev) { return 0; }
+#define ATL1_PM_OPS     NULL
 #endif
 static void atl1_shutdown(struct pci_dev *pdev)
 {
-#ifdef CONFIG_PM
+        struct net_device *netdev = pci_get_drvdata(pdev);
-        atl1_suspend(pdev, PMSG_SUSPEND);
+        struct atl1_adapter *adapter = netdev_priv(netdev);
-#endif
+        atl1_suspend(&pdev->dev);
+        pci_wake_from_d3(pdev, adapter->wol);
+        pci_set_power_state(pdev, PCI_D3hot);
 }
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -3117,9 +3100,8 @@ static struct pci_driver atl1_driver = {
        .id_table = atl1_pci_tbl,
        .probe = atl1_probe,
        .remove = __devexit_p(atl1_remove),
-        .suspend = atl1_suspend,
+        .shutdown = atl1_shutdown,
-        .resume = atl1_resume,
+        .driver.pm = ATL1_PM_OPS,
-        .shutdown = atl1_shutdown
 };
 /*
@@ -3409,6 +3391,9 @@ static int atl1_set_wol(struct net_device *netdev,
        adapter->wol = 0;
        if (wol->wolopts & WAKE_MAGIC)
                adapter->wol |= ATLX_WUFC_MAG;
+        device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
        return 0;
 }
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index 4bebff3faeab..e7cb8c8b9776 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -9,7 +9,7 @@
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
-*/
+ */
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -17,46 +17,45 @@
 #include <linux/isapnp.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
-#include <linux/mii.h>
+#include <linux/mdio-bitbang.h>
+#include <linux/phy.h>
 #include <linux/eeprom_93cx6.h>
 #include <linux/slab.h>
 #include <net/ax88796.h>
 #include <asm/system.h>
-#include <asm/io.h>
-static int phy_debug = 0;
 /* Rename the lib8390.c functions to show that they are in this driver */
-#define __ei_open       ax_ei_open
+#define __ei_open ax_ei_open
-#define __ei_close      ax_ei_close
+#define __ei_close ax_ei_close
-#define __ei_poll       ax_ei_poll
+#define __ei_poll ax_ei_poll
 #define __ei_start_xmit ax_ei_start_xmit
 #define __ei_tx_timeout ax_ei_tx_timeout
-#define __ei_get_stats  ax_ei_get_stats
+#define __ei_get_stats ax_ei_get_stats
 #define __ei_set_multicast_list ax_ei_set_multicast_list
-#define __ei_interrupt  ax_ei_interrupt
+#define __ei_interrupt ax_ei_interrupt
 #define ____alloc_ei_netdev ax__alloc_ei_netdev
-#define __NS8390_init   ax_NS8390_init
+#define __NS8390_init ax_NS8390_init
 /* force unsigned long back to 'void __iomem *' */
 #define ax_convert_addr(_a) ((void __force __iomem *)(_a))
-#define ei_inb(_a)      readb(ax_convert_addr(_a))
+#define ei_inb(_a) readb(ax_convert_addr(_a))
 #define ei_outb(_v, _a) writeb(_v, ax_convert_addr(_a))
-#define ei_inb_p(_a)    ei_inb(_a)
+#define ei_inb_p(_a) ei_inb(_a)
 #define ei_outb_p(_v, _a) ei_outb(_v, _a)
 /* define EI_SHIFT() to take into account our register offsets */
-#define EI_SHIFT(x)     (ei_local->reg_offset[(x)])
+#define EI_SHIFT(x) (ei_local->reg_offset[(x)])
 /* Ensure we have our RCR base value */
 #define AX88796_PLATFORM
@@ -74,43 +73,46 @@ static unsigned char version[] = "ax88796.c: Copyright 2005,2007 Simtec Electron
 #define NE_DATAPORT     EI_SHIFT(0x10)
 #define NE1SM_START_PG  0x20    /* First page of TX buffer */
-#define NE1SM_STOP_PG   0x40    /* Last page +1 of RX ring */
+#define NE1SM_STOP_PG   0x40    /* Last page +1 of RX ring */
 #define NESM_START_PG   0x40    /* First page of TX buffer */
 #define NESM_STOP_PG    0x80    /* Last page +1 of RX ring */
+#define AX_GPOC_PPDSET  BIT(6)
 /* device private data */
 struct ax_device {
-        struct timer_list        mii_timer;
+        struct mii_bus *mii_bus;
-        spinlock_t               mii_lock;
+        struct mdiobb_ctrl bb_ctrl;
-        struct mii_if_info       mii;
+        struct phy_device *phy_dev;
+        void __iomem *addr_memr;
-        u32                      msg_enable;
+        u8 reg_memr;
-        void __iomem            *map2;
+        int link;
-        struct platform_device  *dev;
+        int speed;
-        struct resource         *mem;
+        int duplex;
-        struct resource         *mem2;
-        struct ax_plat_data     *plat;
+        void __iomem *map2;
+        const struct ax_plat_data *plat;
-        unsigned char            running;
-        unsigned char            resume_open;
+        unsigned char running;
-        unsigned int             irqflags;
+        unsigned char resume_open;
+        unsigned int irqflags;
-        u32                      reg_offsets[0x20];
+        u32 reg_offsets[0x20];
 };
 static inline struct ax_device *to_ax_dev(struct net_device *dev)
 {
        struct ei_device *ei_local = netdev_priv(dev);
-        return (struct ax_device *)(ei_local+1);
+        return (struct ax_device *)(ei_local + 1);
 }
-/* ax_initial_check
+/*
+ * ax_initial_check
 *
 * do an initial probe for the card to check wether it exists
 * and is functional
 */
 static int ax_initial_check(struct net_device *dev)
 {
        struct ei_device *ei_local = netdev_priv(dev);
@@ -122,10 +124,10 @@ static int ax_initial_check(struct net_device *dev)
        if (reg0 == 0xFF)
                return -ENODEV;
-        ei_outb(E8390_NODMA+E8390_PAGE1+E8390_STOP, ioaddr + E8390_CMD);
+        ei_outb(E8390_NODMA + E8390_PAGE1 + E8390_STOP, ioaddr + E8390_CMD);
        regd = ei_inb(ioaddr + 0x0d);
        ei_outb(0xff, ioaddr + 0x0d);
-        ei_outb(E8390_NODMA+E8390_PAGE0, ioaddr + E8390_CMD);
+        ei_outb(E8390_NODMA + E8390_PAGE0, ioaddr + E8390_CMD);
        ei_inb(ioaddr + EN0_COUNTER0); /* Clear the counter by reading. */
        if (ei_inb(ioaddr + EN0_COUNTER0) != 0) {
                ei_outb(reg0, ioaddr);
@@ -136,29 +138,28 @@ static int ax_initial_check(struct net_device *dev)
        return 0;
 }
-/* Hard reset the card.  This used to pause for the same period that a
+/*
-   8390 reset command required, but that shouldn't be necessary. */
+ * Hard reset the card. This used to pause for the same period that a
+ * 8390 reset command required, but that shouldn't be necessary.
+ */
 static void ax_reset_8390(struct net_device *dev)
 {
        struct ei_device *ei_local = netdev_priv(dev);
-        struct ax_device  *ax = to_ax_dev(dev);
        unsigned long reset_start_time = jiffies;
        void __iomem *addr = (void __iomem *)dev->base_addr;
        if (ei_debug > 1)
-                dev_dbg(&ax->dev->dev, "resetting the 8390 t=%ld\n", jiffies);
+                netdev_dbg(dev, "resetting the 8390 t=%ld\n", jiffies);
        ei_outb(ei_inb(addr + NE_RESET), addr + NE_RESET);
-        ei_status.txing = 0;
+        ei_local->txing = 0;
-        ei_status.dmaing = 0;
+        ei_local->dmaing = 0;
        /* This check _should_not_ be necessary, omit eventually. */
        while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) {
-                if (jiffies - reset_start_time > 2*HZ/100) {
+                if (jiffies - reset_start_time > 2 * HZ / 100) {
-                        dev_warn(&ax->dev->dev, "%s: %s did not complete.\n",
+                        netdev_warn(dev, "%s: did not complete.\n", __func__);
-                               __func__, dev->name);
                        break;
                }
        }
@@ -171,70 +172,72 @@ static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
                            int ring_page)
 {
        struct ei_device *ei_local = netdev_priv(dev);
-        struct ax_device  *ax = to_ax_dev(dev);
        void __iomem *nic_base = ei_local->mem;
        /* This *shouldn't* happen. If it does, it's the last thing you'll see */
-        if (ei_status.dmaing) {
+        if (ei_local->dmaing) {
-                dev_err(&ax->dev->dev, "%s: DMAing conflict in %s "
+                netdev_err(dev, "DMAing conflict in %s "
                        "[DMAstat:%d][irqlock:%d].\n",
-                        dev->name, __func__,
+                        __func__,
-                        ei_status.dmaing, ei_status.irqlock);
+                        ei_local->dmaing, ei_local->irqlock);
                return;
        }
-        ei_status.dmaing |= 0x01;
+        ei_local->dmaing |= 0x01;
-        ei_outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
+        ei_outb(E8390_NODMA + E8390_PAGE0 + E8390_START, nic_base + NE_CMD);
        ei_outb(sizeof(struct e8390_pkt_hdr), nic_base + EN0_RCNTLO);
        ei_outb(0, nic_base + EN0_RCNTHI);
        ei_outb(0, nic_base + EN0_RSARLO);              /* On page boundary */
        ei_outb(ring_page, nic_base + EN0_RSARHI);
        ei_outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-        if (ei_status.word16)
+        if (ei_local->word16)
-                readsw(nic_base + NE_DATAPORT, hdr, sizeof(struct e8390_pkt_hdr)>>1);
+                readsw(nic_base + NE_DATAPORT, hdr,
+                       sizeof(struct e8390_pkt_hdr) >> 1);
        else
-                readsb(nic_base + NE_DATAPORT, hdr, sizeof(struct e8390_pkt_hdr));
+                readsb(nic_base + NE_DATAPORT, hdr,
+                       sizeof(struct e8390_pkt_hdr));
        ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
-        ei_status.dmaing &= ~0x01;
+        ei_local->dmaing &= ~0x01;
        le16_to_cpus(&hdr->count);
 }
-/* Block input and output, similar to the Crynwr packet driver.  If you
+/*
-   are porting to a new ethercard, look at the packet driver source for hints.
+ * Block input and output, similar to the Crynwr packet driver. If
-   The NEx000 doesn't share the on-board packet memory -- you have to put
+ * you are porting to a new ethercard, look at the packet driver
-   the packet out through the "remote DMA" dataport using ei_outb. */
+ * source for hints. The NEx000 doesn't share the on-board packet
+ * memory -- you have to put the packet out through the "remote DMA"
+ * dataport using ei_outb.
+ */
 static void ax_block_input(struct net_device *dev, int count,
                           struct sk_buff *skb, int ring_offset)
 {
        struct ei_device *ei_local = netdev_priv(dev);
-        struct ax_device  *ax = to_ax_dev(dev);
        void __iomem *nic_base = ei_local->mem;
        char *buf = skb->data;
-        if (ei_status.dmaing) {
+        if (ei_local->dmaing) {
-                dev_err(&ax->dev->dev,
+                netdev_err(dev,
-                        "%s: DMAing conflict in %s "
+                        "DMAing conflict in %s "
                        "[DMAstat:%d][irqlock:%d].\n",
-                        dev->name, __func__,
+                        __func__,
-                        ei_status.dmaing, ei_status.irqlock);
+                        ei_local->dmaing, ei_local->irqlock);
                return;
        }
-        ei_status.dmaing |= 0x01;
+        ei_local->dmaing |= 0x01;
-        ei_outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
+        ei_outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base + NE_CMD);
        ei_outb(count & 0xff, nic_base + EN0_RCNTLO);
        ei_outb(count >> 8, nic_base + EN0_RCNTHI);
        ei_outb(ring_offset & 0xff, nic_base + EN0_RSARLO);
        ei_outb(ring_offset >> 8, nic_base + EN0_RSARHI);
        ei_outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-        if (ei_status.word16) {
+        if (ei_local->word16) {
                readsw(nic_base + NE_DATAPORT, buf, count >> 1);
                if (count & 0x01)
                        buf[count-1] = ei_inb(nic_base + NE_DATAPORT);
@@ -243,34 +246,34 @@ static void ax_block_input(struct net_device *dev, int count,
                readsb(nic_base + NE_DATAPORT, buf, count);
        }
-        ei_status.dmaing &= ~1;
+        ei_local->dmaing &= ~1;
 }
 static void ax_block_output(struct net_device *dev, int count,
                            const unsigned char *buf, const int start_page)
 {
        struct ei_device *ei_local = netdev_priv(dev);
-        struct ax_device  *ax = to_ax_dev(dev);
        void __iomem *nic_base = ei_local->mem;
        unsigned long dma_start;
-        /* Round the count up for word writes.  Do we need to do this?
+        /*
-           What effect will an odd byte count have on the 8390?
+         * Round the count up for word writes. Do we need to do this?
-           I should check someday. */
+         * What effect will an odd byte count have on the 8390?  I
+         * should check someday.
-        if (ei_status.word16 && (count & 0x01))
+         */
+        if (ei_local->word16 && (count & 0x01))
                count++;
        /* This *shouldn't* happen. If it does, it's the last thing you'll see */
-        if (ei_status.dmaing) {
+        if (ei_local->dmaing) {
-                dev_err(&ax->dev->dev, "%s: DMAing conflict in %s."
+                netdev_err(dev, "DMAing conflict in %s."
                        "[DMAstat:%d][irqlock:%d]\n",
-                        dev->name, __func__,
+                        __func__,
-                       ei_status.dmaing, ei_status.irqlock);
+                       ei_local->dmaing, ei_local->irqlock);
                return;
        }
-        ei_status.dmaing |= 0x01;
+        ei_local->dmaing |= 0x01;
        /* We should already be in page 0, but to be safe... */
        ei_outb(E8390_PAGE0+E8390_START+E8390_NODMA, nic_base + NE_CMD);
@@ -278,250 +281,170 @@ static void ax_block_output(struct net_device *dev, int count,
        /* Now the normal output. */
        ei_outb(count & 0xff, nic_base + EN0_RCNTLO);
-        ei_outb(count >> 8,   nic_base + EN0_RCNTHI);
+        ei_outb(count >> 8, nic_base + EN0_RCNTHI);
        ei_outb(0x00, nic_base + EN0_RSARLO);
        ei_outb(start_page, nic_base + EN0_RSARHI);
        ei_outb(E8390_RWRITE+E8390_START, nic_base + NE_CMD);
-        if (ei_status.word16) {
+        if (ei_local->word16)
-                writesw(nic_base + NE_DATAPORT, buf, count>>1);
+                writesw(nic_base + NE_DATAPORT, buf, count >> 1);
-        } else {
+        else
                writesb(nic_base + NE_DATAPORT, buf, count);
-        }
        dma_start = jiffies;
        while ((ei_inb(nic_base + EN0_ISR) & ENISR_RDC) == 0) {
-                if (jiffies - dma_start > 2*HZ/100) {           /* 20ms */
+                if (jiffies - dma_start > 2 * HZ / 100) {               /* 20ms */
-                        dev_warn(&ax->dev->dev,
+                        netdev_warn(dev, "timeout waiting for Tx RDC.\n");
-                                 "%s: timeout waiting for Tx RDC.\n", dev->name);
                        ax_reset_8390(dev);
-                        ax_NS8390_init(dev,1);
+                        ax_NS8390_init(dev, 1);
                        break;
                }
        }
        ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
-        ei_status.dmaing &= ~0x01;
+        ei_local->dmaing &= ~0x01;
 }
 /* definitions for accessing MII/EEPROM interface */
 #define AX_MEMR                 EI_SHIFT(0x14)
-#define AX_MEMR_MDC             (1<<0)
+#define AX_MEMR_MDC             BIT(0)
-#define AX_MEMR_MDIR            (1<<1)
+#define AX_MEMR_MDIR            BIT(1)
-#define AX_MEMR_MDI             (1<<2)
+#define AX_MEMR_MDI             BIT(2)
-#define AX_MEMR_MDO             (1<<3)
+#define AX_MEMR_MDO             BIT(3)
-#define AX_MEMR_EECS            (1<<4)
+#define AX_MEMR_EECS            BIT(4)
-#define AX_MEMR_EEI             (1<<5)
+#define AX_MEMR_EEI             BIT(5)
-#define AX_MEMR_EEO             (1<<6)
+#define AX_MEMR_EEO             BIT(6)
-#define AX_MEMR_EECLK           (1<<7)
+#define AX_MEMR_EECLK           BIT(7)
-/* ax_mii_ei_outbits
+static void ax_handle_link_change(struct net_device *dev)
- *
- * write the specified set of bits to the phy
-*/
-static void
-ax_mii_ei_outbits(struct net_device *dev, unsigned int bits, int len)
 {
-        struct ei_device *ei_local = netdev_priv(dev);
+        struct ax_device  *ax = to_ax_dev(dev);
-        void __iomem *memr_addr = (void __iomem *)dev->base_addr + AX_MEMR;
+        struct phy_device *phy_dev = ax->phy_dev;
-        unsigned int memr;
+        int status_change = 0;
-        /* clock low, data to output mode */
-        memr = ei_inb(memr_addr);
-        memr &= ~(AX_MEMR_MDC | AX_MEMR_MDIR);
-        ei_outb(memr, memr_addr);
-        for (len--; len >= 0; len--) {
-                if (bits & (1 << len))
-                        memr |= AX_MEMR_MDO;
-                else
-                        memr &= ~AX_MEMR_MDO;
-                ei_outb(memr, memr_addr);
-                /* clock high */
-                ei_outb(memr | AX_MEMR_MDC, memr_addr);
+        if (phy_dev->link && ((ax->speed != phy_dev->speed) ||
-                udelay(1);
+                             (ax->duplex != phy_dev->duplex))) {
-                /* clock low */
+                ax->speed = phy_dev->speed;
-                ei_outb(memr, memr_addr);
+                ax->duplex = phy_dev->duplex;
+                status_change = 1;
        }
-        /* leaves the clock line low, mdir input */
+        if (phy_dev->link != ax->link) {
-        memr |= AX_MEMR_MDIR;
+                if (!phy_dev->link) {
-        ei_outb(memr, (void __iomem *)dev->base_addr + AX_MEMR);
+                        ax->speed = 0;
-}
+                        ax->duplex = -1;
+                }
-/* ax_phy_ei_inbits
+                ax->link = phy_dev->link;
- *
- * read a specified number of bits from the phy
-*/
-static unsigned int
-ax_phy_ei_inbits(struct net_device *dev, int no)
-{
-        struct ei_device *ei_local = netdev_priv(dev);
-        void __iomem *memr_addr = (void __iomem *)dev->base_addr + AX_MEMR;
-        unsigned int memr;
-        unsigned int result = 0;
-        /* clock low, data to input mode */
-        memr = ei_inb(memr_addr);
-        memr &= ~AX_MEMR_MDC;
-        memr |= AX_MEMR_MDIR;
-        ei_outb(memr, memr_addr);
-        for (no--; no >= 0; no--) {
-                ei_outb(memr | AX_MEMR_MDC, memr_addr);
-                udelay(1);
-                if (ei_inb(memr_addr) & AX_MEMR_MDI)
-                        result |= (1<<no);
-                ei_outb(memr, memr_addr);
+                status_change = 1;
        }
-        return result;
+        if (status_change)
-}
+                phy_print_status(phy_dev);
-/* ax_phy_issueaddr
- *
- * use the low level bit shifting routines to send the address
- * and command to the specified phy
-*/
-static void
-ax_phy_issueaddr(struct net_device *dev, int phy_addr, int reg, int opc)
-{
-        if (phy_debug)
-                pr_debug("%s: dev %p, %04x, %04x, %d\n",
-                        __func__, dev, phy_addr, reg, opc);
-        ax_mii_ei_outbits(dev, 0x3f, 6);        /* pre-amble */
-        ax_mii_ei_outbits(dev, 1, 2);           /* frame-start */
-        ax_mii_ei_outbits(dev, opc, 2);         /* op code */
-        ax_mii_ei_outbits(dev, phy_addr, 5);    /* phy address */
-        ax_mii_ei_outbits(dev, reg, 5);         /* reg address */
 }
-static int
+static int ax_mii_probe(struct net_device *dev)
-ax_phy_read(struct net_device *dev, int phy_addr, int reg)
 {
-        struct ei_device *ei_local = netdev_priv(dev);
+        struct ax_device  *ax = to_ax_dev(dev);
-        unsigned long flags;
+        struct phy_device *phy_dev = NULL;
-        unsigned int result;
+        int ret;
-        spin_lock_irqsave(&ei_local->page_lock, flags);
+        /* find the first phy */
+        phy_dev = phy_find_first(ax->mii_bus);
+        if (!phy_dev) {
+                netdev_err(dev, "no PHY found\n");
+                return -ENODEV;
+        }
-        ax_phy_issueaddr(dev, phy_addr, reg, 2);
+        ret = phy_connect_direct(dev, phy_dev, ax_handle_link_change, 0,
+                                 PHY_INTERFACE_MODE_MII);
+        if (ret) {
+                netdev_err(dev, "Could not attach to PHY\n");
+                return ret;
+        }
-        result = ax_phy_ei_inbits(dev, 17);
+        /* mask with MAC supported features */
-        result &= ~(3<<16);
+        phy_dev->supported &= PHY_BASIC_FEATURES;
+        phy_dev->advertising = phy_dev->supported;
-        spin_unlock_irqrestore(&ei_local->page_lock, flags);
+        ax->phy_dev = phy_dev;
-        if (phy_debug)
+        netdev_info(dev, "PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
-                pr_debug("%s: %04x.%04x => read %04x\n", __func__,
+                    phy_dev->drv->name, dev_name(&phy_dev->dev), phy_dev->irq);
-                         phy_addr, reg, result);
-        return result;
+        return 0;
 }
-static void
+static void ax_phy_switch(struct net_device *dev, int on)
-ax_phy_write(struct net_device *dev, int phy_addr, int reg, int value)
 {
-        struct ei_device *ei = netdev_priv(dev);
+        struct ei_device *ei_local = netdev_priv(dev);
-        struct ax_device  *ax = to_ax_dev(dev);
+        struct ax_device *ax = to_ax_dev(dev);
-        unsigned long flags;
-        dev_dbg(&ax->dev->dev, "%s: %p, %04x, %04x %04x\n",
-                __func__, dev, phy_addr, reg, value);
-        spin_lock_irqsave(&ei->page_lock, flags);
-        ax_phy_issueaddr(dev, phy_addr, reg, 1);
-        ax_mii_ei_outbits(dev, 2, 2);           /* send TA */
-        ax_mii_ei_outbits(dev, value, 16);
-        spin_unlock_irqrestore(&ei->page_lock, flags);
-}
-static void ax_mii_expiry(unsigned long data)
+        u8 reg_gpoc =  ax->plat->gpoc_val;
-{
-        struct net_device *dev = (struct net_device *)data;
-        struct ax_device  *ax = to_ax_dev(dev);
-        unsigned long flags;
-        spin_lock_irqsave(&ax->mii_lock, flags);
+        if (!!on)
-        mii_check_media(&ax->mii, netif_msg_link(ax), 0);
+                reg_gpoc &= ~AX_GPOC_PPDSET;
-        spin_unlock_irqrestore(&ax->mii_lock, flags);
+        else
+                reg_gpoc |= AX_GPOC_PPDSET;
-        if (ax->running) {
+        ei_outb(reg_gpoc, ei_local->mem + EI_SHIFT(0x17));
-                ax->mii_timer.expires = jiffies + HZ*2;
-                add_timer(&ax->mii_timer);
-        }
 }
 static int ax_open(struct net_device *dev)
 {
-        struct ax_device  *ax = to_ax_dev(dev);
+        struct ax_device *ax = to_ax_dev(dev);
-        struct ei_device *ei_local = netdev_priv(dev);
        int ret;
-        dev_dbg(&ax->dev->dev, "%s: open\n", dev->name);
+        netdev_dbg(dev, "open\n");
        ret = request_irq(dev->irq, ax_ei_interrupt, ax->irqflags,
                          dev->name, dev);
        if (ret)
-                return ret;
+                goto failed_request_irq;
-        ret = ax_ei_open(dev);
-        if (ret) {
-                free_irq(dev->irq, dev);
-                return ret;
-        }
        /* turn the phy on (if turned off) */
+        ax_phy_switch(dev, 1);
-        ei_outb(ax->plat->gpoc_val, ei_local->mem + EI_SHIFT(0x17));
+        ret = ax_mii_probe(dev);
-        ax->running = 1;
+        if (ret)
+                goto failed_mii_probe;
-        /* start the MII timer */
+        phy_start(ax->phy_dev);
-        init_timer(&ax->mii_timer);
-        ax->mii_timer.expires  = jiffies+1;
+        ret = ax_ei_open(dev);
-        ax->mii_timer.data     = (unsigned long) dev;
+        if (ret)
-        ax->mii_timer.function = ax_mii_expiry;
+                goto failed_ax_ei_open;
-        add_timer(&ax->mii_timer);
+        ax->running = 1;
        return 0;
+ failed_ax_ei_open:
+        phy_disconnect(ax->phy_dev);
+ failed_mii_probe:
+        ax_phy_switch(dev, 0);
+        free_irq(dev->irq, dev);
+ failed_request_irq:
+        return ret;
 }
 static int ax_close(struct net_device *dev)
 {
        struct ax_device *ax = to_ax_dev(dev);
-        struct ei_device *ei_local = netdev_priv(dev);
-        dev_dbg(&ax->dev->dev, "%s: close\n", dev->name);
+        netdev_dbg(dev, "close\n");
-        /* turn the phy off */
-        ei_outb(ax->plat->gpoc_val | (1<<6),
-               ei_local->mem + EI_SHIFT(0x17));
        ax->running = 0;
        wmb();
-        del_timer_sync(&ax->mii_timer);
        ax_ei_close(dev);
+        /* turn the phy off */
+        ax_phy_switch(dev, 0);
+        phy_disconnect(ax->phy_dev);
        free_irq(dev->irq, dev);
        return 0;
 }
@@ -529,17 +452,15 @@ static int ax_close(struct net_device *dev)
 static int ax_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 {
        struct ax_device *ax = to_ax_dev(dev);
-        unsigned long flags;
+        struct phy_device *phy_dev = ax->phy_dev;
-        int rc;
        if (!netif_running(dev))
                return -EINVAL;
-        spin_lock_irqsave(&ax->mii_lock, flags);
+        if (!phy_dev)
-        rc = generic_mii_ioctl(&ax->mii, if_mii(req), cmd, NULL);
+                return -ENODEV;
-        spin_unlock_irqrestore(&ax->mii_lock, flags);
-        return rc;
+        return phy_mii_ioctl(phy_dev, req, cmd);
 }
 /* ethtool ops */
@@ -547,56 +468,40 @@ static int ax_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 static void ax_get_drvinfo(struct net_device *dev,
                           struct ethtool_drvinfo *info)
 {
-        struct ax_device *ax = to_ax_dev(dev);
+        struct platform_device *pdev = to_platform_device(dev->dev.parent);
        strcpy(info->driver, DRV_NAME);
        strcpy(info->version, DRV_VERSION);
-        strcpy(info->bus_info, ax->dev->name);
+        strcpy(info->bus_info, pdev->name);
 }
 static int ax_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct ax_device *ax = to_ax_dev(dev);
-        unsigned long flags;
+        struct phy_device *phy_dev = ax->phy_dev;
-        spin_lock_irqsave(&ax->mii_lock, flags);
+        if (!phy_dev)
-        mii_ethtool_gset(&ax->mii, cmd);
+                return -ENODEV;
-        spin_unlock_irqrestore(&ax->mii_lock, flags);
-        return 0;
+        return phy_ethtool_gset(phy_dev, cmd);
 }
 static int ax_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct ax_device *ax = to_ax_dev(dev);
-        unsigned long flags;
+        struct phy_device *phy_dev = ax->phy_dev;
-        int rc;
-        spin_lock_irqsave(&ax->mii_lock, flags);
+        if (!phy_dev)
-        rc = mii_ethtool_sset(&ax->mii, cmd);
+                return -ENODEV;
-        spin_unlock_irqrestore(&ax->mii_lock, flags);
-        return rc;
-}
-static int ax_nway_reset(struct net_device *dev)
-{
-        struct ax_device *ax = to_ax_dev(dev);
-        return mii_nway_restart(&ax->mii);
-}
-static u32 ax_get_link(struct net_device *dev)
+        return phy_ethtool_sset(phy_dev, cmd);
-{
-        struct ax_device *ax = to_ax_dev(dev);
-        return mii_link_ok(&ax->mii);
 }
 static const struct ethtool_ops ax_ethtool_ops = {
        .get_drvinfo            = ax_get_drvinfo,
        .get_settings           = ax_get_settings,
        .set_settings           = ax_set_settings,
-        .nway_reset             = ax_nway_reset,
+        .get_link               = ethtool_op_get_link,
-        .get_link               = ax_get_link,
 };
 #ifdef CONFIG_AX88796_93CX6
@@ -640,37 +545,131 @@ static const struct net_device_ops ax_netdev_ops = {
        .ndo_get_stats          = ax_ei_get_stats,
        .ndo_set_multicast_list = ax_ei_set_multicast_list,
        .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_change_mtu         = eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller    = ax_ei_poll,
 #endif
 };
+static void ax_bb_mdc(struct mdiobb_ctrl *ctrl, int level)
+{
+        struct ax_device *ax = container_of(ctrl, struct ax_device, bb_ctrl);
+        if (level)
+                ax->reg_memr |= AX_MEMR_MDC;
+        else
+                ax->reg_memr &= ~AX_MEMR_MDC;
+        ei_outb(ax->reg_memr, ax->addr_memr);
+}
+static void ax_bb_dir(struct mdiobb_ctrl *ctrl, int output)
+{
+        struct ax_device *ax = container_of(ctrl, struct ax_device, bb_ctrl);
+        if (output)
+                ax->reg_memr &= ~AX_MEMR_MDIR;
+        else
+                ax->reg_memr |= AX_MEMR_MDIR;
+        ei_outb(ax->reg_memr, ax->addr_memr);
+}
+static void ax_bb_set_data(struct mdiobb_ctrl *ctrl, int value)
+{
+        struct ax_device *ax = container_of(ctrl, struct ax_device, bb_ctrl);
+        if (value)
+                ax->reg_memr |= AX_MEMR_MDO;
+        else
+                ax->reg_memr &= ~AX_MEMR_MDO;
+        ei_outb(ax->reg_memr, ax->addr_memr);
+}
+static int ax_bb_get_data(struct mdiobb_ctrl *ctrl)
+{
+        struct ax_device *ax = container_of(ctrl, struct ax_device, bb_ctrl);
+        int reg_memr = ei_inb(ax->addr_memr);
+        return reg_memr & AX_MEMR_MDI ? 1 : 0;
+}
+static struct mdiobb_ops bb_ops = {
+        .owner = THIS_MODULE,
+        .set_mdc = ax_bb_mdc,
+        .set_mdio_dir = ax_bb_dir,
+        .set_mdio_data = ax_bb_set_data,
+        .get_mdio_data = ax_bb_get_data,
+};
 /* setup code */
+static int ax_mii_init(struct net_device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev->dev.parent);
+        struct ei_device *ei_local = netdev_priv(dev);
+        struct ax_device *ax = to_ax_dev(dev);
+        int err, i;
+        ax->bb_ctrl.ops = &bb_ops;
+        ax->addr_memr = ei_local->mem + AX_MEMR;
+        ax->mii_bus = alloc_mdio_bitbang(&ax->bb_ctrl);
+        if (!ax->mii_bus) {
+                err = -ENOMEM;
+                goto out;
+        }
+        ax->mii_bus->name = "ax88796_mii_bus";
+        ax->mii_bus->parent = dev->dev.parent;
+        snprintf(ax->mii_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
+        ax->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
+        if (!ax->mii_bus->irq) {
+                err = -ENOMEM;
+                goto out_free_mdio_bitbang;
+        }
+        for (i = 0; i < PHY_MAX_ADDR; i++)
+                ax->mii_bus->irq[i] = PHY_POLL;
+        err = mdiobus_register(ax->mii_bus);
+        if (err)
+                goto out_free_irq;
+        return 0;
+ out_free_irq:
+        kfree(ax->mii_bus->irq);
+ out_free_mdio_bitbang:
+        free_mdio_bitbang(ax->mii_bus);
+ out:
+        return err;
+}
 static void ax_initial_setup(struct net_device *dev, struct ei_device *ei_local)
 {
        void __iomem *ioaddr = ei_local->mem;
        struct ax_device *ax = to_ax_dev(dev);
-        /* Select page 0*/
+        /* Select page 0 */
-        ei_outb(E8390_NODMA+E8390_PAGE0+E8390_STOP, ioaddr + E8390_CMD);
+        ei_outb(E8390_NODMA + E8390_PAGE0 + E8390_STOP, ioaddr + E8390_CMD);
        /* set to byte access */
        ei_outb(ax->plat->dcr_val & ~1, ioaddr + EN0_DCFG);
        ei_outb(ax->plat->gpoc_val, ioaddr + EI_SHIFT(0x17));
 }
-/* ax_init_dev
+/*
+ * ax_init_dev
 *
 * initialise the specified device, taking care to note the MAC
 * address it may already have (if configured), ensure
 * the device is ready to be used by lib8390.c and registerd with
 * the network layer.
 */
+static int ax_init_dev(struct net_device *dev)
-static int ax_init_dev(struct net_device *dev, int first_init)
 {
        struct ei_device *ei_local = netdev_priv(dev);
        struct ax_device *ax = to_ax_dev(dev);
@@ -690,23 +689,23 @@ static int ax_init_dev(struct net_device *dev, int first_init)
        /* read the mac from the card prom if we need it */
-        if (first_init && ax->plat->flags & AXFLG_HAS_EEPROM) {
+        if (ax->plat->flags & AXFLG_HAS_EEPROM) {
                unsigned char SA_prom[32];
-                for(i = 0; i < sizeof(SA_prom); i+=2) {
+                for (i = 0; i < sizeof(SA_prom); i += 2) {
                        SA_prom[i] = ei_inb(ioaddr + NE_DATAPORT);
-                        SA_prom[i+1] = ei_inb(ioaddr + NE_DATAPORT);
+                        SA_prom[i + 1] = ei_inb(ioaddr + NE_DATAPORT);
                }
                if (ax->plat->wordlength == 2)
                        for (i = 0; i < 16; i++)
                                SA_prom[i] = SA_prom[i+i];
-                memcpy(dev->dev_addr,  SA_prom, 6);
+                memcpy(dev->dev_addr, SA_prom, 6);
        }
 #ifdef CONFIG_AX88796_93CX6
-        if (first_init && ax->plat->flags & AXFLG_HAS_93CX6) {
+        if (ax->plat->flags & AXFLG_HAS_93CX6) {
                unsigned char mac_addr[6];
                struct eeprom_93cx6 eeprom;
@@ -719,7 +718,7 @@ static int ax_init_dev(struct net_device *dev, int first_init)
                                       (__le16 __force *)mac_addr,
                                       sizeof(mac_addr) >> 1);
-                memcpy(dev->dev_addr,  mac_addr, 6);
+                memcpy(dev->dev_addr, mac_addr, 6);
        }
 #endif
        if (ax->plat->wordlength == 2) {
@@ -732,67 +731,56 @@ static int ax_init_dev(struct net_device *dev, int first_init)
                stop_page = NE1SM_STOP_PG;
        }
-        /* load the mac-address from the device if this is the
+        /* load the mac-address from the device */
-         * first time we've initialised */
+        if (ax->plat->flags & AXFLG_MAC_FROMDEV) {
+                ei_outb(E8390_NODMA + E8390_PAGE1 + E8390_STOP,
-        if (first_init) {
+                        ei_local->mem + E8390_CMD); /* 0x61 */
-                if (ax->plat->flags & AXFLG_MAC_FROMDEV) {
+                for (i = 0; i < ETHER_ADDR_LEN; i++)
-                        ei_outb(E8390_NODMA + E8390_PAGE1 + E8390_STOP,
+                        dev->dev_addr[i] =
-                                ei_local->mem + E8390_CMD); /* 0x61 */
+                                ei_inb(ioaddr + EN1_PHYS_SHIFT(i));
-                        for (i = 0; i < ETHER_ADDR_LEN; i++)
-                                dev->dev_addr[i] =
-                                        ei_inb(ioaddr + EN1_PHYS_SHIFT(i));
-                }
-                if ((ax->plat->flags & AXFLG_MAC_FROMPLATFORM) &&
-                     ax->plat->mac_addr)
-                        memcpy(dev->dev_addr, ax->plat->mac_addr,
-                                ETHER_ADDR_LEN);
        }
+        if ((ax->plat->flags & AXFLG_MAC_FROMPLATFORM) &&
+            ax->plat->mac_addr)
+                memcpy(dev->dev_addr, ax->plat->mac_addr,
+                       ETHER_ADDR_LEN);
        ax_reset_8390(dev);
-        ei_status.name = "AX88796";
+        ei_local->name = "AX88796";
-        ei_status.tx_start_page = start_page;
+        ei_local->tx_start_page = start_page;
-        ei_status.stop_page = stop_page;
+        ei_local->stop_page = stop_page;
-        ei_status.word16 = (ax->plat->wordlength == 2);
+        ei_local->word16 = (ax->plat->wordlength == 2);
-        ei_status.rx_start_page = start_page + TX_PAGES;
+        ei_local->rx_start_page = start_page + TX_PAGES;
 #ifdef PACKETBUF_MEMSIZE
-         /* Allow the packet buffer size to be overridden by know-it-alls. */
+        /* Allow the packet buffer size to be overridden by know-it-alls. */
-        ei_status.stop_page = ei_status.tx_start_page + PACKETBUF_MEMSIZE;
+        ei_local->stop_page = ei_local->tx_start_page + PACKETBUF_MEMSIZE;
 #endif
-        ei_status.reset_8390    = &ax_reset_8390;
+        ei_local->reset_8390 = &ax_reset_8390;
-        ei_status.block_input   = &ax_block_input;
+        ei_local->block_input = &ax_block_input;
-        ei_status.block_output  = &ax_block_output;
+        ei_local->block_output = &ax_block_output;
-        ei_status.get_8390_hdr  = &ax_get_8390_hdr;
+        ei_local->get_8390_hdr = &ax_get_8390_hdr;
-        ei_status.priv = 0;
+        ei_local->priv = 0;
-        dev->netdev_ops         = &ax_netdev_ops;
-        dev->ethtool_ops        = &ax_ethtool_ops;
-        ax->msg_enable          = NETIF_MSG_LINK;
-        ax->mii.phy_id_mask     = 0x1f;
-        ax->mii.reg_num_mask    = 0x1f;
-        ax->mii.phy_id          = 0x10;         /* onboard phy */
-        ax->mii.force_media     = 0;
-        ax->mii.full_duplex     = 0;
-        ax->mii.mdio_read       = ax_phy_read;
-        ax->mii.mdio_write      = ax_phy_write;
-        ax->mii.dev             = dev;
-        ax_NS8390_init(dev, 0);
+        dev->netdev_ops = &ax_netdev_ops;
+        dev->ethtool_ops = &ax_ethtool_ops;
-        if (first_init)
+        ret = ax_mii_init(dev);
-                dev_info(&ax->dev->dev, "%dbit, irq %d, %lx, MAC: %pM\n",
+        if (ret)
-                         ei_status.word16 ? 16:8, dev->irq, dev->base_addr,
+                goto out_irq;
-                         dev->dev_addr);
+        ax_NS8390_init(dev, 0);
        ret = register_netdev(dev);
        if (ret)
                goto out_irq;
+        netdev_info(dev, "%dbit, irq %d, %lx, MAC: %pM\n",
+                    ei_local->word16 ? 16 : 8, dev->irq, dev->base_addr,
+                    dev->dev_addr);
        return 0;
 out_irq:
@@ -802,24 +790,24 @@ static int ax_init_dev(struct net_device *dev, int first_init)
        return ret;
 }
-static int ax_remove(struct platform_device *_dev)
+static int ax_remove(struct platform_device *pdev)
 {
-        struct net_device *dev = platform_get_drvdata(_dev);
+        struct net_device *dev = platform_get_drvdata(pdev);
-        struct ax_device  *ax;
+        struct ei_device *ei_local = netdev_priv(dev);
+        struct ax_device *ax = to_ax_dev(dev);
-        ax = to_ax_dev(dev);
+        struct resource *mem;
        unregister_netdev(dev);
        free_irq(dev->irq, dev);
-        iounmap(ei_status.mem);
+        iounmap(ei_local->mem);
-        release_resource(ax->mem);
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        kfree(ax->mem);
+        release_mem_region(mem->start, resource_size(mem));
        if (ax->map2) {
                iounmap(ax->map2);
-                release_resource(ax->mem2);
+                mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-                kfree(ax->mem2);
+                release_mem_region(mem->start, resource_size(mem));
        }
        free_netdev(dev);
@@ -827,19 +815,20 @@ static int ax_remove(struct platform_device *_dev)
        return 0;
 }
-/* ax_probe
+/*
+ * ax_probe
 *
 * This is the entry point when the platform device system uses to
- * notify us of a new device to attach to. Allocate memory, find
+ * notify us of a new device to attach to. Allocate memory, find the
- * the resources and information passed, and map the necessary registers.
+ * resources and information passed, and map the necessary registers.
-*/
+ */
 static int ax_probe(struct platform_device *pdev)
 {
        struct net_device *dev;
-        struct ax_device  *ax;
+        struct ei_device *ei_local;
-        struct resource   *res;
+        struct ax_device *ax;
-        size_t size;
+        struct resource *irq, *mem, *mem2;
+        resource_size_t mem_size, mem2_size = 0;
        int ret = 0;
        dev = ax__alloc_ei_netdev(sizeof(struct ax_device));
@@ -847,120 +836,107 @@ static int ax_probe(struct platform_device *pdev)
                return -ENOMEM;
        /* ok, let's setup our device */
+        SET_NETDEV_DEV(dev, &pdev->dev);
+        ei_local = netdev_priv(dev);
        ax = to_ax_dev(dev);
-        memset(ax, 0, sizeof(struct ax_device));
-        spin_lock_init(&ax->mii_lock);
-        ax->dev = pdev;
        ax->plat = pdev->dev.platform_data;
        platform_set_drvdata(pdev, dev);
-        ei_status.rxcr_base  = ax->plat->rcr_val;
+        ei_local->rxcr_base = ax->plat->rcr_val;
        /* find the platform resources */
+        irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!irq) {
-        if (res == NULL) {
                dev_err(&pdev->dev, "no IRQ specified\n");
                ret = -ENXIO;
                goto exit_mem;
        }
-        dev->irq = res->start;
+        dev->irq = irq->start;
-        ax->irqflags = res->flags & IRQF_TRIGGER_MASK;
+        ax->irqflags = irq->flags & IRQF_TRIGGER_MASK;
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res == NULL) {
+        if (!mem) {
                dev_err(&pdev->dev, "no MEM specified\n");
                ret = -ENXIO;
                goto exit_mem;
        }
-        size = (res->end - res->start) + 1;
+        mem_size = resource_size(mem);
-        /* setup the register offsets from either the platform data
-         * or by using the size of the resource provided */
+        /*
+         * setup the register offsets from either the platform data or
+         * by using the size of the resource provided
+         */
        if (ax->plat->reg_offsets)
-                ei_status.reg_offset = ax->plat->reg_offsets;
+                ei_local->reg_offset = ax->plat->reg_offsets;
        else {
-                ei_status.reg_offset = ax->reg_offsets;
+                ei_local->reg_offset = ax->reg_offsets;
                for (ret = 0; ret < 0x18; ret++)
-                        ax->reg_offsets[ret] = (size / 0x18) * ret;
+                        ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
        }
-        ax->mem = request_mem_region(res->start, size, pdev->name);
+        if (!request_mem_region(mem->start, mem_size, pdev->name)) {
-        if (ax->mem == NULL) {
                dev_err(&pdev->dev, "cannot reserve registers\n");
-                ret = -ENXIO;
+                ret = -ENXIO;
                goto exit_mem;
        }
-        ei_status.mem = ioremap(res->start, size);
+        ei_local->mem = ioremap(mem->start, mem_size);
-        dev->base_addr = (unsigned long)ei_status.mem;
+        dev->base_addr = (unsigned long)ei_local->mem;
-        if (ei_status.mem == NULL) {
+        if (ei_local->mem == NULL) {
-                dev_err(&pdev->dev, "Cannot ioremap area (%08llx,%08llx)\n",
+                dev_err(&pdev->dev, "Cannot ioremap area %pR\n", mem);
-                        (unsigned long long)res->start,
-                        (unsigned long long)res->end);
-                ret = -ENXIO;
+                ret = -ENXIO;
                goto exit_req;
        }
        /* look for reset area */
+        mem2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (!mem2) {
-        if (res == NULL) {
                if (!ax->plat->reg_offsets) {
                        for (ret = 0; ret < 0x20; ret++)
-                                ax->reg_offsets[ret] = (size / 0x20) * ret;
+                                ax->reg_offsets[ret] = (mem_size / 0x20) * ret;
                }
-                ax->map2 = NULL;
        } else {
-                size = (res->end - res->start) + 1;
+                mem2_size = resource_size(mem2);
-                ax->mem2 = request_mem_region(res->start, size, pdev->name);
+                if (!request_mem_region(mem2->start, mem2_size, pdev->name)) {
-                if (ax->mem2 == NULL) {
                        dev_err(&pdev->dev, "cannot reserve registers\n");
                        ret = -ENXIO;
                        goto exit_mem1;
                }
-                ax->map2 = ioremap(res->start, size);
+                ax->map2 = ioremap(mem2->start, mem2_size);
-                if (ax->map2 == NULL) {
+                if (!ax->map2) {
                        dev_err(&pdev->dev, "cannot map reset register\n");
                        ret = -ENXIO;
                        goto exit_mem2;
                }
-                ei_status.reg_offset[0x1f] = ax->map2 - ei_status.mem;
+                ei_local->reg_offset[0x1f] = ax->map2 - ei_local->mem;
        }
        /* got resources, now initialise and register device */
+        ret = ax_init_dev(dev);
-        ret = ax_init_dev(dev, 1);
        if (!ret)
                return 0;
-        if (ax->map2 == NULL)
+        if (!ax->map2)
                goto exit_mem1;
        iounmap(ax->map2);
 exit_mem2:
-        release_resource(ax->mem2);
+        release_mem_region(mem2->start, mem2_size);
-        kfree(ax->mem2);
 exit_mem1:
-        iounmap(ei_status.mem);
+        iounmap(ei_local->mem);
 exit_req:
-        release_resource(ax->mem);
+        release_mem_region(mem->start, mem_size);
-        kfree(ax->mem);
 exit_mem:
        free_netdev(dev);
@@ -974,7 +950,7 @@ static int ax_probe(struct platform_device *pdev)
 static int ax_suspend(struct platform_device *dev, pm_message_t state)
 {
        struct net_device *ndev = platform_get_drvdata(dev);
-        struct ax_device  *ax = to_ax_dev(ndev);
+        struct ax_device *ax = to_ax_dev(ndev);
        ax->resume_open = ax->running;
@@ -987,7 +963,7 @@ static int ax_suspend(struct platform_device *dev, pm_message_t state)
 static int ax_resume(struct platform_device *pdev)
 {
        struct net_device *ndev = platform_get_drvdata(pdev);
-        struct ax_device  *ax = to_ax_dev(ndev);
+        struct ax_device *ax = to_ax_dev(ndev);
        ax_initial_setup(ndev, netdev_priv(ndev));
        ax_NS8390_init(ndev, ax->resume_open);
@@ -1001,7 +977,7 @@ static int ax_resume(struct platform_device *pdev)
 #else
 #define ax_suspend NULL
-#define ax_resume  NULL
+#define ax_resume NULL
 #endif
 static struct platform_driver axdrv = {
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index add0b93350dd..ed709a5d07d7 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -225,6 +225,10 @@ struct be_rx_obj {
        u32 cache_line_barrier[15];
 };
+struct be_drv_stats {
+        u8 be_on_die_temperature;
+};
 struct be_vf_cfg {
        unsigned char vf_mac_addr[ETH_ALEN];
        u32 vf_if_handle;
@@ -234,6 +238,7 @@ struct be_vf_cfg {
 };
 #define BE_INVALID_PMAC_ID              0xffffffff
 struct be_adapter {
        struct pci_dev *pdev;
        struct net_device *netdev;
@@ -269,6 +274,7 @@ struct be_adapter {
        u32 big_page_size;      /* Compounded page size shared by rx wrbs */
        u8 msix_vec_next_idx;
+        struct be_drv_stats drv_stats;
        struct vlan_group *vlan_grp;
        u16 vlans_added;
@@ -281,6 +287,7 @@ struct be_adapter {
        struct be_dma_mem stats_cmd;
        /* Work queue used to perform periodic tasks like getting statistics */
        struct delayed_work work;
+        u16 work_counter;
        /* Ethtool knobs and info */
        bool rx_csum;           /* BE card must perform rx-checksumming */
@@ -298,7 +305,7 @@ struct be_adapter {
        u32 rx_fc;              /* Rx flow control */
        u32 tx_fc;              /* Tx flow control */
        bool ue_detected;
-        bool stats_ioctl_sent;
+        bool stats_cmd_sent;
        int link_speed;
        u8 port_type;
        u8 transceiver;
@@ -311,6 +318,8 @@ struct be_adapter {
        struct be_vf_cfg vf_cfg[BE_MAX_VF];
        u8 is_virtfn;
        u32 sli_family;
+        u8 hba_port_num;
+        u16 pvid;
 };
 #define be_physfn(adapter) (!adapter->is_virtfn)
@@ -450,9 +459,8 @@ static inline void be_vf_eth_addr_generate(struct be_adapter *adapter, u8 *mac)
        mac[5] = (u8)(addr & 0xFF);
        mac[4] = (u8)((addr >> 8) & 0xFF);
        mac[3] = (u8)((addr >> 16) & 0xFF);
-        mac[2] = 0xC9;
+        /* Use the OUI from the current MAC address */
-        mac[1] = 0x00;
+        memcpy(mac, adapter->netdev->dev_addr, 3);
-        mac[0] = 0x00;
 }
 extern void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm,
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 0c7811faf72c..1822ecdadc7e 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -18,11 +18,20 @@
 #include "be.h"
 #include "be_cmds.h"
+/* Must be a power of 2 or else MODULO will BUG_ON */
+static int be_get_temp_freq = 32;
 static void be_mcc_notify(struct be_adapter *adapter)
 {
        struct be_queue_info *mccq = &adapter->mcc_obj.q;
        u32 val = 0;
+        if (adapter->eeh_err) {
+                dev_info(&adapter->pdev->dev,
+                        "Error in Card Detected! Cannot issue commands\n");
+                return;
+        }
        val |= mccq->id & DB_MCCQ_RING_ID_MASK;
        val |= 1 << DB_MCCQ_NUM_POSTED_SHIFT;
@@ -75,7 +84,7 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
                        be_dws_le_to_cpu(&resp->hw_stats,
                                                sizeof(resp->hw_stats));
                        netdev_stats_update(adapter);
-                        adapter->stats_ioctl_sent = false;
+                        adapter->stats_cmd_sent = false;
                }
        } else if ((compl_status != MCC_STATUS_NOT_SUPPORTED) &&
                   (compl->tag0 != OPCODE_COMMON_NTWK_MAC_QUERY)) {
@@ -102,6 +111,7 @@ static void be_async_grp5_cos_priority_process(struct be_adapter *adapter,
 {
        if (evt->valid) {
                adapter->vlan_prio_bmap = evt->available_priority_bmap;
+                adapter->recommended_prio &= ~VLAN_PRIO_MASK;
                adapter->recommended_prio =
                        evt->reco_default_priority << VLAN_PRIO_SHIFT;
        }
@@ -117,6 +127,16 @@ static void be_async_grp5_qos_speed_process(struct be_adapter *adapter,
        }
 }
+/*Grp5 PVID evt*/
+static void be_async_grp5_pvid_state_process(struct be_adapter *adapter,
+                struct be_async_event_grp5_pvid_state *evt)
+{
+        if (evt->enabled)
+                adapter->pvid = evt->tag;
+        else
+                adapter->pvid = 0;
+}
 static void be_async_grp5_evt_process(struct be_adapter *adapter,
                u32 trailer, struct be_mcc_compl *evt)
 {
@@ -134,6 +154,10 @@ static void be_async_grp5_evt_process(struct be_adapter *adapter,
                be_async_grp5_qos_speed_process(adapter,
                (struct be_async_event_grp5_qos_link_speed *)evt);
        break;
+        case ASYNC_EVENT_PVID_STATE:
+                be_async_grp5_pvid_state_process(adapter,
+                (struct be_async_event_grp5_pvid_state *)evt);
+        break;
        default:
                dev_warn(&adapter->pdev->dev, "Unknown grp5 event!\n");
                break;
@@ -216,6 +240,9 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)
        int i, num, status = 0;
        struct be_mcc_obj *mcc_obj = &adapter->mcc_obj;
+        if (adapter->eeh_err)
+                return -EIO;
        for (i = 0; i < mcc_timeout; i++) {
                num = be_process_mcc(adapter, &status);
                if (num)
@@ -245,6 +272,12 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
        int msecs = 0;
        u32 ready;
+        if (adapter->eeh_err) {
+                dev_err(&adapter->pdev->dev,
+                        "Error detected in card.Cannot issue commands\n");
+                return -EIO;
+        }
        do {
                ready = ioread32(db);
                if (ready == 0xffffffff) {
@@ -598,7 +631,7 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
 /* Uses synchronous MCCQ */
 int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
-                u32 if_id, u32 *pmac_id)
+                u32 if_id, u32 *pmac_id, u32 domain)
 {
        struct be_mcc_wrb *wrb;
        struct be_cmd_req_pmac_add *req;
@@ -619,6 +652,7 @@ int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                OPCODE_COMMON_NTWK_PMAC_ADD, sizeof(*req));
+        req->hdr.domain = domain;
        req->if_id = cpu_to_le32(if_id);
        memcpy(req->mac_address, mac_addr, ETH_ALEN);
@@ -634,7 +668,7 @@ err:
 }
 /* Uses synchronous MCCQ */
-int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id)
+int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id, u32 dom)
 {
        struct be_mcc_wrb *wrb;
        struct be_cmd_req_pmac_del *req;
@@ -655,6 +689,7 @@ int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id)
        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                OPCODE_COMMON_NTWK_PMAC_DEL, sizeof(*req));
+        req->hdr.domain = dom;
        req->if_id = cpu_to_le32(if_id);
        req->pmac_id = cpu_to_le32(pmac_id);
@@ -995,7 +1030,7 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
 }
 /* Uses mbox */
-int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id)
+int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id, u32 domain)
 {
        struct be_mcc_wrb *wrb;
        struct be_cmd_req_if_destroy *req;
@@ -1016,6 +1051,7 @@ int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id)
        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                OPCODE_COMMON_NTWK_INTERFACE_DESTROY, sizeof(*req));
+        req->hdr.domain = domain;
        req->interface_id = cpu_to_le32(interface_id);
        status = be_mbox_notify_wait(adapter);
@@ -1036,6 +1072,9 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
        struct be_sge *sge;
        int status = 0;
+        if (MODULO(adapter->work_counter, be_get_temp_freq) == 0)
+                be_cmd_get_die_temperature(adapter);
        spin_lock_bh(&adapter->mcc_lock);
        wrb = wrb_from_mccq(adapter);
@@ -1056,7 +1095,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
        sge->len = cpu_to_le32(nonemb_cmd->size);
        be_mcc_notify(adapter);
-        adapter->stats_ioctl_sent = true;
+        adapter->stats_cmd_sent = true;
 err:
        spin_unlock_bh(&adapter->mcc_lock);
@@ -1103,6 +1142,44 @@ err:
        return status;
 }
+/* Uses synchronous mcc */
+int be_cmd_get_die_temperature(struct be_adapter *adapter)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_get_cntl_addnl_attribs *req;
+        int status;
+        spin_lock_bh(&adapter->mcc_lock);
+        wrb = wrb_from_mccq(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
+        req = embedded_payload(wrb);
+        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
+                        OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES);
+        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES, sizeof(*req));
+        status = be_mcc_notify_wait(adapter);
+        if (!status) {
+                struct be_cmd_resp_get_cntl_addnl_attribs *resp =
+                                                embedded_payload(wrb);
+                adapter->drv_stats.be_on_die_temperature =
+                                                resp->on_die_temperature;
+        }
+        /* If IOCTL fails once, do not bother issuing it again */
+        else
+                be_get_temp_freq = 0;
+err:
+        spin_unlock_bh(&adapter->mcc_lock);
+        return status;
+}
 /* Uses Mbox */
 int be_cmd_get_fw_ver(struct be_adapter *adapter, char *fw_ver)
 {
@@ -1786,6 +1863,10 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
        spin_lock_bh(&adapter->mcc_lock);
        wrb = wrb_from_mccq(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
        req = nonemb_cmd->va;
        sge = nonembedded_sgl(wrb);
@@ -1801,6 +1882,7 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
        status = be_mcc_notify_wait(adapter);
+err:
        spin_unlock_bh(&adapter->mcc_lock);
        return status;
 }
@@ -1863,8 +1945,8 @@ int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain)
                        OPCODE_COMMON_SET_QOS, sizeof(*req));
        req->hdr.domain = domain;
-        req->valid_bits = BE_QOS_BITS_NIC;
+        req->valid_bits = cpu_to_le32(BE_QOS_BITS_NIC);
-        req->max_bps_nic = bps;
+        req->max_bps_nic = cpu_to_le32(bps);
        status = be_mcc_notify_wait(adapter);
@@ -1872,3 +1954,57 @@ err:
        spin_unlock_bh(&adapter->mcc_lock);
        return status;
 }
+int be_cmd_get_cntl_attributes(struct be_adapter *adapter)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_cntl_attribs *req;
+        struct be_cmd_resp_cntl_attribs *resp;
+        struct be_sge *sge;
+        int status;
+        int payload_len = max(sizeof(*req), sizeof(*resp));
+        struct mgmt_controller_attrib *attribs;
+        struct be_dma_mem attribs_cmd;
+        memset(&attribs_cmd, 0, sizeof(struct be_dma_mem));
+        attribs_cmd.size = sizeof(struct be_cmd_resp_cntl_attribs);
+        attribs_cmd.va = pci_alloc_consistent(adapter->pdev, attribs_cmd.size,
+                                                &attribs_cmd.dma);
+        if (!attribs_cmd.va) {
+                dev_err(&adapter->pdev->dev,
+                                "Memory allocation failure\n");
+                return -ENOMEM;
+        }
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
+        wrb = wrb_from_mbox(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
+        req = attribs_cmd.va;
+        sge = nonembedded_sgl(wrb);
+        be_wrb_hdr_prepare(wrb, payload_len, false, 1,
+                        OPCODE_COMMON_GET_CNTL_ATTRIBUTES);
+        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                         OPCODE_COMMON_GET_CNTL_ATTRIBUTES, payload_len);
+        sge->pa_hi = cpu_to_le32(upper_32_bits(attribs_cmd.dma));
+        sge->pa_lo = cpu_to_le32(attribs_cmd.dma & 0xFFFFFFFF);
+        sge->len = cpu_to_le32(attribs_cmd.size);
+        status = be_mbox_notify_wait(adapter);
+        if (!status) {
+                attribs = (struct mgmt_controller_attrib *)( attribs_cmd.va +
+                                        sizeof(struct be_cmd_resp_hdr));
+                adapter->hba_port_num = attribs->hba_attribs.phy_port;
+        }
+err:
+        mutex_unlock(&adapter->mbox_lock);
+        pci_free_consistent(adapter->pdev, attribs_cmd.size, attribs_cmd.va,
+                                        attribs_cmd.dma);
+        return status;
+}
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index 83d15c8a9fa3..93e5768fc705 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -88,6 +88,7 @@ struct be_mcc_compl {
 #define ASYNC_EVENT_CODE_GRP_5          0x5
 #define ASYNC_EVENT_QOS_SPEED           0x1
 #define ASYNC_EVENT_COS_PRIORITY        0x2
+#define ASYNC_EVENT_PVID_STATE          0x3
 struct be_async_event_trailer {
        u32 code;
 };
@@ -134,6 +135,18 @@ struct be_async_event_grp5_cos_priority {
        struct be_async_event_trailer trailer;
 } __packed;
+/* When the event code of an async trailer is GRP5 and event type is
+ * PVID state, the mcc_compl must be interpreted as follows
+ */
+struct be_async_event_grp5_pvid_state {
+        u8 enabled;
+        u8 rsvd0;
+        u16 tag;
+        u32 event_tag;
+        u32 rsvd1;
+        struct be_async_event_trailer trailer;
+} __packed;
 struct be_mcc_mailbox {
        struct be_mcc_wrb wrb;
        struct be_mcc_compl compl;
@@ -156,6 +169,7 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_SET_QOS                           28
 #define OPCODE_COMMON_MCC_CREATE_EXT                    90
 #define OPCODE_COMMON_SEEPROM_READ                      30
+#define OPCODE_COMMON_GET_CNTL_ATTRIBUTES               32
 #define OPCODE_COMMON_NTWK_RX_FILTER                    34
 #define OPCODE_COMMON_GET_FW_VERSION                    35
 #define OPCODE_COMMON_SET_FLOW_CONTROL                  36
@@ -176,6 +190,7 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_GET_BEACON_STATE                  70
 #define OPCODE_COMMON_READ_TRANSRECV_DATA               73
 #define OPCODE_COMMON_GET_PHY_DETAILS                   102
+#define OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES    121
 #define OPCODE_ETH_RSS_CONFIG                           1
 #define OPCODE_ETH_ACPI_CONFIG                          2
@@ -619,7 +634,10 @@ struct be_rxf_stats {
        u32 rx_drops_invalid_ring;      /* dword 145*/
        u32 forwarded_packets;  /* dword 146*/
        u32 rx_drops_mtu;       /* dword 147*/
-        u32 rsvd0[15];
+        u32 rsvd0[7];
+        u32 port0_jabber_events;
+        u32 port1_jabber_events;
+        u32 rsvd1[6];
 };
 struct be_erx_stats {
@@ -630,11 +648,16 @@ struct be_erx_stats {
        u32 debug_pmem_pbuf_dealloc;       /* dword 47*/
 };
+struct be_pmem_stats {
+        u32 eth_red_drops;
+        u32 rsvd[4];
+};
 struct be_hw_stats {
        struct be_rxf_stats rxf;
        u32 rsvd[48];
        struct be_erx_stats erx;
-        u32 rsvd1[6];
+        struct be_pmem_stats pmem;
 };
 struct be_cmd_req_get_stats {
@@ -647,6 +670,20 @@ struct be_cmd_resp_get_stats {
        struct be_hw_stats hw_stats;
 };
+struct be_cmd_req_get_cntl_addnl_attribs {
+        struct be_cmd_req_hdr hdr;
+        u8 rsvd[8];
+};
+struct be_cmd_resp_get_cntl_addnl_attribs {
+        struct be_cmd_resp_hdr hdr;
+        u16 ipl_file_number;
+        u8 ipl_file_version;
+        u8 rsvd0;
+        u8 on_die_temperature; /* in degrees centigrade*/
+        u8 rsvd1[3];
+};
 struct be_cmd_req_vlan_config {
        struct be_cmd_req_hdr hdr;
        u8 interface_id;
@@ -994,17 +1031,29 @@ struct be_cmd_resp_set_qos {
        u32 rsvd;
 };
+/*********************** Controller Attributes ***********************/
+struct be_cmd_req_cntl_attribs {
+        struct be_cmd_req_hdr hdr;
+};
+struct be_cmd_resp_cntl_attribs {
+        struct be_cmd_resp_hdr hdr;
+        struct mgmt_controller_attrib attribs;
+};
 extern int be_pci_fnum_get(struct be_adapter *adapter);
 extern int be_cmd_POST(struct be_adapter *adapter);
 extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
                        u8 type, bool permanent, u32 if_handle);
 extern int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
-                        u32 if_id, u32 *pmac_id);
+                        u32 if_id, u32 *pmac_id, u32 domain);
-extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id);
+extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id,
+                        u32 pmac_id, u32 domain);
 extern int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags,
                        u32 en_flags, u8 *mac, bool pmac_invalid,
                        u32 *if_handle, u32 *pmac_id, u32 domain);
-extern int be_cmd_if_destroy(struct be_adapter *adapter, u32 if_handle);
+extern int be_cmd_if_destroy(struct be_adapter *adapter, u32 if_handle,
+                        u32 domain);
 extern int be_cmd_eq_create(struct be_adapter *adapter,
                        struct be_queue_info *eq, int eq_delay);
 extern int be_cmd_cq_create(struct be_adapter *adapter,
@@ -1076,4 +1125,6 @@ extern int be_cmd_get_phy_info(struct be_adapter *adapter,
                struct be_dma_mem *cmd);
 extern int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain);
 extern void be_detect_dump_ue(struct be_adapter *adapter);
+extern int be_cmd_get_die_temperature(struct be_adapter *adapter);
+extern int be_cmd_get_cntl_attributes(struct be_adapter *adapter);
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index b4be0271efe0..6e5e43380c2a 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -26,7 +26,8 @@ struct be_ethtool_stat {
        int offset;
 };
-enum {NETSTAT, PORTSTAT, MISCSTAT, DRVSTAT_TX, DRVSTAT_RX, ERXSTAT};
+enum {NETSTAT, PORTSTAT, MISCSTAT, DRVSTAT_TX, DRVSTAT_RX, ERXSTAT,
+                        PMEMSTAT, DRVSTAT};
 #define FIELDINFO(_struct, field) FIELD_SIZEOF(_struct, field), \
                                        offsetof(_struct, field)
 #define NETSTAT_INFO(field)     #field, NETSTAT,\
@@ -43,6 +44,11 @@ enum {NETSTAT, PORTSTAT, MISCSTAT, DRVSTAT_TX, DRVSTAT_RX, ERXSTAT};
                                                field)
 #define ERXSTAT_INFO(field)     #field, ERXSTAT,\
                                        FIELDINFO(struct be_erx_stats, field)
+#define PMEMSTAT_INFO(field)    #field, PMEMSTAT,\
+                                        FIELDINFO(struct be_pmem_stats, field)
+#define DRVSTAT_INFO(field)     #field, DRVSTAT,\
+                                        FIELDINFO(struct be_drv_stats, \
+                                                field)
 static const struct be_ethtool_stat et_stats[] = {
        {NETSTAT_INFO(rx_packets)},
@@ -99,7 +105,11 @@ static const struct be_ethtool_stat et_stats[] = {
        {MISCSTAT_INFO(rx_drops_too_many_frags)},
        {MISCSTAT_INFO(rx_drops_invalid_ring)},
        {MISCSTAT_INFO(forwarded_packets)},
-        {MISCSTAT_INFO(rx_drops_mtu)}
+        {MISCSTAT_INFO(rx_drops_mtu)},
+        {MISCSTAT_INFO(port0_jabber_events)},
+        {MISCSTAT_INFO(port1_jabber_events)},
+        {PMEMSTAT_INFO(eth_red_drops)},
+        {DRVSTAT_INFO(be_on_die_temperature)}
 };
 #define ETHTOOL_STATS_NUM ARRAY_SIZE(et_stats)
@@ -121,7 +131,7 @@ static const char et_self_tests[][ETH_GSTRING_LEN] = {
        "MAC Loopback test",
        "PHY Loopback test",
        "External Loopback test",
-        "DDR DMA test"
+        "DDR DMA test",
        "Link test"
 };
@@ -276,6 +286,12 @@ be_get_ethtool_stats(struct net_device *netdev,
                case MISCSTAT:
                        p = &hw_stats->rxf;
                        break;
+                case PMEMSTAT:
+                        p = &hw_stats->pmem;
+                        break;
+                case DRVSTAT:
+                        p = &adapter->drv_stats;
+                        break;
                }
                p = (u8 *)p + et_stats[i].offset;
@@ -376,8 +392,9 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                }
                phy_cmd.size = sizeof(struct be_cmd_req_get_phy_info);
-                phy_cmd.va = pci_alloc_consistent(adapter->pdev, phy_cmd.size,
+                phy_cmd.va = dma_alloc_coherent(&adapter->pdev->dev,
-                                        &phy_cmd.dma);
+                                                phy_cmd.size, &phy_cmd.dma,
+                                                GFP_KERNEL);
                if (!phy_cmd.va) {
                        dev_err(&adapter->pdev->dev, "Memory alloc failure\n");
                        return -ENOMEM;
@@ -416,8 +433,8 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                adapter->port_type = ecmd->port;
                adapter->transceiver = ecmd->transceiver;
                adapter->autoneg = ecmd->autoneg;
-                pci_free_consistent(adapter->pdev, phy_cmd.size,
+                dma_free_coherent(&adapter->pdev->dev, phy_cmd.size, phy_cmd.va,
-                                        phy_cmd.va, phy_cmd.dma);
+                                  phy_cmd.dma);
        } else {
                ecmd->speed = adapter->link_speed;
                ecmd->port = adapter->port_type;
@@ -496,7 +513,7 @@ be_phys_id(struct net_device *netdev, u32 data)
        int status;
        u32 cur;
-        be_cmd_get_beacon_state(adapter, adapter->port_num, &cur);
+        be_cmd_get_beacon_state(adapter, adapter->hba_port_num, &cur);
        if (cur == BEACON_STATE_ENABLED)
                return 0;
@@ -504,23 +521,34 @@ be_phys_id(struct net_device *netdev, u32 data)
        if (data < 2)
                data = 2;
-        status = be_cmd_set_beacon_state(adapter, adapter->port_num, 0, 0,
+        status = be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,
                        BEACON_STATE_ENABLED);
        set_current_state(TASK_INTERRUPTIBLE);
        schedule_timeout(data*HZ);
-        status = be_cmd_set_beacon_state(adapter, adapter->port_num, 0, 0,
+        status = be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,
                        BEACON_STATE_DISABLED);
        return status;
 }
+static bool
+be_is_wol_supported(struct be_adapter *adapter)
+{
+        if (!be_physfn(adapter))
+                return false;
+        else
+                return true;
+}
 static void
 be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 {
        struct be_adapter *adapter = netdev_priv(netdev);
-        wol->supported = WAKE_MAGIC;
+        if (be_is_wol_supported(adapter))
+                wol->supported = WAKE_MAGIC;
        if (adapter->wol)
                wol->wolopts = WAKE_MAGIC;
        else
@@ -536,7 +564,7 @@ be_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
        if (wol->wolopts & ~WAKE_MAGIC)
                return -EINVAL;
-        if (wol->wolopts & WAKE_MAGIC)
+        if ((wol->wolopts & WAKE_MAGIC) && be_is_wol_supported(adapter))
                adapter->wol = true;
        else
                adapter->wol = false;
@@ -554,8 +582,8 @@ be_test_ddr_dma(struct be_adapter *adapter)
        };
        ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test);
-        ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size,
+        ddrdma_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, ddrdma_cmd.size,
-                                        &ddrdma_cmd.dma);
+                                           &ddrdma_cmd.dma, GFP_KERNEL);
        if (!ddrdma_cmd.va) {
                dev_err(&adapter->pdev->dev, "Memory allocation failure\n");
                return -ENOMEM;
@@ -569,20 +597,20 @@ be_test_ddr_dma(struct be_adapter *adapter)
        }
 err:
-        pci_free_consistent(adapter->pdev, ddrdma_cmd.size,
+        dma_free_coherent(&adapter->pdev->dev, ddrdma_cmd.size, ddrdma_cmd.va,
-                        ddrdma_cmd.va, ddrdma_cmd.dma);
+                          ddrdma_cmd.dma);
        return ret;
 }
 static u64 be_loopback_test(struct be_adapter *adapter, u8 loopback_type,
                                u64 *status)
 {
-        be_cmd_set_loopback(adapter, adapter->port_num,
+        be_cmd_set_loopback(adapter, adapter->hba_port_num,
                                loopback_type, 1);
-        *status = be_cmd_loopback_test(adapter, adapter->port_num,
+        *status = be_cmd_loopback_test(adapter, adapter->hba_port_num,
                                loopback_type, 1500,
                                2, 0xabc);
-        be_cmd_set_loopback(adapter, adapter->port_num,
+        be_cmd_set_loopback(adapter, adapter->hba_port_num,
                                BE_NO_LOOPBACK, 1);
        return *status;
 }
@@ -621,7 +649,8 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
                                &qos_link_speed) != 0) {
                test->flags |= ETH_TEST_FL_FAILED;
                data[4] = -1;
-        } else if (mac_speed) {
+        } else if (!mac_speed) {
+                test->flags |= ETH_TEST_FL_FAILED;
                data[4] = 1;
        }
 }
@@ -662,8 +691,8 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
        memset(&eeprom_cmd, 0, sizeof(struct be_dma_mem));
        eeprom_cmd.size = sizeof(struct be_cmd_req_seeprom_read);
-        eeprom_cmd.va = pci_alloc_consistent(adapter->pdev, eeprom_cmd.size,
+        eeprom_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, eeprom_cmd.size,
-                                &eeprom_cmd.dma);
+                                           &eeprom_cmd.dma, GFP_KERNEL);
        if (!eeprom_cmd.va) {
                dev_err(&adapter->pdev->dev,
@@ -677,8 +706,8 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
                resp = (struct be_cmd_resp_seeprom_read *) eeprom_cmd.va;
                memcpy(data, resp->seeprom_data + eeprom->offset, eeprom->len);
        }
-        pci_free_consistent(adapter->pdev, eeprom_cmd.size, eeprom_cmd.va,
+        dma_free_coherent(&adapter->pdev->dev, eeprom_cmd.size, eeprom_cmd.va,
-                        eeprom_cmd.dma);
+                          eeprom_cmd.dma);
        return status;
 }
diff --git a/drivers/net/benet/be_hw.h b/drivers/net/benet/be_hw.h
index 4096d9778234..3f459f76cd1d 100644
--- a/drivers/net/benet/be_hw.h
+++ b/drivers/net/benet/be_hw.h
@@ -327,6 +327,53 @@ struct be_eth_rx_compl {
        u32 dw[4];
 };
+struct mgmt_hba_attribs {
+        u8 flashrom_version_string[32];
+        u8 manufacturer_name[32];
+        u32 supported_modes;
+        u32 rsvd0[3];
+        u8 ncsi_ver_string[12];
+        u32 default_extended_timeout;
+        u8 controller_model_number[32];
+        u8 controller_description[64];
+        u8 controller_serial_number[32];
+        u8 ip_version_string[32];
+        u8 firmware_version_string[32];
+        u8 bios_version_string[32];
+        u8 redboot_version_string[32];
+        u8 driver_version_string[32];
+        u8 fw_on_flash_version_string[32];
+        u32 functionalities_supported;
+        u16 max_cdblength;
+        u8 asic_revision;
+        u8 generational_guid[16];
+        u8 hba_port_count;
+        u16 default_link_down_timeout;
+        u8 iscsi_ver_min_max;
+        u8 multifunction_device;
+        u8 cache_valid;
+        u8 hba_status;
+        u8 max_domains_supported;
+        u8 phy_port;
+        u32 firmware_post_status;
+        u32 hba_mtu[8];
+        u32 rsvd1[4];
+};
+struct mgmt_controller_attrib {
+        struct mgmt_hba_attribs hba_attribs;
+        u16 pci_vendor_id;
+        u16 pci_device_id;
+        u16 pci_sub_vendor_id;
+        u16 pci_sub_system_id;
+        u8 pci_bus_number;
+        u8 pci_device_number;
+        u8 pci_function_number;
+        u8 interface_type;
+        u64 unique_identifier;
+        u32 rsvd0[5];
+};
 struct controller_id {
        u32 vendor;
        u32 device;
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index de40d3b7152f..0bdccb10aac5 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -125,8 +125,8 @@ static void be_queue_free(struct be_adapter *adapter, struct be_queue_info *q)
 {
        struct be_dma_mem *mem = &q->dma_mem;
        if (mem->va)
-                pci_free_consistent(adapter->pdev, mem->size,
+                dma_free_coherent(&adapter->pdev->dev, mem->size, mem->va,
-                        mem->va, mem->dma);
+                                  mem->dma);
 }
 static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q,
@@ -138,7 +138,8 @@ static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q,
        q->len = len;
        q->entry_size = entry_size;
        mem->size = len * entry_size;
-        mem->va = pci_alloc_consistent(adapter->pdev, mem->size, &mem->dma);
+        mem->va = dma_alloc_coherent(&adapter->pdev->dev, mem->size, &mem->dma,
+                                     GFP_KERNEL);
        if (!mem->va)
                return -1;
        memset(mem->va, 0, mem->size);
@@ -235,12 +236,13 @@ static int be_mac_addr_set(struct net_device *netdev, void *p)
        if (!be_physfn(adapter))
                goto netdev_addr;
-        status = be_cmd_pmac_del(adapter, adapter->if_handle, adapter->pmac_id);
+        status = be_cmd_pmac_del(adapter, adapter->if_handle,
+                                adapter->pmac_id, 0);
        if (status)
                return status;
        status = be_cmd_pmac_add(adapter, (u8 *)addr->sa_data,
-                        adapter->if_handle, &adapter->pmac_id);
+                                adapter->if_handle, &adapter->pmac_id, 0);
 netdev_addr:
        if (!status)
                memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
@@ -312,11 +314,9 @@ void be_link_status_update(struct be_adapter *adapter, bool link_up)
        if (adapter->link_up != link_up) {
                adapter->link_speed = -1;
                if (link_up) {
-                        netif_start_queue(netdev);
                        netif_carrier_on(netdev);
                        printk(KERN_INFO "%s: Link up\n", netdev->name);
                } else {
-                        netif_stop_queue(netdev);
                        netif_carrier_off(netdev);
                        printk(KERN_INFO "%s: Link down\n", netdev->name);
                }
@@ -486,7 +486,7 @@ static void wrb_fill_hdr(struct be_adapter *adapter, struct be_eth_hdr_wrb *hdr,
        AMAP_SET_BITS(struct amap_eth_hdr_wrb, len, hdr, len);
 }
-static void unmap_tx_frag(struct pci_dev *pdev, struct be_eth_wrb *wrb,
+static void unmap_tx_frag(struct device *dev, struct be_eth_wrb *wrb,
                bool unmap_single)
 {
        dma_addr_t dma;
@@ -496,11 +496,10 @@ static void unmap_tx_frag(struct pci_dev *pdev, struct be_eth_wrb *wrb,
        dma = (u64)wrb->frag_pa_hi << 32 | (u64)wrb->frag_pa_lo;
        if (wrb->frag_len) {
                if (unmap_single)
-                        pci_unmap_single(pdev, dma, wrb->frag_len,
+                        dma_unmap_single(dev, dma, wrb->frag_len,
-                                PCI_DMA_TODEVICE);
+                                         DMA_TO_DEVICE);
                else
-                        pci_unmap_page(pdev, dma, wrb->frag_len,
+                        dma_unmap_page(dev, dma, wrb->frag_len, DMA_TO_DEVICE);
-                                PCI_DMA_TODEVICE);
        }
 }
@@ -509,7 +508,7 @@ static int make_tx_wrbs(struct be_adapter *adapter,
 {
        dma_addr_t busaddr;
        int i, copied = 0;
-        struct pci_dev *pdev = adapter->pdev;
+        struct device *dev = &adapter->pdev->dev;
        struct sk_buff *first_skb = skb;
        struct be_queue_info *txq = &adapter->tx_obj.q;
        struct be_eth_wrb *wrb;
@@ -523,9 +522,8 @@ static int make_tx_wrbs(struct be_adapter *adapter,
        if (skb->len > skb->data_len) {
                int len = skb_headlen(skb);
-                busaddr = pci_map_single(pdev, skb->data, len,
+                busaddr = dma_map_single(dev, skb->data, len, DMA_TO_DEVICE);
-                                         PCI_DMA_TODEVICE);
+                if (dma_mapping_error(dev, busaddr))
-                if (pci_dma_mapping_error(pdev, busaddr))
                        goto dma_err;
                map_single = true;
                wrb = queue_head_node(txq);
@@ -538,10 +536,9 @@ static int make_tx_wrbs(struct be_adapter *adapter,
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                struct skb_frag_struct *frag =
                        &skb_shinfo(skb)->frags[i];
-                busaddr = pci_map_page(pdev, frag->page,
+                busaddr = dma_map_page(dev, frag->page, frag->page_offset,
-                                       frag->page_offset,
+                                       frag->size, DMA_TO_DEVICE);
-                                       frag->size, PCI_DMA_TODEVICE);
+                if (dma_mapping_error(dev, busaddr))
-                if (pci_dma_mapping_error(pdev, busaddr))
                        goto dma_err;
                wrb = queue_head_node(txq);
                wrb_fill(wrb, busaddr, frag->size);
@@ -565,7 +562,7 @@ dma_err:
        txq->head = map_head;
        while (copied) {
                wrb = queue_head_node(txq);
-                unmap_tx_frag(pdev, wrb, map_single);
+                unmap_tx_frag(dev, wrb, map_single);
                map_single = false;
                copied -= wrb->frag_len;
                queue_head_inc(txq);
@@ -745,11 +742,11 @@ static int be_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
        if (adapter->vf_cfg[vf].vf_pmac_id != BE_INVALID_PMAC_ID)
                status = be_cmd_pmac_del(adapter,
                                        adapter->vf_cfg[vf].vf_if_handle,
-                                        adapter->vf_cfg[vf].vf_pmac_id);
+                                        adapter->vf_cfg[vf].vf_pmac_id, vf + 1);
        status = be_cmd_pmac_add(adapter, mac,
                                adapter->vf_cfg[vf].vf_if_handle,
-                                &adapter->vf_cfg[vf].vf_pmac_id);
+                                &adapter->vf_cfg[vf].vf_pmac_id, vf + 1);
        if (status)
                dev_err(&adapter->pdev->dev, "MAC %pM set on VF %d Failed\n",
@@ -824,7 +821,7 @@ static int be_set_vf_tx_rate(struct net_device *netdev,
                rate = 10000;
        adapter->vf_cfg[vf].vf_tx_rate = rate;
-        status = be_cmd_set_qos(adapter, rate / 10, vf);
+        status = be_cmd_set_qos(adapter, rate / 10, vf + 1);
        if (status)
                dev_info(&adapter->pdev->dev,
@@ -890,8 +887,9 @@ get_rx_page_info(struct be_adapter *adapter,
        BUG_ON(!rx_page_info->page);
        if (rx_page_info->last_page_user) {
-                pci_unmap_page(adapter->pdev, dma_unmap_addr(rx_page_info, bus),
+                dma_unmap_page(&adapter->pdev->dev,
-                        adapter->big_page_size, PCI_DMA_FROMDEVICE);
+                               dma_unmap_addr(rx_page_info, bus),
+                               adapter->big_page_size, DMA_FROM_DEVICE);
                rx_page_info->last_page_user = false;
        }
@@ -1049,6 +1047,9 @@ static void be_rx_compl_process(struct be_adapter *adapter,
        if ((adapter->function_mode & 0x400) && !vtm)
                vlanf = 0;
+        if ((adapter->pvid == vlanf) && !adapter->vlan_tag[vlanf])
+                vlanf = 0;
        if (unlikely(vlanf)) {
                if (!adapter->vlan_grp || adapter->vlans_added == 0) {
                        kfree_skb(skb);
@@ -1089,6 +1090,9 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
        if ((adapter->function_mode & 0x400) && !vtm)
                vlanf = 0;
+        if ((adapter->pvid == vlanf) && !adapter->vlan_tag[vlanf])
+                vlanf = 0;
        skb = napi_get_frags(&eq_obj->napi);
        if (!skb) {
                be_rx_compl_discard(adapter, rxo, rxcp);
@@ -1197,9 +1201,9 @@ static void be_post_rx_frags(struct be_rx_obj *rxo)
                                rxo->stats.rx_post_fail++;
                                break;
                        }
-                        page_dmaaddr = pci_map_page(adapter->pdev, pagep, 0,
+                        page_dmaaddr = dma_map_page(&adapter->pdev->dev, pagep,
-                                                adapter->big_page_size,
+                                                    0, adapter->big_page_size,
-                                                PCI_DMA_FROMDEVICE);
+                                                    DMA_FROM_DEVICE);
                        page_info->page_offset = 0;
                } else {
                        get_page(pagep);
@@ -1272,8 +1276,8 @@ static void be_tx_compl_process(struct be_adapter *adapter, u16 last_index)
        do {
                cur_index = txq->tail;
                wrb = queue_tail_node(txq);
-                unmap_tx_frag(adapter->pdev, wrb, (unmap_skb_hdr &&
+                unmap_tx_frag(&adapter->pdev->dev, wrb,
-                                        skb_headlen(sent_skb)));
+                              (unmap_skb_hdr && skb_headlen(sent_skb)));
                unmap_skb_hdr = false;
                num_wrbs++;
@@ -1829,6 +1833,7 @@ void be_detect_dump_ue(struct be_adapter *adapter)
        if (ue_status_lo || ue_status_hi) {
                adapter->ue_detected = true;
+                adapter->eeh_err = true;
                dev_err(&adapter->pdev->dev, "UE Detected!!\n");
        }
@@ -1867,10 +1872,14 @@ static void be_worker(struct work_struct *work)
                        struct be_mcc_obj *mcc_obj = &adapter->mcc_obj;
                        be_cq_notify(adapter, mcc_obj->cq.id, false, mcc_compl);
                }
+                if (!adapter->ue_detected && !lancer_chip(adapter))
+                        be_detect_dump_ue(adapter);
                goto reschedule;
        }
-        if (!adapter->stats_ioctl_sent)
+        if (!adapter->stats_cmd_sent)
                be_cmd_get_stats(adapter, &adapter->stats_cmd);
        be_tx_rate_update(adapter);
@@ -2181,7 +2190,8 @@ static int be_setup_wol(struct be_adapter *adapter, bool enable)
        memset(mac, 0, ETH_ALEN);
        cmd.size = sizeof(struct be_cmd_req_acpi_wol_magic_config);
-        cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size, &cmd.dma);
+        cmd.va = dma_alloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
+                                    GFP_KERNEL);
        if (cmd.va == NULL)
                return -1;
        memset(cmd.va, 0, cmd.size);
@@ -2192,8 +2202,8 @@ static int be_setup_wol(struct be_adapter *adapter, bool enable)
                if (status) {
                        dev_err(&adapter->pdev->dev,
                                "Could not enable Wake-on-lan\n");
-                        pci_free_consistent(adapter->pdev, cmd.size, cmd.va,
+                        dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va,
-                                        cmd.dma);
+                                          cmd.dma);
                        return status;
                }
                status = be_cmd_enable_magic_wol(adapter,
@@ -2206,7 +2216,7 @@ static int be_setup_wol(struct be_adapter *adapter, bool enable)
                pci_enable_wake(adapter->pdev, PCI_D3cold, 0);
        }
-        pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va, cmd.dma);
        return status;
 }
@@ -2227,7 +2237,8 @@ static inline int be_vf_eth_addr_config(struct be_adapter *adapter)
        for (vf = 0; vf < num_vfs; vf++) {
                status = be_cmd_pmac_add(adapter, mac,
                                        adapter->vf_cfg[vf].vf_if_handle,
-                                        &adapter->vf_cfg[vf].vf_pmac_id);
+                                        &adapter->vf_cfg[vf].vf_pmac_id,
+                                        vf + 1);
                if (status)
                        dev_err(&adapter->pdev->dev,
                                "Mac address add failed for VF %d\n", vf);
@@ -2247,7 +2258,7 @@ static inline void be_vf_eth_addr_rem(struct be_adapter *adapter)
                if (adapter->vf_cfg[vf].vf_pmac_id != BE_INVALID_PMAC_ID)
                        be_cmd_pmac_del(adapter,
                                        adapter->vf_cfg[vf].vf_if_handle,
-                                        adapter->vf_cfg[vf].vf_pmac_id);
+                                        adapter->vf_cfg[vf].vf_pmac_id, vf + 1);
        }
 }
@@ -2279,22 +2290,26 @@ static int be_setup(struct be_adapter *adapter)
                goto do_none;
        if (be_physfn(adapter)) {
-                while (vf < num_vfs) {
+                if (adapter->sriov_enabled) {
-                        cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED
+                        while (vf < num_vfs) {
-                                        | BE_IF_FLAGS_BROADCAST;
+                                cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED |
-                        status = be_cmd_if_create(adapter, cap_flags, en_flags,
+                                                        BE_IF_FLAGS_BROADCAST;
-                                        mac, true,
+                                status = be_cmd_if_create(adapter, cap_flags,
+                                        en_flags, mac, true,
                                        &adapter->vf_cfg[vf].vf_if_handle,
                                        NULL, vf+1);
-                        if (status) {
+                                if (status) {
-                                dev_err(&adapter->pdev->dev,
+                                        dev_err(&adapter->pdev->dev,
-                                "Interface Create failed for VF %d\n", vf);
+                                        "Interface Create failed for VF %d\n",
-                                goto if_destroy;
+                                        vf);
+                                        goto if_destroy;
+                                }
+                                adapter->vf_cfg[vf].vf_pmac_id =
+                                                        BE_INVALID_PMAC_ID;
+                                vf++;
                        }
-                        adapter->vf_cfg[vf].vf_pmac_id = BE_INVALID_PMAC_ID;
-                        vf++;
                }
-        } else if (!be_physfn(adapter)) {
+        } else {
                status = be_cmd_mac_addr_query(adapter, mac,
                        MAC_ADDRESS_TYPE_NETWORK, false, adapter->if_handle);
                if (!status) {
@@ -2315,44 +2330,46 @@ static int be_setup(struct be_adapter *adapter)
        if (status != 0)
                goto rx_qs_destroy;
-        if (be_physfn(adapter)) {
-                status = be_vf_eth_addr_config(adapter);
-                if (status)
-                        goto mcc_q_destroy;
-        }
        adapter->link_speed = -1;
        return 0;
-mcc_q_destroy:
-        if (be_physfn(adapter))
-                be_vf_eth_addr_rem(adapter);
        be_mcc_queues_destroy(adapter);
 rx_qs_destroy:
        be_rx_queues_destroy(adapter);
 tx_qs_destroy:
        be_tx_queues_destroy(adapter);
 if_destroy:
-        for (vf = 0; vf < num_vfs; vf++)
+        if (be_physfn(adapter) && adapter->sriov_enabled)
-                if (adapter->vf_cfg[vf].vf_if_handle)
+                for (vf = 0; vf < num_vfs; vf++)
-                        be_cmd_if_destroy(adapter,
+                        if (adapter->vf_cfg[vf].vf_if_handle)
-                                        adapter->vf_cfg[vf].vf_if_handle);
+                                be_cmd_if_destroy(adapter,
-        be_cmd_if_destroy(adapter, adapter->if_handle);
+                                        adapter->vf_cfg[vf].vf_if_handle,
+                                        vf + 1);
+        be_cmd_if_destroy(adapter, adapter->if_handle, 0);
 do_none:
        return status;
 }
 static int be_clear(struct be_adapter *adapter)
 {
-        if (be_physfn(adapter))
+        int vf;
+        if (be_physfn(adapter) && adapter->sriov_enabled)
                be_vf_eth_addr_rem(adapter);
        be_mcc_queues_destroy(adapter);
        be_rx_queues_destroy(adapter);
        be_tx_queues_destroy(adapter);
-        be_cmd_if_destroy(adapter, adapter->if_handle);
+        if (be_physfn(adapter) && adapter->sriov_enabled)
+                for (vf = 0; vf < num_vfs; vf++)
+                        if (adapter->vf_cfg[vf].vf_if_handle)
+                                be_cmd_if_destroy(adapter,
+                                        adapter->vf_cfg[vf].vf_if_handle,
+                                        vf + 1);
+        be_cmd_if_destroy(adapter, adapter->if_handle,  0);
        /* tell fw we're done with firing cmds */
        be_cmd_fw_clean(adapter);
@@ -2455,8 +2472,8 @@ static int be_flash_data(struct be_adapter *adapter,
                        continue;
                if ((pflashcomp[i].optype == IMG_TYPE_REDBOOT) &&
                        (!be_flash_redboot(adapter, fw->data,
-                         pflashcomp[i].offset, pflashcomp[i].size,
+                        pflashcomp[i].offset, pflashcomp[i].size, filehdr_size +
-                         filehdr_size)))
+                        (num_of_images * sizeof(struct image_hdr)))))
                        continue;
                p = fw->data;
                p += filehdr_size + pflashcomp[i].offset
@@ -2530,8 +2547,8 @@ int be_load_fw(struct be_adapter *adapter, u8 *func)
        dev_info(&adapter->pdev->dev, "Flashing firmware file %s\n", fw_file);
        flash_cmd.size = sizeof(struct be_cmd_write_flashrom) + 32*1024;
-        flash_cmd.va = pci_alloc_consistent(adapter->pdev, flash_cmd.size,
+        flash_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, flash_cmd.size,
-                                        &flash_cmd.dma);
+                                          &flash_cmd.dma, GFP_KERNEL);
        if (!flash_cmd.va) {
                status = -ENOMEM;
                dev_err(&adapter->pdev->dev,
@@ -2560,8 +2577,8 @@ int be_load_fw(struct be_adapter *adapter, u8 *func)
                status = -1;
        }
-        pci_free_consistent(adapter->pdev, flash_cmd.size, flash_cmd.va,
+        dma_free_coherent(&adapter->pdev->dev, flash_cmd.size, flash_cmd.va,
-                                flash_cmd.dma);
+                          flash_cmd.dma);
        if (status) {
                dev_err(&adapter->pdev->dev, "Firmware load error\n");
                goto fw_exit;
@@ -2628,8 +2645,6 @@ static void be_netdev_init(struct net_device *netdev)
        netif_napi_add(netdev, &adapter->tx_eq.napi, be_poll_tx_mcc,
                BE_NAPI_WEIGHT);
-        netif_stop_queue(netdev);
 }
 static void be_unmap_pci_bars(struct be_adapter *adapter)
@@ -2704,13 +2719,13 @@ static void be_ctrl_cleanup(struct be_adapter *adapter)
        be_unmap_pci_bars(adapter);
        if (mem->va)
-                pci_free_consistent(adapter->pdev, mem->size,
+                dma_free_coherent(&adapter->pdev->dev, mem->size, mem->va,
-                        mem->va, mem->dma);
+                                  mem->dma);
        mem = &adapter->mc_cmd_mem;
        if (mem->va)
-                pci_free_consistent(adapter->pdev, mem->size,
+                dma_free_coherent(&adapter->pdev->dev, mem->size, mem->va,
-                        mem->va, mem->dma);
+                                  mem->dma);
 }
 static int be_ctrl_init(struct be_adapter *adapter)
@@ -2725,8 +2740,10 @@ static int be_ctrl_init(struct be_adapter *adapter)
                goto done;
        mbox_mem_alloc->size = sizeof(struct be_mcc_mailbox) + 16;
-        mbox_mem_alloc->va = pci_alloc_consistent(adapter->pdev,
+        mbox_mem_alloc->va = dma_alloc_coherent(&adapter->pdev->dev,
-                                mbox_mem_alloc->size, &mbox_mem_alloc->dma);
+                                                mbox_mem_alloc->size,
+                                                &mbox_mem_alloc->dma,
+                                                GFP_KERNEL);
        if (!mbox_mem_alloc->va) {
                status = -ENOMEM;
                goto unmap_pci_bars;
@@ -2738,8 +2755,9 @@ static int be_ctrl_init(struct be_adapter *adapter)
        memset(mbox_mem_align->va, 0, sizeof(struct be_mcc_mailbox));
        mc_cmd_mem->size = sizeof(struct be_cmd_req_mcast_mac_config);
-        mc_cmd_mem->va = pci_alloc_consistent(adapter->pdev, mc_cmd_mem->size,
+        mc_cmd_mem->va = dma_alloc_coherent(&adapter->pdev->dev,
-                        &mc_cmd_mem->dma);
+                                            mc_cmd_mem->size, &mc_cmd_mem->dma,
+                                            GFP_KERNEL);
        if (mc_cmd_mem->va == NULL) {
                status = -ENOMEM;
                goto free_mbox;
@@ -2755,8 +2773,8 @@ static int be_ctrl_init(struct be_adapter *adapter)
        return 0;
 free_mbox:
-        pci_free_consistent(adapter->pdev, mbox_mem_alloc->size,
+        dma_free_coherent(&adapter->pdev->dev, mbox_mem_alloc->size,
-                mbox_mem_alloc->va, mbox_mem_alloc->dma);
+                          mbox_mem_alloc->va, mbox_mem_alloc->dma);
 unmap_pci_bars:
        be_unmap_pci_bars(adapter);
@@ -2770,8 +2788,8 @@ static void be_stats_cleanup(struct be_adapter *adapter)
        struct be_dma_mem *cmd = &adapter->stats_cmd;
        if (cmd->va)
-                pci_free_consistent(adapter->pdev, cmd->size,
+                dma_free_coherent(&adapter->pdev->dev, cmd->size,
-                        cmd->va, cmd->dma);
+                                  cmd->va, cmd->dma);
 }
 static int be_stats_init(struct be_adapter *adapter)
@@ -2779,7 +2797,8 @@ static int be_stats_init(struct be_adapter *adapter)
        struct be_dma_mem *cmd = &adapter->stats_cmd;
        cmd->size = sizeof(struct be_cmd_req_get_stats);
-        cmd->va = pci_alloc_consistent(adapter->pdev, cmd->size, &cmd->dma);
+        cmd->va = dma_alloc_coherent(&adapter->pdev->dev, cmd->size, &cmd->dma,
+                                     GFP_KERNEL);
        if (cmd->va == NULL)
                return -1;
        memset(cmd->va, 0, cmd->size);
@@ -2849,6 +2868,10 @@ static int be_get_config(struct be_adapter *adapter)
        else
                adapter->max_vlans = BE_NUM_VLANS_SUPPORTED;
+        status = be_cmd_get_cntl_attributes(adapter);
+        if (status)
+                return status;
        return 0;
 }
@@ -2922,11 +2945,11 @@ static int __devinit be_probe(struct pci_dev *pdev,
        adapter->netdev = netdev;
        SET_NETDEV_DEV(netdev, &pdev->dev);
-        status = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
+        status = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
        if (!status) {
                netdev->features |= NETIF_F_HIGHDMA;
        } else {
-                status = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+                status = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
                if (status) {
                        dev_err(&pdev->dev, "Could not set PCI DMA Mask\n");
                        goto free_netdev;
@@ -2951,11 +2974,9 @@ static int __devinit be_probe(struct pci_dev *pdev,
        if (status)
                goto ctrl_clean;
-        if (be_physfn(adapter)) {
+        status = be_cmd_reset_function(adapter);
-                status = be_cmd_reset_function(adapter);
+        if (status)
-                if (status)
+                goto ctrl_clean;
-                        goto ctrl_clean;
-        }
        status = be_stats_init(adapter);
        if (status)
@@ -2979,10 +3000,18 @@ static int __devinit be_probe(struct pci_dev *pdev,
                goto unsetup;
        netif_carrier_off(netdev);
+        if (be_physfn(adapter) && adapter->sriov_enabled) {
+                status = be_vf_eth_addr_config(adapter);
+                if (status)
+                        goto unreg_netdev;
+        }
        dev_info(&pdev->dev, "%s port %d\n", nic_name(pdev), adapter->port_num);
        schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
        return 0;
+unreg_netdev:
+        unregister_netdev(netdev);
 unsetup:
        be_clear(adapter);
 msix_disable:
@@ -3009,6 +3038,7 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state)
        struct be_adapter *adapter = pci_get_drvdata(pdev);
        struct net_device *netdev =  adapter->netdev;
+        cancel_delayed_work_sync(&adapter->work);
        if (adapter->wol)
                be_setup_wol(adapter, true);
@@ -3021,6 +3051,7 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state)
        be_cmd_get_flow_control(adapter, &adapter->tx_fc, &adapter->rx_fc);
        be_clear(adapter);
+        be_msix_disable(adapter);
        pci_save_state(pdev);
        pci_disable_device(pdev);
        pci_set_power_state(pdev, pci_choose_state(pdev, state));
@@ -3042,6 +3073,7 @@ static int be_resume(struct pci_dev *pdev)
        pci_set_power_state(pdev, 0);
        pci_restore_state(pdev);
+        be_msix_enable(adapter);
        /* tell fw we're ready to fire cmds */
        status = be_cmd_fw_init(adapter);
        if (status)
@@ -3057,6 +3089,8 @@ static int be_resume(struct pci_dev *pdev)
        if (adapter->wol)
                be_setup_wol(adapter, false);
+        schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
        return 0;
 }
@@ -3068,6 +3102,9 @@ static void be_shutdown(struct pci_dev *pdev)
        struct be_adapter *adapter = pci_get_drvdata(pdev);
        struct net_device *netdev =  adapter->netdev;
+        if (netif_running(netdev))
+                cancel_delayed_work_sync(&adapter->work);
        netif_device_detach(netdev);
        be_cmd_reset_function(adapter);
diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c
index fad912656fe4..9f356d5d0f33 100644
--- a/drivers/net/bna/bnad.c
+++ b/drivers/net/bna/bnad.c
@@ -126,22 +126,22 @@ bnad_free_all_txbufs(struct bnad *bnad,
                }
                unmap_array[unmap_cons].skb = NULL;
-                pci_unmap_single(bnad->pcidev,
+                dma_unmap_single(&bnad->pcidev->dev,
-                                 pci_unmap_addr(&unmap_array[unmap_cons],
+                                 dma_unmap_addr(&unmap_array[unmap_cons],
                                                dma_addr), skb_headlen(skb),
-                                                PCI_DMA_TODEVICE);
+                                                DMA_TO_DEVICE);
-                pci_unmap_addr_set(&unmap_array[unmap_cons], dma_addr, 0);
+                dma_unmap_addr_set(&unmap_array[unmap_cons], dma_addr, 0);
                if (++unmap_cons >= unmap_q->q_depth)
                        break;
                for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-                        pci_unmap_page(bnad->pcidev,
+                        dma_unmap_page(&bnad->pcidev->dev,
-                                       pci_unmap_addr(&unmap_array[unmap_cons],
+                                       dma_unmap_addr(&unmap_array[unmap_cons],
                                                      dma_addr),
                                       skb_shinfo(skb)->frags[i].size,
-                                       PCI_DMA_TODEVICE);
+                                       DMA_TO_DEVICE);
-                        pci_unmap_addr_set(&unmap_array[unmap_cons], dma_addr,
+                        dma_unmap_addr_set(&unmap_array[unmap_cons], dma_addr,
                                           0);
                        if (++unmap_cons >= unmap_q->q_depth)
                                break;
@@ -199,23 +199,23 @@ bnad_free_txbufs(struct bnad *bnad,
                sent_bytes += skb->len;
                wis -= BNA_TXQ_WI_NEEDED(1 + skb_shinfo(skb)->nr_frags);
-                pci_unmap_single(bnad->pcidev,
+                dma_unmap_single(&bnad->pcidev->dev,
-                                 pci_unmap_addr(&unmap_array[unmap_cons],
+                                 dma_unmap_addr(&unmap_array[unmap_cons],
                                                dma_addr), skb_headlen(skb),
-                                 PCI_DMA_TODEVICE);
+                                 DMA_TO_DEVICE);
-                pci_unmap_addr_set(&unmap_array[unmap_cons], dma_addr, 0);
+                dma_unmap_addr_set(&unmap_array[unmap_cons], dma_addr, 0);
                BNA_QE_INDX_ADD(unmap_cons, 1, unmap_q->q_depth);
                prefetch(&unmap_array[unmap_cons + 1]);
                for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                        prefetch(&unmap_array[unmap_cons + 1]);
-                        pci_unmap_page(bnad->pcidev,
+                        dma_unmap_page(&bnad->pcidev->dev,
-                                       pci_unmap_addr(&unmap_array[unmap_cons],
+                                       dma_unmap_addr(&unmap_array[unmap_cons],
                                                      dma_addr),
                                       skb_shinfo(skb)->frags[i].size,
-                                       PCI_DMA_TODEVICE);
+                                       DMA_TO_DEVICE);
-                        pci_unmap_addr_set(&unmap_array[unmap_cons], dma_addr,
+                        dma_unmap_addr_set(&unmap_array[unmap_cons], dma_addr,
                                           0);
                        BNA_QE_INDX_ADD(unmap_cons, 1, unmap_q->q_depth);
                }
@@ -340,19 +340,22 @@ static void
 bnad_free_all_rxbufs(struct bnad *bnad, struct bna_rcb *rcb)
 {
        struct bnad_unmap_q *unmap_q;
+        struct bnad_skb_unmap *unmap_array;
        struct sk_buff *skb;
        int unmap_cons;
        unmap_q = rcb->unmap_q;
+        unmap_array = unmap_q->unmap_array;
        for (unmap_cons = 0; unmap_cons < unmap_q->q_depth; unmap_cons++) {
-                skb = unmap_q->unmap_array[unmap_cons].skb;
+                skb = unmap_array[unmap_cons].skb;
                if (!skb)
                        continue;
-                unmap_q->unmap_array[unmap_cons].skb = NULL;
+                unmap_array[unmap_cons].skb = NULL;
-                pci_unmap_single(bnad->pcidev, pci_unmap_addr(&unmap_q->
+                dma_unmap_single(&bnad->pcidev->dev,
-                                        unmap_array[unmap_cons],
+                                 dma_unmap_addr(&unmap_array[unmap_cons],
-                                        dma_addr), rcb->rxq->buffer_size,
+                                                dma_addr),
-                                        PCI_DMA_FROMDEVICE);
+                                 rcb->rxq->buffer_size,
+                                 DMA_FROM_DEVICE);
                dev_kfree_skb(skb);
        }
        bnad_reset_rcb(bnad, rcb);
@@ -391,9 +394,10 @@ bnad_alloc_n_post_rxbufs(struct bnad *bnad, struct bna_rcb *rcb)
                skb->dev = bnad->netdev;
                skb_reserve(skb, NET_IP_ALIGN);
                unmap_array[unmap_prod].skb = skb;
-                dma_addr = pci_map_single(bnad->pcidev, skb->data,
+                dma_addr = dma_map_single(&bnad->pcidev->dev, skb->data,
-                        rcb->rxq->buffer_size, PCI_DMA_FROMDEVICE);
+                                          rcb->rxq->buffer_size,
-                pci_unmap_addr_set(&unmap_array[unmap_prod], dma_addr,
+                                          DMA_FROM_DEVICE);
+                dma_unmap_addr_set(&unmap_array[unmap_prod], dma_addr,
                                   dma_addr);
                BNA_SET_DMA_ADDR(dma_addr, &rxent->host_addr);
                BNA_QE_INDX_ADD(unmap_prod, 1, unmap_q->q_depth);
@@ -434,8 +438,9 @@ bnad_poll_cq(struct bnad *bnad, struct bna_ccb *ccb, int budget)
        struct bna_rcb *rcb = NULL;
        unsigned int wi_range, packets = 0, wis = 0;
        struct bnad_unmap_q *unmap_q;
+        struct bnad_skb_unmap *unmap_array;
        struct sk_buff *skb;
-        u32 flags;
+        u32 flags, unmap_cons;
        u32 qid0 = ccb->rcb[0]->rxq->rxq_id;
        struct bna_pkt_rate *pkt_rt = &ccb->pkt_rate;
@@ -456,17 +461,17 @@ bnad_poll_cq(struct bnad *bnad, struct bna_ccb *ccb, int budget)
                        rcb = ccb->rcb[1];
                unmap_q = rcb->unmap_q;
+                unmap_array = unmap_q->unmap_array;
+                unmap_cons = unmap_q->consumer_index;
-                skb = unmap_q->unmap_array[unmap_q->consumer_index].skb;
+                skb = unmap_array[unmap_cons].skb;
                BUG_ON(!(skb));
-                unmap_q->unmap_array[unmap_q->consumer_index].skb = NULL;
+                unmap_array[unmap_cons].skb = NULL;
-                pci_unmap_single(bnad->pcidev,
+                dma_unmap_single(&bnad->pcidev->dev,
-                                 pci_unmap_addr(&unmap_q->
+                                 dma_unmap_addr(&unmap_array[unmap_cons],
-                                                unmap_array[unmap_q->
-                                                            consumer_index],
                                                dma_addr),
-                                                rcb->rxq->buffer_size,
+                                 rcb->rxq->buffer_size,
-                                                PCI_DMA_FROMDEVICE);
+                                 DMA_FROM_DEVICE);
                BNA_QE_INDX_ADD(unmap_q->consumer_index, 1, unmap_q->q_depth);
                /* Should be more efficient ? Performance ? */
@@ -1015,9 +1020,9 @@ bnad_mem_free(struct bnad *bnad,
                        if (mem_info->mem_type == BNA_MEM_T_DMA) {
                                BNA_GET_DMA_ADDR(&(mem_info->mdl[i].dma),
                                                dma_pa);
-                                pci_free_consistent(bnad->pcidev,
+                                dma_free_coherent(&bnad->pcidev->dev,
-                                                mem_info->mdl[i].len,
+                                                  mem_info->mdl[i].len,
-                                                mem_info->mdl[i].kva, dma_pa);
+                                                  mem_info->mdl[i].kva, dma_pa);
                        } else
                                kfree(mem_info->mdl[i].kva);
                }
@@ -1047,8 +1052,9 @@ bnad_mem_alloc(struct bnad *bnad,
                for (i = 0; i < mem_info->num; i++) {
                        mem_info->mdl[i].len = mem_info->len;
                        mem_info->mdl[i].kva =
-                                pci_alloc_consistent(bnad->pcidev,
+                                dma_alloc_coherent(&bnad->pcidev->dev,
-                                                mem_info->len, &dma_pa);
+                                                mem_info->len, &dma_pa,
+                                                GFP_KERNEL);
                        if (mem_info->mdl[i].kva == NULL)
                                goto err_return;
@@ -2600,9 +2606,9 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
        unmap_q->unmap_array[unmap_prod].skb = skb;
        BUG_ON(!(skb_headlen(skb) <= BFI_TX_MAX_DATA_PER_VECTOR));
        txqent->vector[vect_id].length = htons(skb_headlen(skb));
-        dma_addr = pci_map_single(bnad->pcidev, skb->data, skb_headlen(skb),
+        dma_addr = dma_map_single(&bnad->pcidev->dev, skb->data,
-                PCI_DMA_TODEVICE);
+                                  skb_headlen(skb), DMA_TO_DEVICE);
-        pci_unmap_addr_set(&unmap_q->unmap_array[unmap_prod], dma_addr,
+        dma_unmap_addr_set(&unmap_q->unmap_array[unmap_prod], dma_addr,
                           dma_addr);
        BNA_SET_DMA_ADDR(dma_addr, &txqent->vector[vect_id].host_addr);
@@ -2630,11 +2636,9 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                BUG_ON(!(size <= BFI_TX_MAX_DATA_PER_VECTOR));
                txqent->vector[vect_id].length = htons(size);
-                dma_addr =
+                dma_addr = dma_map_page(&bnad->pcidev->dev, frag->page,
-                        pci_map_page(bnad->pcidev, frag->page,
+                                        frag->page_offset, size, DMA_TO_DEVICE);
-                                     frag->page_offset, size,
+                dma_unmap_addr_set(&unmap_q->unmap_array[unmap_prod], dma_addr,
-                                     PCI_DMA_TODEVICE);
-                pci_unmap_addr_set(&unmap_q->unmap_array[unmap_prod], dma_addr,
                                   dma_addr);
                BNA_SET_DMA_ADDR(dma_addr, &txqent->vector[vect_id].host_addr);
                BNA_QE_INDX_ADD(unmap_prod, 1, unmap_q->q_depth);
@@ -3022,14 +3026,14 @@ bnad_pci_init(struct bnad *bnad,
        err = pci_request_regions(pdev, BNAD_NAME);
        if (err)
                goto disable_device;
-        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+        if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
-            !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
+            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
                *using_dac = 1;
        } else {
-                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+                err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
                if (err) {
-                        err = pci_set_consistent_dma_mask(pdev,
+                        err = dma_set_coherent_mask(&pdev->dev,
-                                                DMA_BIT_MASK(32));
+                                                    DMA_BIT_MASK(32));
                        if (err)
                                goto release_regions;
                }
diff --git a/drivers/net/bna/bnad.h b/drivers/net/bna/bnad.h
index 8b1d51557def..a89117fa4970 100644
--- a/drivers/net/bna/bnad.h
+++ b/drivers/net/bna/bnad.h
@@ -181,7 +181,7 @@ struct bnad_rx_info {
 /* Unmap queues for Tx / Rx cleanup */
 struct bnad_skb_unmap {
        struct sk_buff          *skb;
-        DECLARE_PCI_UNMAP_ADDR(dma_addr)
+        DEFINE_DMA_UNMAP_ADDR(dma_addr);
 };
 struct bnad_unmap_q {
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index df99edf3464a..2a961b7f7e17 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -435,7 +435,8 @@ bnx2_cnic_stop(struct bnx2 *bp)
        struct cnic_ctl_info info;
        mutex_lock(&bp->cnic_lock);
-        c_ops = bp->cnic_ops;
+        c_ops = rcu_dereference_protected(bp->cnic_ops,
+                                          lockdep_is_held(&bp->cnic_lock));
        if (c_ops) {
                info.cmd = CNIC_CTL_STOP_CMD;
                c_ops->cnic_ctl(bp->cnic_data, &info);
@@ -450,7 +451,8 @@ bnx2_cnic_start(struct bnx2 *bp)
        struct cnic_ctl_info info;
        mutex_lock(&bp->cnic_lock);
-        c_ops = bp->cnic_ops;
+        c_ops = rcu_dereference_protected(bp->cnic_ops,
+                                          lockdep_is_held(&bp->cnic_lock));
        if (c_ops) {
                if (!(bp->flags & BNX2_FLAG_USING_MSIX)) {
                        struct bnx2_napi *bnapi = &bp->bnx2_napi[0];
@@ -7553,6 +7555,10 @@ bnx2_set_flags(struct net_device *dev, u32 data)
            !(data & ETH_FLAG_RXVLAN))
                return -EINVAL;
+        /* TSO with VLAN tag won't work with current firmware */
+        if (!(data & ETH_FLAG_TXVLAN))
+                return -EINVAL;
        rc = ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH | ETH_FLAG_RXVLAN |
                                  ETH_FLAG_TXVLAN);
        if (rc)
@@ -7962,11 +7968,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
                /* AER (Advanced Error Reporting) hooks */
                err = pci_enable_pcie_error_reporting(pdev);
-                if (err) {
+                if (!err)
-                        dev_err(&pdev->dev, "pci_enable_pcie_error_reporting "
+                        bp->flags |= BNX2_FLAG_AER_ENABLED;
-                                            "failed 0x%x\n", err);
-                        /* non-fatal, continue */
-                }
        } else {
                bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);
@@ -8229,8 +8232,10 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
        return 0;
 err_out_unmap:
-        if (bp->flags & BNX2_FLAG_PCIE)
+        if (bp->flags & BNX2_FLAG_AER_ENABLED) {
                pci_disable_pcie_error_reporting(pdev);
+                bp->flags &= ~BNX2_FLAG_AER_ENABLED;
+        }
        if (bp->regview) {
                iounmap(bp->regview);
@@ -8312,7 +8317,7 @@ static const struct net_device_ops bnx2_netdev_ops = {
 #endif
 };
-static void inline vlan_features_add(struct net_device *dev, unsigned long flags)
+static void inline vlan_features_add(struct net_device *dev, u32 flags)
 {
        dev->vlan_features |= flags;
 }
@@ -8418,8 +8423,10 @@ bnx2_remove_one(struct pci_dev *pdev)
        kfree(bp->temp_stats_blk);
-        if (bp->flags & BNX2_FLAG_PCIE)
+        if (bp->flags & BNX2_FLAG_AER_ENABLED) {
                pci_disable_pcie_error_reporting(pdev);
+                bp->flags &= ~BNX2_FLAG_AER_ENABLED;
+        }
        free_netdev(dev);
@@ -8535,7 +8542,7 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)
        }
        rtnl_unlock();
-        if (!(bp->flags & BNX2_FLAG_PCIE))
+        if (!(bp->flags & BNX2_FLAG_AER_ENABLED))
                return result;
        err = pci_cleanup_aer_uncorrect_error_status(pdev);
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 5488a2e82fe9..7a5e88f831f6 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6207,6 +6207,8 @@ struct l2_fhdr {
 #define BNX2_CP_SCRATCH                                 0x001a0000
+#define BNX2_FW_MAX_ISCSI_CONN                           0x001a0080
 /*
 *  mcp_reg definition
@@ -6741,6 +6743,7 @@ struct bnx2 {
 #define BNX2_FLAG_JUMBO_BROKEN          0x00000800
 #define BNX2_FLAG_CAN_KEEP_VLAN         0x00001000
 #define BNX2_FLAG_BROKEN_STATS          0x00002000
+#define BNX2_FLAG_AER_ENABLED           0x00004000
        struct bnx2_napi        bnx2_napi[BNX2_MAX_MSIX_VEC];
@@ -6758,7 +6761,7 @@ struct bnx2 {
        u32             tx_wake_thresh;
 #ifdef BCM_CNIC
-        struct cnic_ops         *cnic_ops;
+        struct cnic_ops __rcu   *cnic_ops;
        void                    *cnic_data;
 #endif
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index a6cd335c9436..c0dd30d870ae 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -22,8 +22,8 @@
 * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
-#define DRV_MODULE_VERSION      "1.62.00-3"
+#define DRV_MODULE_VERSION      "1.62.11-0"
-#define DRV_MODULE_RELDATE      "2010/12/21"
+#define DRV_MODULE_RELDATE      "2011/01/31"
 #define BNX2X_BC_VER            0x040200
 #define BNX2X_MULTI_QUEUE
@@ -129,6 +129,7 @@ void bnx2x_panic_dump(struct bnx2x *bp);
 #endif
 #define bnx2x_mc_addr(ha)      ((ha)->addr)
+#define bnx2x_uc_addr(ha)      ((ha)->addr)
 #define U64_LO(x)                       (u32)(((u64)(x)) & 0xffffffff)
 #define U64_HI(x)                       (u32)(((u64)(x)) >> 32)
@@ -341,6 +342,8 @@ struct bnx2x_fastpath {
        /* chip independed shortcut into rx_prods_offset memory */
        u32                     ustorm_rx_prods_offset;
+        u32                     rx_buf_size;
        dma_addr_t              status_blk_mapping;
        struct sw_tx_bd         *tx_buf_ring;
@@ -428,6 +431,10 @@ struct bnx2x_fastpath {
 };
 #define bnx2x_fp(bp, nr, var)           (bp->fp[nr].var)
+/* Use 2500 as a mini-jumbo MTU for FCoE */
+#define BNX2X_FCOE_MINI_JUMBO_MTU       2500
 #ifdef BCM_CNIC
 /* FCoE L2 `fastpath' is right after the eth entries */
 #define FCOE_IDX                        BNX2X_NUM_ETH_QUEUES(bp)
@@ -810,6 +817,7 @@ struct bnx2x_slowpath {
        struct eth_stats_query          fw_stats;
        struct mac_configuration_cmd    mac_config;
        struct mac_configuration_cmd    mcast_config;
+        struct mac_configuration_cmd    uc_mac_config;
        struct client_init_ramrod_data  client_init_data;
        /* used by dmae command executer */
@@ -911,7 +919,6 @@ struct bnx2x {
        int                     tx_ring_size;
        u32                     rx_csum;
-        u32                     rx_buf_size;
 /* L2 header size + 2*VLANs (8 bytes) + LLC SNAP (8 bytes) */
 #define ETH_OVREHEAD            (ETH_HLEN + 8 + 8)
 #define ETH_MIN_PACKET_SIZE             60
@@ -939,7 +946,7 @@ struct bnx2x {
        struct eth_spe          *spq_prod_bd;
        struct eth_spe          *spq_last_bd;
        __le16                  *dsb_sp_prod;
-        atomic_t                spq_left; /* serialize spq */
+        atomic_t                cq_spq_left; /* ETH_XXX ramrods credit */
        /* used to synchronize spq accesses */
        spinlock_t              spq_lock;
@@ -949,6 +956,7 @@ struct bnx2x {
        u16                     eq_prod;
        u16                     eq_cons;
        __le16                  *eq_cons_sb;
+        atomic_t                eq_spq_left; /* COMMON_XXX ramrods credit */
        /* Flags for marking that there is a STAT_QUERY or
           SET_MAC ramrod pending */
@@ -976,8 +984,12 @@ struct bnx2x {
 #define MF_FUNC_DIS                     0x1000
 #define FCOE_MACS_SET                   0x2000
 #define NO_FCOE_FLAG                    0x4000
+#define NO_ISCSI_OOO_FLAG               0x8000
+#define NO_ISCSI_FLAG                   0x10000
 #define NO_FCOE(bp)             ((bp)->flags & NO_FCOE_FLAG)
+#define NO_ISCSI(bp)            ((bp)->flags & NO_ISCSI_FLAG)
+#define NO_ISCSI_OOO(bp)        ((bp)->flags & NO_ISCSI_OOO_FLAG)
        int                     pf_num; /* absolute PF number */
        int                     pfid;   /* per-path PF number */
@@ -1064,6 +1076,7 @@ struct bnx2x {
        int                     num_queues;
        int                     disable_tpa;
        int                     int_mode;
+        u32                     *rx_indir_table;
        struct tstorm_eth_mac_filter_config     mac_filters;
 #define BNX2X_ACCEPT_NONE               0x0000
@@ -1110,7 +1123,7 @@ struct bnx2x {
 #define BNX2X_CNIC_FLAG_MAC_SET         1
        void                    *t2;
        dma_addr_t              t2_mapping;
-        struct cnic_ops         *cnic_ops;
+        struct cnic_ops __rcu   *cnic_ops;
        void                    *cnic_data;
        u32                     cnic_tag;
        struct cnic_eth_dev     cnic_eth_dev;
@@ -1125,13 +1138,12 @@ struct bnx2x {
        u16                     cnic_kwq_pending;
        u16                     cnic_spq_pending;
        struct mutex            cnic_mutex;
-        u8                      iscsi_mac[ETH_ALEN];
        u8                      fip_mac[ETH_ALEN];
 #endif
        int                     dmae_ready;
        /* used to synchronize dmae accesses */
-        struct mutex            dmae_mutex;
+        spinlock_t              dmae_lock;
        /* used to protect the FW mail box */
        struct mutex            fw_mb_mutex;
@@ -1447,6 +1459,12 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command, u32 param);
 void bnx2x_calc_fc_adv(struct bnx2x *bp);
 int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
                  u32 data_hi, u32 data_lo, int common);
+/* Clears multicast and unicast list configuration in the chip. */
+void bnx2x_invalidate_e1_mc_list(struct bnx2x *bp);
+void bnx2x_invalidate_e1h_mc_list(struct bnx2x *bp);
+void bnx2x_invalidate_uc_list(struct bnx2x *bp);
 void bnx2x_update_coalesce(struct bnx2x *bp);
 int bnx2x_get_link_cfg_idx(struct bnx2x *bp);
@@ -1782,5 +1800,6 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
 BNX2X_EXTERN int load_count[2][3]; /* per path: 0-common, 1-port0, 2-port1 */
 extern void bnx2x_set_ethtool_ops(struct net_device *netdev);
+void bnx2x_push_indir_table(struct bnx2x *bp);
 #endif /* bnx2x.h */
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index 710ce5d04c53..6fac8e183c59 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -232,7 +232,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
        /* move empty skb from pool to prod and map it */
        prod_rx_buf->skb = fp->tpa_pool[queue].skb;
        mapping = dma_map_single(&bp->pdev->dev, fp->tpa_pool[queue].skb->data,
-                                 bp->rx_buf_size, DMA_FROM_DEVICE);
+                                 fp->rx_buf_size, DMA_FROM_DEVICE);
        dma_unmap_addr_set(prod_rx_buf, mapping, mapping);
        /* move partial skb from cons to pool (don't unmap yet) */
@@ -333,13 +333,13 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
        struct sw_rx_bd *rx_buf = &fp->tpa_pool[queue];
        struct sk_buff *skb = rx_buf->skb;
        /* alloc new skb */
-        struct sk_buff *new_skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+        struct sk_buff *new_skb = netdev_alloc_skb(bp->dev, fp->rx_buf_size);
        /* Unmap skb in the pool anyway, as we are going to change
           pool entry status to BNX2X_TPA_STOP even if new skb allocation
           fails. */
        dma_unmap_single(&bp->pdev->dev, dma_unmap_addr(rx_buf, mapping),
-                         bp->rx_buf_size, DMA_FROM_DEVICE);
+                         fp->rx_buf_size, DMA_FROM_DEVICE);
        if (likely(new_skb)) {
                /* fix ip xsum and give it to the stack */
@@ -349,10 +349,10 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                prefetch(((char *)(skb)) + L1_CACHE_BYTES);
 #ifdef BNX2X_STOP_ON_ERROR
-                if (pad + len > bp->rx_buf_size) {
+                if (pad + len > fp->rx_buf_size) {
                        BNX2X_ERR("skb_put is about to fail...  "
                                  "pad %d  len %d  rx_buf_size %d\n",
-                                  pad, len, bp->rx_buf_size);
+                                  pad, len, fp->rx_buf_size);
                        bnx2x_panic();
                        return;
                }
@@ -582,7 +582,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                        if (likely(bnx2x_alloc_rx_skb(bp, fp, bd_prod) == 0)) {
                                dma_unmap_single(&bp->pdev->dev,
                                        dma_unmap_addr(rx_buf, mapping),
-                                                 bp->rx_buf_size,
+                                                 fp->rx_buf_size,
                                                 DMA_FROM_DEVICE);
                                skb_reserve(skb, pad);
                                skb_put(skb, len);
@@ -821,19 +821,16 @@ void bnx2x_init_rx_rings(struct bnx2x *bp)
        u16 ring_prod;
        int i, j;
-        bp->rx_buf_size = bp->dev->mtu + ETH_OVREHEAD + BNX2X_RX_ALIGN +
-                IP_HEADER_ALIGNMENT_PADDING;
-        DP(NETIF_MSG_IFUP,
-           "mtu %d  rx_buf_size %d\n", bp->dev->mtu, bp->rx_buf_size);
        for_each_rx_queue(bp, j) {
                struct bnx2x_fastpath *fp = &bp->fp[j];
+                DP(NETIF_MSG_IFUP,
+                   "mtu %d  rx_buf_size %d\n", bp->dev->mtu, fp->rx_buf_size);
                if (!fp->disable_tpa) {
                        for (i = 0; i < max_agg_queues; i++) {
                                fp->tpa_pool[i].skb =
-                                   netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+                                   netdev_alloc_skb(bp->dev, fp->rx_buf_size);
                                if (!fp->tpa_pool[i].skb) {
                                        BNX2X_ERR("Failed to allocate TPA "
                                                  "skb pool for queue[%d] - "
@@ -941,7 +938,7 @@ static void bnx2x_free_rx_skbs(struct bnx2x *bp)
                        dma_unmap_single(&bp->pdev->dev,
                                         dma_unmap_addr(rx_buf, mapping),
-                                         bp->rx_buf_size, DMA_FROM_DEVICE);
+                                         fp->rx_buf_size, DMA_FROM_DEVICE);
                        rx_buf->skb = NULL;
                        dev_kfree_skb(skb);
@@ -1249,6 +1246,31 @@ static inline int bnx2x_set_real_num_queues(struct bnx2x *bp)
        return rc;
 }
+static inline void bnx2x_set_rx_buf_size(struct bnx2x *bp)
+{
+        int i;
+        for_each_queue(bp, i) {
+                struct bnx2x_fastpath *fp = &bp->fp[i];
+                /* Always use a mini-jumbo MTU for the FCoE L2 ring */
+                if (IS_FCOE_IDX(i))
+                        /*
+                         * Although there are no IP frames expected to arrive to
+                         * this ring we still want to add an
+                         * IP_HEADER_ALIGNMENT_PADDING to prevent a buffer
+                         * overrun attack.
+                         */
+                        fp->rx_buf_size =
+                                BNX2X_FCOE_MINI_JUMBO_MTU + ETH_OVREHEAD +
+                                BNX2X_RX_ALIGN + IP_HEADER_ALIGNMENT_PADDING;
+                else
+                        fp->rx_buf_size =
+                                bp->dev->mtu + ETH_OVREHEAD + BNX2X_RX_ALIGN +
+                                IP_HEADER_ALIGNMENT_PADDING;
+        }
+}
 /* must be called with rtnl_lock */
 int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 {
@@ -1272,6 +1294,9 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
        /* must be called before memory allocation and HW init */
        bnx2x_ilt_set_info(bp);
+        /* Set the receive queues buffer size */
+        bnx2x_set_rx_buf_size(bp);
        if (bnx2x_alloc_mem(bp))
                return -ENOMEM;
@@ -1427,28 +1452,35 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
        bnx2x_set_eth_mac(bp, 1);
+        /* Clear MC configuration */
+        if (CHIP_IS_E1(bp))
+                bnx2x_invalidate_e1_mc_list(bp);
+        else
+                bnx2x_invalidate_e1h_mc_list(bp);
+        /* Clear UC lists configuration */
+        bnx2x_invalidate_uc_list(bp);
        if (bp->port.pmf)
                bnx2x_initial_phy_init(bp, load_mode);
+        /* Initialize Rx filtering */
+        bnx2x_set_rx_mode(bp->dev);
        /* Start fast path */
        switch (load_mode) {
        case LOAD_NORMAL:
                /* Tx queue should be only reenabled */
                netif_tx_wake_all_queues(bp->dev);
                /* Initialize the receive filter. */
-                bnx2x_set_rx_mode(bp->dev);
                break;
        case LOAD_OPEN:
                netif_tx_start_all_queues(bp->dev);
                smp_mb__after_clear_bit();
-                /* Initialize the receive filter. */
-                bnx2x_set_rx_mode(bp->dev);
                break;
        case LOAD_DIAG:
-                /* Initialize the receive filter. */
-                bnx2x_set_rx_mode(bp->dev);
                bp->state = BNX2X_STATE_DIAG;
                break;
diff --git a/drivers/net/bnx2x/bnx2x_cmn.h b/drivers/net/bnx2x/bnx2x_cmn.h
index 03eb4d68e6bb..f062d5d20fa9 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/bnx2x/bnx2x_cmn.h
@@ -822,11 +822,11 @@ static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,
        struct eth_rx_bd *rx_bd = &fp->rx_desc_ring[index];
        dma_addr_t mapping;
-        skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+        skb = netdev_alloc_skb(bp->dev, fp->rx_buf_size);
        if (unlikely(skb == NULL))
                return -ENOMEM;
-        mapping = dma_map_single(&bp->pdev->dev, skb->data, bp->rx_buf_size,
+        mapping = dma_map_single(&bp->pdev->dev, skb->data, fp->rx_buf_size,
                                 DMA_FROM_DEVICE);
        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
                dev_kfree_skb(skb);
@@ -892,7 +892,7 @@ static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,
                if (fp->tpa_state[i] == BNX2X_TPA_START)
                        dma_unmap_single(&bp->pdev->dev,
                                         dma_unmap_addr(rx_buf, mapping),
-                                         bp->rx_buf_size, DMA_FROM_DEVICE);
+                                         fp->rx_buf_size, DMA_FROM_DEVICE);
                dev_kfree_skb(skb);
                rx_buf->skb = NULL;
diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
index 5b44a8b48509..8d19d127f796 100644
--- a/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -1618,7 +1618,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
        /* prepare the loopback packet */
        pkt_size = (((bp->dev->mtu < ETH_MAX_PACKET_SIZE) ?
                     bp->dev->mtu : ETH_MAX_PACKET_SIZE) + ETH_HLEN);
-        skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+        skb = netdev_alloc_skb(bp->dev, fp_rx->rx_buf_size);
        if (!skb) {
                rc = -ENOMEM;
                goto test_loopback_exit;
@@ -2134,6 +2134,59 @@ static int bnx2x_phys_id(struct net_device *dev, u32 data)
        return 0;
 }
+static int bnx2x_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
+                           void *rules __always_unused)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        switch (info->cmd) {
+        case ETHTOOL_GRXRINGS:
+                info->data = BNX2X_NUM_ETH_QUEUES(bp);
+                return 0;
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+static int bnx2x_get_rxfh_indir(struct net_device *dev,
+                                struct ethtool_rxfh_indir *indir)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        size_t copy_size =
+                min_t(size_t, indir->size, TSTORM_INDIRECTION_TABLE_SIZE);
+        if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
+                return -EOPNOTSUPP;
+        indir->size = TSTORM_INDIRECTION_TABLE_SIZE;
+        memcpy(indir->ring_index, bp->rx_indir_table,
+               copy_size * sizeof(bp->rx_indir_table[0]));
+        return 0;
+}
+static int bnx2x_set_rxfh_indir(struct net_device *dev,
+                                const struct ethtool_rxfh_indir *indir)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        size_t i;
+        if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
+                return -EOPNOTSUPP;
+        /* Validate size and indices */
+        if (indir->size != TSTORM_INDIRECTION_TABLE_SIZE)
+                return -EINVAL;
+        for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
+                if (indir->ring_index[i] >= BNX2X_NUM_ETH_QUEUES(bp))
+                        return -EINVAL;
+        memcpy(bp->rx_indir_table, indir->ring_index,
+               indir->size * sizeof(bp->rx_indir_table[0]));
+        bnx2x_push_indir_table(bp);
+        return 0;
+}
 static const struct ethtool_ops bnx2x_ethtool_ops = {
        .get_settings           = bnx2x_get_settings,
        .set_settings           = bnx2x_set_settings,
@@ -2170,6 +2223,9 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {
        .get_strings            = bnx2x_get_strings,
        .phys_id                = bnx2x_phys_id,
        .get_ethtool_stats      = bnx2x_get_ethtool_stats,
+        .get_rxnfc              = bnx2x_get_rxnfc,
+        .get_rxfh_indir         = bnx2x_get_rxfh_indir,
+        .set_rxfh_indir         = bnx2x_set_rxfh_indir,
 };
 void bnx2x_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/bnx2x/bnx2x_hsi.h
index 6238d4f63989..be503cc0a50b 100644
--- a/drivers/net/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/bnx2x/bnx2x_hsi.h
@@ -11,20 +11,27 @@
 #include "bnx2x_fw_defs.h"
+#define FW_ENCODE_32BIT_PATTERN         0x1e1e1e1e
 struct license_key {
        u32 reserved[6];
-#if defined(__BIG_ENDIAN)
+        u32 max_iscsi_conn;
-        u16 max_iscsi_init_conn;
+#define BNX2X_MAX_ISCSI_TRGT_CONN_MASK  0xFFFF
-        u16 max_iscsi_trgt_conn;
+#define BNX2X_MAX_ISCSI_TRGT_CONN_SHIFT 0
-#elif defined(__LITTLE_ENDIAN)
+#define BNX2X_MAX_ISCSI_INIT_CONN_MASK  0xFFFF0000
-        u16 max_iscsi_trgt_conn;
+#define BNX2X_MAX_ISCSI_INIT_CONN_SHIFT 16
-        u16 max_iscsi_init_conn;
-#endif
-        u32 reserved_a[6];
+        u32 reserved_a;
-};
+        u32 max_fcoe_conn;
+#define BNX2X_MAX_FCOE_TRGT_CONN_MASK   0xFFFF
+#define BNX2X_MAX_FCOE_TRGT_CONN_SHIFT  0
+#define BNX2X_MAX_FCOE_INIT_CONN_MASK   0xFFFF0000
+#define BNX2X_MAX_FCOE_INIT_CONN_SHIFT  16
+        u32 reserved_b[4];
+};
 #define PORT_0                          0
 #define PORT_1                          1
@@ -237,8 +244,26 @@ struct port_hw_cfg {			    /* port 0: 0x12c  port 1: 0x2bc */
 #define PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_SHIFT             16
-        u32 Reserved0[16];                                  /* 0x158 */
+        u32 Reserved0[3];                                   /* 0x158 */
+        /*      Controls the TX laser of the SFP+ module */
+        u32 sfp_ctrl;                                   /* 0x164 */
+#define PORT_HW_CFG_TX_LASER_MASK                             0x000000FF
+#define PORT_HW_CFG_TX_LASER_SHIFT                            0
+#define PORT_HW_CFG_TX_LASER_MDIO                             0x00000000
+#define PORT_HW_CFG_TX_LASER_GPIO0                            0x00000001
+#define PORT_HW_CFG_TX_LASER_GPIO1                            0x00000002
+#define PORT_HW_CFG_TX_LASER_GPIO2                            0x00000003
+#define PORT_HW_CFG_TX_LASER_GPIO3                            0x00000004
+    /*  Controls the fault module LED of the SFP+ */
+#define PORT_HW_CFG_FAULT_MODULE_LED_MASK                     0x0000FF00
+#define PORT_HW_CFG_FAULT_MODULE_LED_SHIFT                    8
+#define PORT_HW_CFG_FAULT_MODULE_LED_GPIO0                    0x00000000
+#define PORT_HW_CFG_FAULT_MODULE_LED_GPIO1                    0x00000100
+#define PORT_HW_CFG_FAULT_MODULE_LED_GPIO2                    0x00000200
+#define PORT_HW_CFG_FAULT_MODULE_LED_GPIO3                    0x00000300
+#define PORT_HW_CFG_FAULT_MODULE_LED_DISABLED                 0x00000400
+        u32 Reserved01[12];                                 /* 0x158 */
        /*  for external PHY, or forced mode or during AN */
        u16 xgxs_config_rx[4];                              /* 0x198 */
@@ -246,12 +271,78 @@ struct port_hw_cfg {			    /* port 0: 0x12c  port 1: 0x2bc */
        u32 Reserved1[56];                                  /* 0x1A8 */
        u32 default_cfg;                                    /* 0x288 */
+#define PORT_HW_CFG_GPIO0_CONFIG_MASK                         0x00000003
+#define PORT_HW_CFG_GPIO0_CONFIG_SHIFT                        0
+#define PORT_HW_CFG_GPIO0_CONFIG_NA                           0x00000000
+#define PORT_HW_CFG_GPIO0_CONFIG_LOW                          0x00000001
+#define PORT_HW_CFG_GPIO0_CONFIG_HIGH                         0x00000002
+#define PORT_HW_CFG_GPIO0_CONFIG_INPUT                        0x00000003
+#define PORT_HW_CFG_GPIO1_CONFIG_MASK                         0x0000000C
+#define PORT_HW_CFG_GPIO1_CONFIG_SHIFT                        2
+#define PORT_HW_CFG_GPIO1_CONFIG_NA                           0x00000000
+#define PORT_HW_CFG_GPIO1_CONFIG_LOW                          0x00000004
+#define PORT_HW_CFG_GPIO1_CONFIG_HIGH                         0x00000008
+#define PORT_HW_CFG_GPIO1_CONFIG_INPUT                        0x0000000c
+#define PORT_HW_CFG_GPIO2_CONFIG_MASK                         0x00000030
+#define PORT_HW_CFG_GPIO2_CONFIG_SHIFT                        4
+#define PORT_HW_CFG_GPIO2_CONFIG_NA                           0x00000000
+#define PORT_HW_CFG_GPIO2_CONFIG_LOW                          0x00000010
+#define PORT_HW_CFG_GPIO2_CONFIG_HIGH                         0x00000020
+#define PORT_HW_CFG_GPIO2_CONFIG_INPUT                        0x00000030
+#define PORT_HW_CFG_GPIO3_CONFIG_MASK                         0x000000C0
+#define PORT_HW_CFG_GPIO3_CONFIG_SHIFT                        6
+#define PORT_HW_CFG_GPIO3_CONFIG_NA                           0x00000000
+#define PORT_HW_CFG_GPIO3_CONFIG_LOW                          0x00000040
+#define PORT_HW_CFG_GPIO3_CONFIG_HIGH                         0x00000080
+#define PORT_HW_CFG_GPIO3_CONFIG_INPUT                        0x000000c0
+        /*
+         * When KR link is required to be set to force which is not
+         * KR-compliant, this parameter determine what is the trigger for it.
+         * When GPIO is selected, low input will force the speed. Currently
+         * default speed is 1G. In the future, it may be widen to select the
+         * forced speed in with another parameter. Note when force-1G is
+         * enabled, it override option 56: Link Speed option.
+         */
+#define PORT_HW_CFG_FORCE_KR_ENABLER_MASK                     0x00000F00
+#define PORT_HW_CFG_FORCE_KR_ENABLER_SHIFT                    8
+#define PORT_HW_CFG_FORCE_KR_ENABLER_NOT_FORCED               0x00000000
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO0_P0                 0x00000100
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO1_P0                 0x00000200
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO2_P0                 0x00000300
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO3_P0                 0x00000400
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO0_P1                 0x00000500
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO1_P1                 0x00000600
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO2_P1                 0x00000700
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO3_P1                 0x00000800
+#define PORT_HW_CFG_FORCE_KR_ENABLER_FORCED                   0x00000900
+    /*  Enable to determine with which GPIO to reset the external phy */
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_MASK                     0x000F0000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_SHIFT                    16
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_PHY_TYPE                 0x00000000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO0_P0                 0x00010000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO1_P0                 0x00020000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO2_P0                 0x00030000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO3_P0                 0x00040000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO0_P1                 0x00050000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO1_P1                 0x00060000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO2_P1                 0x00070000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO3_P1                 0x00080000
        /*  Enable BAM on KR */
 #define PORT_HW_CFG_ENABLE_BAM_ON_KR_MASK                     0x00100000
 #define PORT_HW_CFG_ENABLE_BAM_ON_KR_SHIFT                    20
 #define PORT_HW_CFG_ENABLE_BAM_ON_KR_DISABLED                 0x00000000
 #define PORT_HW_CFG_ENABLE_BAM_ON_KR_ENABLED                  0x00100000
+        /*  Enable Common Mode Sense */
+#define PORT_HW_CFG_ENABLE_CMS_MASK                           0x00200000
+#define PORT_HW_CFG_ENABLE_CMS_SHIFT                          21
+#define PORT_HW_CFG_ENABLE_CMS_DISABLED                       0x00000000
+#define PORT_HW_CFG_ENABLE_CMS_ENABLED                        0x00200000
        u32 speed_capability_mask2;                         /* 0x28C */
 #define PORT_HW_CFG_SPEED_CAPABILITY2_D3_MASK                 0x0000FFFF
 #define PORT_HW_CFG_SPEED_CAPABILITY2_D3_SHIFT                0
@@ -352,6 +443,10 @@ struct port_hw_cfg {			    /* port 0: 0x12c  port 1: 0x2bc */
 #define PORT_HW_CFG_LANE_SWAP_CFG_31203120          0x0000d8d8
        /* forced only */
 #define PORT_HW_CFG_LANE_SWAP_CFG_32103210          0x0000e4e4
+    /*  Indicate whether to swap the external phy polarity */
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_MASK             0x00010000
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_DISABLED      0x00000000
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED       0x00010000
        u32 external_phy_config;
 #define PORT_HW_CFG_SERDES_EXT_PHY_TYPE_MASK        0xff000000
@@ -377,6 +472,7 @@ struct port_hw_cfg {			    /* port 0: 0x12c  port 1: 0x2bc */
 #define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727       0x00000900
 #define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727_NOC   0x00000a00
 #define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823      0x00000b00
+#define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833      0x00000d00
 #define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE       0x0000fd00
 #define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN      0x0000ff00
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index 43b0de24f391..f2f367d4e74d 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -1,4 +1,4 @@
-/* Copyright 2008-2009 Broadcom Corporation
+/* Copyright 2008-2011 Broadcom Corporation
 *
 * Unless you and Broadcom execute a separate written software license
 * agreement governing use of this software, this software is licensed to you
@@ -28,12 +28,13 @@
 /********************************************************/
 #define ETH_HLEN                        14
-#define ETH_OVREHEAD            (ETH_HLEN + 8 + 8)/* 16 for CRC + VLAN + LLC */
+/* L2 header size + 2*VLANs (8 bytes) + LLC SNAP (8 bytes) */
+#define ETH_OVREHEAD                    (ETH_HLEN + 8 + 8)
 #define ETH_MIN_PACKET_SIZE             60
 #define ETH_MAX_PACKET_SIZE             1500
 #define ETH_MAX_JUMBO_PACKET_SIZE       9600
 #define MDIO_ACCESS_TIMEOUT             1000
-#define BMAC_CONTROL_RX_ENABLE  2
+#define BMAC_CONTROL_RX_ENABLE          2
 /***********************************************************/
 /*                      Shortcut definitions               */
@@ -79,7 +80,7 @@
 #define AUTONEG_CL37            SHARED_HW_CFG_AN_ENABLE_CL37
 #define AUTONEG_CL73            SHARED_HW_CFG_AN_ENABLE_CL73
-#define AUTONEG_BAM             SHARED_HW_CFG_AN_ENABLE_BAM
+#define AUTONEG_BAM             SHARED_HW_CFG_AN_ENABLE_BAM
 #define AUTONEG_PARALLEL \
                                SHARED_HW_CFG_AN_ENABLE_PARALLEL_DETECTION
 #define AUTONEG_SGMII_FIBER_AUTODET \
@@ -112,10 +113,10 @@
 #define GP_STATUS_10G_KX4 \
                        MDIO_GP_STATUS_TOP_AN_STATUS1_ACTUAL_SPEED_10G_KX4
-#define LINK_10THD                      LINK_STATUS_SPEED_AND_DUPLEX_10THD
+#define LINK_10THD              LINK_STATUS_SPEED_AND_DUPLEX_10THD
-#define LINK_10TFD                      LINK_STATUS_SPEED_AND_DUPLEX_10TFD
+#define LINK_10TFD              LINK_STATUS_SPEED_AND_DUPLEX_10TFD
 #define LINK_100TXHD            LINK_STATUS_SPEED_AND_DUPLEX_100TXHD
-#define LINK_100T4                      LINK_STATUS_SPEED_AND_DUPLEX_100T4
+#define LINK_100T4              LINK_STATUS_SPEED_AND_DUPLEX_100T4
 #define LINK_100TXFD            LINK_STATUS_SPEED_AND_DUPLEX_100TXFD
 #define LINK_1000THD            LINK_STATUS_SPEED_AND_DUPLEX_1000THD
 #define LINK_1000TFD            LINK_STATUS_SPEED_AND_DUPLEX_1000TFD
@@ -123,18 +124,18 @@
 #define LINK_2500THD            LINK_STATUS_SPEED_AND_DUPLEX_2500THD
 #define LINK_2500TFD            LINK_STATUS_SPEED_AND_DUPLEX_2500TFD
 #define LINK_2500XFD            LINK_STATUS_SPEED_AND_DUPLEX_2500XFD
-#define LINK_10GTFD                     LINK_STATUS_SPEED_AND_DUPLEX_10GTFD
+#define LINK_10GTFD             LINK_STATUS_SPEED_AND_DUPLEX_10GTFD
-#define LINK_10GXFD                     LINK_STATUS_SPEED_AND_DUPLEX_10GXFD
+#define LINK_10GXFD             LINK_STATUS_SPEED_AND_DUPLEX_10GXFD
-#define LINK_12GTFD                     LINK_STATUS_SPEED_AND_DUPLEX_12GTFD
+#define LINK_12GTFD             LINK_STATUS_SPEED_AND_DUPLEX_12GTFD
-#define LINK_12GXFD                     LINK_STATUS_SPEED_AND_DUPLEX_12GXFD
+#define LINK_12GXFD             LINK_STATUS_SPEED_AND_DUPLEX_12GXFD
 #define LINK_12_5GTFD           LINK_STATUS_SPEED_AND_DUPLEX_12_5GTFD
 #define LINK_12_5GXFD           LINK_STATUS_SPEED_AND_DUPLEX_12_5GXFD
-#define LINK_13GTFD                     LINK_STATUS_SPEED_AND_DUPLEX_13GTFD
+#define LINK_13GTFD             LINK_STATUS_SPEED_AND_DUPLEX_13GTFD
-#define LINK_13GXFD                     LINK_STATUS_SPEED_AND_DUPLEX_13GXFD
+#define LINK_13GXFD             LINK_STATUS_SPEED_AND_DUPLEX_13GXFD
-#define LINK_15GTFD                     LINK_STATUS_SPEED_AND_DUPLEX_15GTFD
+#define LINK_15GTFD             LINK_STATUS_SPEED_AND_DUPLEX_15GTFD
-#define LINK_15GXFD                     LINK_STATUS_SPEED_AND_DUPLEX_15GXFD
+#define LINK_15GXFD             LINK_STATUS_SPEED_AND_DUPLEX_15GXFD
-#define LINK_16GTFD                     LINK_STATUS_SPEED_AND_DUPLEX_16GTFD
+#define LINK_16GTFD             LINK_STATUS_SPEED_AND_DUPLEX_16GTFD
-#define LINK_16GXFD                     LINK_STATUS_SPEED_AND_DUPLEX_16GXFD
+#define LINK_16GXFD             LINK_STATUS_SPEED_AND_DUPLEX_16GXFD
 #define PHY_XGXS_FLAG                   0x1
 #define PHY_SGMII_FLAG                  0x2
@@ -142,7 +143,7 @@
 /* */
 #define SFP_EEPROM_CON_TYPE_ADDR                0x2
-        #define SFP_EEPROM_CON_TYPE_VAL_LC              0x7
+        #define SFP_EEPROM_CON_TYPE_VAL_LC      0x7
        #define SFP_EEPROM_CON_TYPE_VAL_COPPER  0x21
@@ -153,15 +154,15 @@
 #define SFP_EEPROM_FC_TX_TECH_ADDR              0x8
        #define SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_PASSIVE 0x4
-        #define SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_ACTIVE      0x8
+        #define SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_ACTIVE  0x8
-#define SFP_EEPROM_OPTIONS_ADDR                 0x40
+#define SFP_EEPROM_OPTIONS_ADDR                 0x40
        #define SFP_EEPROM_OPTIONS_LINEAR_RX_OUT_MASK 0x1
-#define SFP_EEPROM_OPTIONS_SIZE                 2
+#define SFP_EEPROM_OPTIONS_SIZE                 2
-#define EDC_MODE_LINEAR                         0x0022
+#define EDC_MODE_LINEAR                         0x0022
-#define EDC_MODE_LIMITING                               0x0044
+#define EDC_MODE_LIMITING                               0x0044
-#define EDC_MODE_PASSIVE_DAC                    0x0055
+#define EDC_MODE_PASSIVE_DAC                    0x0055
 #define ETS_BW_LIMIT_CREDIT_UPPER_BOUND         (0x5000)
@@ -170,24 +171,18 @@
 /*                     INTERFACE                          */
 /**********************************************************/
-#define CL45_WR_OVER_CL22(_bp, _phy, _bank, _addr, _val) \
+#define CL22_WR_OVER_CL45(_bp, _phy, _bank, _addr, _val) \
        bnx2x_cl45_write(_bp, _phy, \
                (_phy)->def_md_devad, \
                (_bank + (_addr & 0xf)), \
                _val)
-#define CL45_RD_OVER_CL22(_bp, _phy, _bank, _addr, _val) \
+#define CL22_RD_OVER_CL45(_bp, _phy, _bank, _addr, _val) \
        bnx2x_cl45_read(_bp, _phy, \
                (_phy)->def_md_devad, \
                (_bank + (_addr & 0xf)), \
                _val)
-static u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
-                          u8 devad, u16 reg, u16 *ret_val);
-static u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
-                           u8 devad, u16 reg, u16 val);
 static u32 bnx2x_bits_en(struct bnx2x *bp, u32 reg, u32 bits)
 {
        u32 val = REG_RD(bp, reg);
@@ -216,7 +211,7 @@ void bnx2x_ets_disabled(struct link_params *params)
        DP(NETIF_MSG_LINK, "ETS disabled configuration\n");
-        /**
+        /*
         * mapping between entry  priority to client number (0,1,2 -debug and
         * management clients, 3 - COS0 client, 4 - COS client)(HIGHEST)
         * 3bits client num.
@@ -225,7 +220,7 @@ void bnx2x_ets_disabled(struct link_params *params)
         */
        REG_WR(bp, NIG_REG_P0_TX_ARB_PRIORITY_CLIENT, 0x4688);
-        /**
+        /*
         * Bitmap of 5bits length. Each bit specifies whether the entry behaves
         * as strict.  Bits 0,1,2 - debug and management entries, 3 -
         * COS0 entry, 4 - COS1 entry.
@@ -237,12 +232,12 @@ void bnx2x_ets_disabled(struct link_params *params)
        REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_STRICT, 0x7);
        /* defines which entries (clients) are subjected to WFQ arbitration */
        REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_SUBJECT2WFQ, 0);
-        /**
+        /*
-        * For strict priority entries defines the number of consecutive
+         * For strict priority entries defines the number of consecutive
-        * slots for the highest priority.
+         * slots for the highest priority.
-        */
+         */
        REG_WR(bp, NIG_REG_P0_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100);
-        /**
+        /*
         * mapping between the CREDIT_WEIGHT registers and actual client
         * numbers
         */
@@ -255,7 +250,7 @@ void bnx2x_ets_disabled(struct link_params *params)
        REG_WR(bp, PBF_REG_HIGH_PRIORITY_COS_NUM, 0);
        /* ETS mode disable */
        REG_WR(bp, PBF_REG_ETS_ENABLED, 0);
-        /**
+        /*
         * If ETS mode is enabled (there is no strict priority) defines a WFQ
         * weight for COS0/COS1.
         */
@@ -268,24 +263,24 @@ void bnx2x_ets_disabled(struct link_params *params)
        REG_WR(bp, PBF_REG_NUM_STRICT_ARB_SLOTS, 0);
 }
-void bnx2x_ets_bw_limit_common(const struct link_params *params)
+static void bnx2x_ets_bw_limit_common(const struct link_params *params)
 {
        /* ETS disabled configuration */
        struct bnx2x *bp = params->bp;
        DP(NETIF_MSG_LINK, "ETS enabled BW limit configuration\n");
-        /**
+        /*
-        * defines which entries (clients) are subjected to WFQ arbitration
+         * defines which entries (clients) are subjected to WFQ arbitration
-        * COS0 0x8
+         * COS0 0x8
-        * COS1 0x10
+         * COS1 0x10
-        */
+         */
        REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_SUBJECT2WFQ, 0x18);
-        /**
+        /*
-        * mapping between the ARB_CREDIT_WEIGHT registers and actual
+         * mapping between the ARB_CREDIT_WEIGHT registers and actual
-        * client numbers (WEIGHT_0 does not actually have to represent
+         * client numbers (WEIGHT_0 does not actually have to represent
-        * client 0)
+         * client 0)
-        *    PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
+         *    PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
-        *  cos1-001     cos0-000     dbg1-100     dbg0-011     MCP-010
+         *  cos1-001     cos0-000     dbg1-100     dbg0-011     MCP-010
-        */
+         */
        REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_CREDIT_MAP, 0x111A);
        REG_WR(bp, NIG_REG_P0_TX_ARB_CREDIT_UPPER_BOUND_0,
@@ -298,14 +293,14 @@ void bnx2x_ets_bw_limit_common(const struct link_params *params)
        /* Defines the number of consecutive slots for the strict priority */
        REG_WR(bp, PBF_REG_NUM_STRICT_ARB_SLOTS, 0);
-        /**
+        /*
-        * Bitmap of 5bits length. Each bit specifies whether the entry behaves
+         * Bitmap of 5bits length. Each bit specifies whether the entry behaves
-        * as strict.  Bits 0,1,2 - debug and management entries, 3 - COS0
+         * as strict.  Bits 0,1,2 - debug and management entries, 3 - COS0
-        * entry, 4 - COS1 entry.
+         * entry, 4 - COS1 entry.
-        * COS1 | COS0 | DEBUG21 | DEBUG0 | MGMT
+         * COS1 | COS0 | DEBUG21 | DEBUG0 | MGMT
-        * bit4   bit3     bit2     bit1    bit0
+         * bit4   bit3    bit2     bit1    bit0
-        * MCP and debug are strict
+         * MCP and debug are strict
-        */
+         */
        REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_STRICT, 0x7);
        /* Upper bound that COS0_WEIGHT can reach in the WFQ arbiter.*/
@@ -329,8 +324,7 @@ void bnx2x_ets_bw_limit(const struct link_params *params, const u32 cos0_bw,
        if ((0 == total_bw) ||
            (0 == cos0_bw) ||
            (0 == cos1_bw)) {
-                DP(NETIF_MSG_LINK,
+                DP(NETIF_MSG_LINK, "Total BW can't be zero\n");
-                   "bnx2x_ets_bw_limit: Total BW can't be zero\n");
                return;
        }
@@ -355,7 +349,7 @@ u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
        u32 val = 0;
        DP(NETIF_MSG_LINK, "ETS enabled strict configuration\n");
-        /**
+        /*
         * Bitmap of 5bits length. Each bit specifies whether the entry behaves
         * as strict.  Bits 0,1,2 - debug and management entries,
         * 3 - COS0 entry, 4 - COS1 entry.
@@ -364,7 +358,7 @@ u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
         * MCP and debug are strict
         */
        REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_STRICT, 0x1F);
-        /**
+        /*
         * For strict priority entries defines the number of consecutive slots
         * for the highest priority.
         */
@@ -377,14 +371,14 @@ u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
        /* Defines the number of consecutive slots for the strict priority */
        REG_WR(bp, PBF_REG_HIGH_PRIORITY_COS_NUM, strict_cos);
-        /**
+        /*
-        * mapping between entry  priority to client number (0,1,2 -debug and
+         * mapping between entry  priority to client number (0,1,2 -debug and
-        * management clients, 3 - COS0 client, 4 - COS client)(HIGHEST)
+         * management clients, 3 - COS0 client, 4 - COS client)(HIGHEST)
-        * 3bits client num.
+         * 3bits client num.
-        *   PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
+         *   PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
-        * dbg0-010     dbg1-001     cos1-100     cos0-011     MCP-000
+         * dbg0-010     dbg1-001     cos1-100     cos0-011     MCP-000
-        * dbg0-010     dbg1-001     cos0-011     cos1-100     MCP-000
+         * dbg0-010     dbg1-001     cos0-011     cos1-100     MCP-000
-        */
+         */
        val = (0 == strict_cos) ? 0x2318 : 0x22E0;
        REG_WR(bp, NIG_REG_P0_TX_ARB_PRIORITY_CLIENT, val);
@@ -471,7 +465,7 @@ void bnx2x_pfc_statistic(struct link_params *params, struct link_vars *vars,
 /*                      MAC/PBF section                           */
 /******************************************************************/
 static void bnx2x_emac_init(struct link_params *params,
-                           struct link_vars *vars)
+                            struct link_vars *vars)
 {
        /* reset and unreset the emac core */
        struct bnx2x *bp = params->bp;
@@ -481,10 +475,10 @@ static void bnx2x_emac_init(struct link_params *params,
        u16 timeout;
        REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-                   (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
+               (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
        udelay(5);
        REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-                   (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
+               (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
        /* init emac - use read-modify-write */
        /* self clear reset */
@@ -515,7 +509,7 @@ static void bnx2x_emac_init(struct link_params *params,
 }
 static u8 bnx2x_emac_enable(struct link_params *params,
-                          struct link_vars *vars, u8 lb)
+                            struct link_vars *vars, u8 lb)
 {
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
@@ -527,55 +521,33 @@ static u8 bnx2x_emac_enable(struct link_params *params,
        /* enable emac and not bmac */
        REG_WR(bp, NIG_REG_EGRESS_EMAC0_PORT + port*4, 1);
-        /* for paladium */
-        if (CHIP_REV_IS_EMUL(bp)) {
-                /* Use lane 1 (of lanes 0-3) */
-                REG_WR(bp, NIG_REG_XGXS_LANE_SEL_P0 + port*4, 1);
-                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL +
-                            port*4, 1);
-        }
-        /* for fpga */
-        else
-        if (CHIP_REV_IS_FPGA(bp)) {
-                /* Use lane 1 (of lanes 0-3) */
-                DP(NETIF_MSG_LINK, "bnx2x_emac_enable: Setting FPGA\n");
-                REG_WR(bp, NIG_REG_XGXS_LANE_SEL_P0 + port*4, 1);
-                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL + port*4,
-                            0);
-        } else
        /* ASIC */
        if (vars->phy_flags & PHY_XGXS_FLAG) {
                u32 ser_lane = ((params->lane_config &
-                            PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
+                                 PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
-                            PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
+                                PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
                DP(NETIF_MSG_LINK, "XGXS\n");
                /* select the master lanes (out of 0-3) */
-                REG_WR(bp, NIG_REG_XGXS_LANE_SEL_P0 +
+                REG_WR(bp, NIG_REG_XGXS_LANE_SEL_P0 + port*4, ser_lane);
-                           port*4, ser_lane);
                /* select XGXS */
-                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL +
+                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL + port*4, 1);
-                           port*4, 1);
        } else { /* SerDes */
                DP(NETIF_MSG_LINK, "SerDes\n");
                /* select SerDes */
-                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL +
+                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL + port*4, 0);
-                           port*4, 0);
        }
        bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_RX_MODE,
-                    EMAC_RX_MODE_RESET);
+                      EMAC_RX_MODE_RESET);
        bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_TX_MODE,
-                    EMAC_TX_MODE_RESET);
+                      EMAC_TX_MODE_RESET);
        if (CHIP_REV_IS_SLOW(bp)) {
                /* config GMII mode */
                val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);
-                EMAC_WR(bp, EMAC_REG_EMAC_MODE,
+                EMAC_WR(bp, EMAC_REG_EMAC_MODE, (val | EMAC_MODE_PORT_GMII));
-                            (val | EMAC_MODE_PORT_GMII));
        } else { /* ASIC */
                /* pause enable/disable */
                bnx2x_bits_dis(bp, emac_base + EMAC_REG_EMAC_RX_MODE,
@@ -605,14 +577,14 @@ static u8 bnx2x_emac_enable(struct link_params *params,
        val = REG_RD(bp, emac_base + EMAC_REG_EMAC_RX_MODE);
        val |= EMAC_RX_MODE_KEEP_VLAN_TAG | EMAC_RX_MODE_PROMISCUOUS;
-        /**
+        /*
-        * Setting this bit causes MAC control frames (except for pause
+         * Setting this bit causes MAC control frames (except for pause
-        * frames) to be passed on for processing. This setting has no
+         * frames) to be passed on for processing. This setting has no
-        * affect on the operation of the pause frames. This bit effects
+         * affect on the operation of the pause frames. This bit effects
-        * all packets regardless of RX Parser packet sorting logic.
+         * all packets regardless of RX Parser packet sorting logic.
-        * Turn the PFC off to make sure we are in Xon state before
+         * Turn the PFC off to make sure we are in Xon state before
-        * enabling it.
+         * enabling it.
-        */
+         */
        EMAC_WR(bp, EMAC_REG_RX_PFC_MODE, 0);
        if (params->feature_config_flags & FEATURE_CONFIG_PFC_ENABLED) {
                DP(NETIF_MSG_LINK, "PFC is enabled\n");
@@ -666,16 +638,7 @@ static u8 bnx2x_emac_enable(struct link_params *params,
        REG_WR(bp, NIG_REG_EMAC0_PAUSE_OUT_EN + port*4, val);
        REG_WR(bp, NIG_REG_EGRESS_EMAC0_OUT_EN + port*4, 0x1);
-        if (CHIP_REV_IS_EMUL(bp)) {
+        REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x0);
-                /* take the BigMac out of reset */
-                REG_WR(bp,
-                           GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-                           (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
-                /* enable access for bmac registers */
-                REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x1);
-        } else
-                REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x0);
        vars->mac_type = MAC_TYPE_EMAC;
        return 0;
@@ -731,8 +694,7 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
                val |= (1<<5);
        wb_data[0] = val;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_CONTROL,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_CONTROL, wb_data, 2);
-                        wb_data, 2);
        udelay(30);
        /* Tx control */
@@ -768,12 +730,12 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_PFC_CONTROL, wb_data, 2);
-        /**
+        /*
-        * Set Time (based unit is 512 bit time) between automatic
+         * Set Time (based unit is 512 bit time) between automatic
-        * re-sending of PP packets amd enable automatic re-send of
+         * re-sending of PP packets amd enable automatic re-send of
-        * Per-Priroity Packet as long as pp_gen is asserted and
+         * Per-Priroity Packet as long as pp_gen is asserted and
-        * pp_disable is low.
+         * pp_disable is low.
-        */
+         */
        val = 0x8000;
        if (params->feature_config_flags & FEATURE_CONFIG_PFC_ENABLED)
                val |= (1<<16); /* enable automatic re-send */
@@ -781,7 +743,7 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
        wb_data[0] = val;
        wb_data[1] = 0;
        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_TX_PAUSE_CONTROL,
-                        wb_data, 2);
+                    wb_data, 2);
        /* mac control */
        val = 0x3; /* Enable RX and TX */
@@ -795,8 +757,7 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
        wb_data[0] = val;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_CONTROL,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_CONTROL, wb_data, 2);
-                        wb_data, 2);
 }
 static void bnx2x_update_pfc_brb(struct link_params *params,
@@ -825,17 +786,25 @@ static void bnx2x_update_pfc_brb(struct link_params *params,
                        full_xon_th =
                          PFC_BRB_MAC_FULL_XON_THRESHOLD_NON_PAUSEABLE;
                }
-        /* The number of free blocks below which the pause signal to class 0
+        /*
-           of MAC #n is asserted. n=0,1 */
+         * The number of free blocks below which the pause signal to class 0
+         * of MAC #n is asserted. n=0,1
+         */
        REG_WR(bp, BRB1_REG_PAUSE_0_XOFF_THRESHOLD_0 , pause_xoff_th);
-        /* The number of free blocks above which the pause signal to class 0
+        /*
-           of MAC #n is de-asserted. n=0,1 */
+         * The number of free blocks above which the pause signal to class 0
+         * of MAC #n is de-asserted. n=0,1
+         */
        REG_WR(bp, BRB1_REG_PAUSE_0_XON_THRESHOLD_0 , pause_xon_th);
-        /* The number of free blocks below which the full signal to class 0
+        /*
-           of MAC #n is asserted. n=0,1 */
+         * The number of free blocks below which the full signal to class 0
+         * of MAC #n is asserted. n=0,1
+         */
        REG_WR(bp, BRB1_REG_FULL_0_XOFF_THRESHOLD_0 , full_xoff_th);
-        /* The number of free blocks above which the full signal to class 0
+        /*
-           of MAC #n is de-asserted. n=0,1 */
+         * The number of free blocks above which the full signal to class 0
+         * of MAC #n is de-asserted. n=0,1
+         */
        REG_WR(bp, BRB1_REG_FULL_0_XON_THRESHOLD_0 , full_xon_th);
        if (set_pfc && pfc_params) {
@@ -859,25 +828,25 @@ static void bnx2x_update_pfc_brb(struct link_params *params,
                        full_xon_th =
                          PFC_BRB_MAC_FULL_XON_THRESHOLD_NON_PAUSEABLE;
                }
-                /**
+                /*
                 * The number of free blocks below which the pause signal to
                 * class 1 of MAC #n is asserted. n=0,1
-                 **/
+                 */
                REG_WR(bp, BRB1_REG_PAUSE_1_XOFF_THRESHOLD_0, pause_xoff_th);
-                /**
+                /*
                 * The number of free blocks above which the pause signal to
                 * class 1 of MAC #n is de-asserted. n=0,1
-                 **/
+                 */
                REG_WR(bp, BRB1_REG_PAUSE_1_XON_THRESHOLD_0, pause_xon_th);
-                /**
+                /*
                 * The number of free blocks below which the full signal to
                 * class 1 of MAC #n is asserted. n=0,1
-                 **/
+                 */
                REG_WR(bp, BRB1_REG_FULL_1_XOFF_THRESHOLD_0, full_xoff_th);
-                /**
+                /*
                 * The number of free blocks above which the full signal to
                 * class 1 of MAC #n is de-asserted. n=0,1
-                 **/
+                 */
                REG_WR(bp, BRB1_REG_FULL_1_XON_THRESHOLD_0, full_xon_th);
        }
 }
@@ -896,7 +865,7 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
                FEATURE_CONFIG_PFC_ENABLED;
        DP(NETIF_MSG_LINK, "updating pfc nig parameters\n");
-        /**
+        /*
         * When NIG_LLH0_XCM_MASK_REG_LLHX_XCM_MASK_BCN bit is set
         * MAC control frames (that are not pause packets)
         * will be forwarded to the XCM.
@@ -904,7 +873,7 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
        xcm_mask = REG_RD(bp,
                                port ? NIG_REG_LLH1_XCM_MASK :
                                NIG_REG_LLH0_XCM_MASK);
-        /**
+        /*
         * nig params will override non PFC params, since it's possible to
         * do transition from PFC to SAFC
         */
@@ -994,7 +963,7 @@ void bnx2x_update_pfc(struct link_params *params,
                      struct link_vars *vars,
                      struct bnx2x_nig_brb_pfc_port_params *pfc_params)
 {
-        /**
+        /*
         * The PFC and pause are orthogonal to one another, meaning when
         * PFC is enabled, the pause are disabled, and when PFC is
         * disabled, pause are set according to the pause result.
@@ -1035,7 +1004,7 @@ void bnx2x_update_pfc(struct link_params *params,
 static u8 bnx2x_bmac1_enable(struct link_params *params,
                             struct link_vars *vars,
-                          u8 is_lb)
+                             u8 is_lb)
 {
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
@@ -1049,9 +1018,8 @@ static u8 bnx2x_bmac1_enable(struct link_params *params,
        /* XGXS control */
        wb_data[0] = 0x3c;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr +
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_XGXS_CONTROL,
-                      BIGMAC_REGISTER_BMAC_XGXS_CONTROL,
+                    wb_data, 2);
-                      wb_data, 2);
        /* tx MAC SA */
        wb_data[0] = ((params->mac_addr[2] << 24) |
@@ -1060,8 +1028,7 @@ static u8 bnx2x_bmac1_enable(struct link_params *params,
                        params->mac_addr[5]);
        wb_data[1] = ((params->mac_addr[0] << 8) |
                        params->mac_addr[1]);
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_SOURCE_ADDR,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_SOURCE_ADDR, wb_data, 2);
-                    wb_data, 2);
        /* mac control */
        val = 0x3;
@@ -1071,43 +1038,30 @@ static u8 bnx2x_bmac1_enable(struct link_params *params,
        }
        wb_data[0] = val;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_CONTROL,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_CONTROL, wb_data, 2);
-                    wb_data, 2);
        /* set rx mtu */
        wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_MAX_SIZE,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_MAX_SIZE, wb_data, 2);
-                        wb_data, 2);
        bnx2x_update_pfc_bmac1(params, vars);
        /* set tx mtu */
        wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_MAX_SIZE,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_MAX_SIZE, wb_data, 2);
-                        wb_data, 2);
        /* set cnt max size */
        wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_CNT_MAX_SIZE,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_CNT_MAX_SIZE, wb_data, 2);
-                    wb_data, 2);
        /* configure safc */
        wb_data[0] = 0x1000200;
        wb_data[1] = 0;
        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_LLFC_MSG_FLDS,
                    wb_data, 2);
-        /* fix for emulation */
-        if (CHIP_REV_IS_EMUL(bp)) {
-                wb_data[0] = 0xf000;
-                wb_data[1] = 0;
-                REG_WR_DMAE(bp,
-                            bmac_addr + BIGMAC_REGISTER_TX_PAUSE_THRESHOLD,
-                            wb_data, 2);
-        }
        return 0;
 }
@@ -1126,16 +1080,14 @@ static u8 bnx2x_bmac2_enable(struct link_params *params,
        wb_data[0] = 0;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_CONTROL,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_CONTROL, wb_data, 2);
-                        wb_data, 2);
        udelay(30);
        /* XGXS control: Reset phy HW, MDIO registers, PHY PLL and BMAC */
        wb_data[0] = 0x3c;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr +
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_XGXS_CONTROL,
-                        BIGMAC2_REGISTER_BMAC_XGXS_CONTROL,
+                    wb_data, 2);
-                        wb_data, 2);
        udelay(30);
@@ -1147,7 +1099,7 @@ static u8 bnx2x_bmac2_enable(struct link_params *params,
        wb_data[1] = ((params->mac_addr[0] << 8) |
                        params->mac_addr[1]);
        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_TX_SOURCE_ADDR,
-                        wb_data, 2);
+                    wb_data, 2);
        udelay(30);
@@ -1155,27 +1107,24 @@ static u8 bnx2x_bmac2_enable(struct link_params *params,
        wb_data[0] = 0x1000200;
        wb_data[1] = 0;
        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_LLFC_MSG_FLDS,
-                        wb_data, 2);
+                    wb_data, 2);
        udelay(30);
        /* set rx mtu */
        wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_MAX_SIZE,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_MAX_SIZE, wb_data, 2);
-                        wb_data, 2);
        udelay(30);
        /* set tx mtu */
        wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_TX_MAX_SIZE,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_TX_MAX_SIZE, wb_data, 2);
-                        wb_data, 2);
        udelay(30);
        /* set cnt max size */
        wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD - 2;
        wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_CNT_MAX_SIZE,
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_CNT_MAX_SIZE, wb_data, 2);
-                        wb_data, 2);
        udelay(30);
        bnx2x_update_pfc_bmac2(params, vars, is_lb);
@@ -1191,11 +1140,11 @@ static u8 bnx2x_bmac_enable(struct link_params *params,
        u32 val;
        /* reset and unreset the BigMac */
        REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-                     (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
+               (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
        msleep(1);
        REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-                     (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
+               (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
        /* enable access for bmac registers */
        REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x1);
@@ -1230,15 +1179,14 @@ static void bnx2x_update_mng(struct link_params *params, u32 link_status)
        struct bnx2x *bp = params->bp;
        REG_WR(bp, params->shmem_base +
-                   offsetof(struct shmem_region,
+               offsetof(struct shmem_region,
-                            port_mb[params->port].link_status),
+                        port_mb[params->port].link_status), link_status);
-                        link_status);
 }
 static void bnx2x_bmac_rx_disable(struct bnx2x *bp, u8 port)
 {
        u32 bmac_addr = port ? NIG_REG_INGRESS_BMAC1_MEM :
-                NIG_REG_INGRESS_BMAC0_MEM;
+                        NIG_REG_INGRESS_BMAC0_MEM;
        u32 wb_data[2];
        u32 nig_bmac_enable = REG_RD(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4);
@@ -1250,12 +1198,12 @@ static void bnx2x_bmac_rx_disable(struct bnx2x *bp, u8 port)
                if (CHIP_IS_E2(bp)) {
                        /* Clear Rx Enable bit in BMAC_CONTROL register */
                        REG_RD_DMAE(bp, bmac_addr +
-                                        BIGMAC2_REGISTER_BMAC_CONTROL,
+                                    BIGMAC2_REGISTER_BMAC_CONTROL,
-                                        wb_data, 2);
+                                    wb_data, 2);
                        wb_data[0] &= ~BMAC_CONTROL_RX_ENABLE;
                        REG_WR_DMAE(bp, bmac_addr +
-                                        BIGMAC2_REGISTER_BMAC_CONTROL,
+                                    BIGMAC2_REGISTER_BMAC_CONTROL,
-                                        wb_data, 2);
+                                    wb_data, 2);
                } else {
                        /* Clear Rx Enable bit in BMAC_CONTROL register */
                        REG_RD_DMAE(bp, bmac_addr +
@@ -1271,7 +1219,7 @@ static void bnx2x_bmac_rx_disable(struct bnx2x *bp, u8 port)
 }
 static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
-                         u32 line_speed)
+                           u32 line_speed)
 {
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
@@ -1308,7 +1256,7 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
                /* update threshold */
                REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, 0);
                /* update init credit */
-                init_crd = 778;         /* (800-18-4) */
+                init_crd = 778;         /* (800-18-4) */
        } else {
                u32 thresh = (ETH_MAX_JUMBO_PACKET_SIZE +
@@ -1353,6 +1301,23 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
        return 0;
 }
+/*
+ * get_emac_base
+ *
+ * @param cb
+ * @param mdc_mdio_access
+ * @param port
+ *
+ * @return u32
+ *
+ * This function selects the MDC/MDIO access (through emac0 or
+ * emac1) depend on the mdc_mdio_access, port, port swapped. Each
+ * phy has a default access mode, which could also be overridden
+ * by nvram configuration. This parameter, whether this is the
+ * default phy configuration, or the nvram overrun
+ * configuration, is passed here as mdc_mdio_access and selects
+ * the emac_base for the CL45 read/writes operations
+ */
 static u32 bnx2x_get_emac_base(struct bnx2x *bp,
                               u32 mdc_mdio_access, u8 port)
 {
@@ -1385,13 +1350,16 @@ static u32 bnx2x_get_emac_base(struct bnx2x *bp,
 }
-u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
+/******************************************************************/
-                    u8 devad, u16 reg, u16 val)
+/*                      CL45 access functions                     */
+/******************************************************************/
+static u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
+                           u8 devad, u16 reg, u16 val)
 {
        u32 tmp, saved_mode;
        u8 i, rc = 0;
+        /*
-        /* set clause 45 mode, slow down the MDIO clock to 2.5MHz
+         * Set clause 45 mode, slow down the MDIO clock to 2.5MHz
         * (a value of 49==0x31) and make sure that the AUTO poll is off
         */
@@ -1414,8 +1382,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
        for (i = 0; i < 50; i++) {
                udelay(10);
-                tmp = REG_RD(bp, phy->mdio_ctrl +
+                tmp = REG_RD(bp, phy->mdio_ctrl + EMAC_REG_EMAC_MDIO_COMM);
-                                   EMAC_REG_EMAC_MDIO_COMM);
                if (!(tmp & EMAC_MDIO_COMM_START_BUSY)) {
                        udelay(5);
                        break;
@@ -1423,6 +1390,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
        }
        if (tmp & EMAC_MDIO_COMM_START_BUSY) {
                DP(NETIF_MSG_LINK, "write phy register failed\n");
+                netdev_err(bp->dev,  "MDC/MDIO access timeout\n");
                rc = -EFAULT;
        } else {
                /* data */
@@ -1435,7 +1403,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
                        udelay(10);
                        tmp = REG_RD(bp, phy->mdio_ctrl +
-                                         EMAC_REG_EMAC_MDIO_COMM);
+                                     EMAC_REG_EMAC_MDIO_COMM);
                        if (!(tmp & EMAC_MDIO_COMM_START_BUSY)) {
                                udelay(5);
                                break;
@@ -1443,6 +1411,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
                }
                if (tmp & EMAC_MDIO_COMM_START_BUSY) {
                        DP(NETIF_MSG_LINK, "write phy register failed\n");
+                        netdev_err(bp->dev,  "MDC/MDIO access timeout\n");
                        rc = -EFAULT;
                }
        }
@@ -1453,20 +1422,20 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
        return rc;
 }
-u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
+static u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
-                   u8 devad, u16 reg, u16 *ret_val)
+                          u8 devad, u16 reg, u16 *ret_val)
 {
        u32 val, saved_mode;
        u16 i;
        u8 rc = 0;
+        /*
-        /* set clause 45 mode, slow down the MDIO clock to 2.5MHz
+         * Set clause 45 mode, slow down the MDIO clock to 2.5MHz
         * (a value of 49==0x31) and make sure that the AUTO poll is off
         */
        saved_mode = REG_RD(bp, phy->mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE);
        val = saved_mode & ~((EMAC_MDIO_MODE_AUTO_POLL |
-                             EMAC_MDIO_MODE_CLOCK_CNT));
+                              EMAC_MDIO_MODE_CLOCK_CNT));
        val |= (EMAC_MDIO_MODE_CLAUSE_45 |
                (49L << EMAC_MDIO_MODE_CLOCK_CNT_BITSHIFT));
        REG_WR(bp, phy->mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE, val);
@@ -1490,7 +1459,7 @@ u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
        }
        if (val & EMAC_MDIO_COMM_START_BUSY) {
                DP(NETIF_MSG_LINK, "read phy register failed\n");
+                netdev_err(bp->dev,  "MDC/MDIO access timeout\n");
                *ret_val = 0;
                rc = -EFAULT;
@@ -1505,7 +1474,7 @@ u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
                        udelay(10);
                        val = REG_RD(bp, phy->mdio_ctrl +
-                                          EMAC_REG_EMAC_MDIO_COMM);
+                                     EMAC_REG_EMAC_MDIO_COMM);
                        if (!(val & EMAC_MDIO_COMM_START_BUSY)) {
                                *ret_val = (u16)(val & EMAC_MDIO_COMM_DATA);
                                break;
@@ -1513,7 +1482,7 @@ u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
                }
                if (val & EMAC_MDIO_COMM_START_BUSY) {
                        DP(NETIF_MSG_LINK, "read phy register failed\n");
+                        netdev_err(bp->dev,  "MDC/MDIO access timeout\n");
                        *ret_val = 0;
                        rc = -EFAULT;
                }
@@ -1529,7 +1498,7 @@ u8 bnx2x_phy_read(struct link_params *params, u8 phy_addr,
                  u8 devad, u16 reg, u16 *ret_val)
 {
        u8 phy_index;
-        /**
+        /*
         * Probe for the phy according to the given phy_addr, and execute
         * the read request on it
         */
@@ -1547,7 +1516,7 @@ u8 bnx2x_phy_write(struct link_params *params, u8 phy_addr,
                   u8 devad, u16 reg, u16 val)
 {
        u8 phy_index;
-        /**
+        /*
         * Probe for the phy according to the given phy_addr, and execute
         * the write request on it
         */
@@ -1573,19 +1542,18 @@ static void bnx2x_set_aer_mmd_xgxs(struct link_params *params,
        offset = phy->addr + ser_lane;
        if (CHIP_IS_E2(bp))
-                aer_val = 0x2800 + offset - 1;
+                aer_val = 0x3800 + offset - 1;
        else
                aer_val = 0x3800 + offset;
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy, MDIO_REG_BANK_AER_BLOCK,
-                                MDIO_REG_BANK_AER_BLOCK,
+                          MDIO_AER_BLOCK_AER_REG, aer_val);
-                                MDIO_AER_BLOCK_AER_REG, aer_val);
 }
 static void bnx2x_set_aer_mmd_serdes(struct bnx2x *bp,
                                     struct bnx2x_phy *phy)
 {
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                                MDIO_REG_BANK_AER_BLOCK,
+                          MDIO_REG_BANK_AER_BLOCK,
-                                MDIO_AER_BLOCK_AER_REG, 0x3800);
+                          MDIO_AER_BLOCK_AER_REG, 0x3800);
 }
 /******************************************************************/
@@ -1621,9 +1589,8 @@ static void bnx2x_serdes_deassert(struct bnx2x *bp, u8 port)
        bnx2x_set_serdes_access(bp, port);
-        REG_WR(bp, NIG_REG_SERDES0_CTRL_MD_DEVAD +
+        REG_WR(bp, NIG_REG_SERDES0_CTRL_MD_DEVAD + port*0x10,
-                     port*0x10,
+               DEFAULT_PHY_DEV_ADDR);
-                     DEFAULT_PHY_DEV_ADDR);
 }
 static void bnx2x_xgxs_deassert(struct link_params *params)
@@ -1641,23 +1608,22 @@ static void bnx2x_xgxs_deassert(struct link_params *params)
        udelay(500);
        REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_SET, val);
-        REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_ST +
+        REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_ST + port*0x18, 0);
-                     port*0x18, 0);
        REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18,
-                     params->phy[INT_PHY].def_md_devad);
+               params->phy[INT_PHY].def_md_devad);
 }
 void bnx2x_link_status_update(struct link_params *params,
-                            struct link_vars   *vars)
+                              struct link_vars *vars)
 {
        struct bnx2x *bp = params->bp;
        u8 link_10g;
        u8 port = params->port;
        vars->link_status = REG_RD(bp, params->shmem_base +
-                                          offsetof(struct shmem_region,
+                                   offsetof(struct shmem_region,
-                                           port_mb[port].link_status));
+                                            port_mb[port].link_status));
        vars->link_up = (vars->link_status & LINK_STATUS_LINK_UP);
@@ -1667,7 +1633,7 @@ void bnx2x_link_status_update(struct link_params *params,
                vars->phy_link_up = 1;
                vars->duplex = DUPLEX_FULL;
                switch (vars->link_status &
-                                        LINK_STATUS_SPEED_AND_DUPLEX_MASK) {
+                        LINK_STATUS_SPEED_AND_DUPLEX_MASK) {
                        case LINK_10THD:
                                vars->duplex = DUPLEX_HALF;
                                /* fall thru */
@@ -1779,20 +1745,20 @@ static void bnx2x_set_master_ln(struct link_params *params,
 {
        struct bnx2x *bp = params->bp;
        u16 new_master_ln, ser_lane;
-        ser_lane =  ((params->lane_config &
+        ser_lane = ((params->lane_config &
                     PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
-                     PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
+                    PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
        /* set the master_ln for AN */
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_XGXS_BLOCK2,
+                          MDIO_REG_BANK_XGXS_BLOCK2,
-                              MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
+                          MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
-                              &new_master_ln);
+                          &new_master_ln);
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_XGXS_BLOCK2 ,
+                          MDIO_REG_BANK_XGXS_BLOCK2 ,
-                              MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
+                          MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
-                              (new_master_ln | ser_lane));
+                          (new_master_ln | ser_lane));
 }
 static u8 bnx2x_reset_unicore(struct link_params *params,
@@ -1802,17 +1768,16 @@ static u8 bnx2x_reset_unicore(struct link_params *params,
        struct bnx2x *bp = params->bp;
        u16 mii_control;
        u16 i;
+        CL22_RD_OVER_CL45(bp, phy,
-        CL45_RD_OVER_CL22(bp, phy,
+                          MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_COMBO_IEEE0_MII_CONTROL, &mii_control);
-                              MDIO_COMBO_IEEE0_MII_CONTROL, &mii_control);
        /* reset the unicore */
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL,
+                          MDIO_COMBO_IEEE0_MII_CONTROL,
-                              (mii_control |
+                          (mii_control |
-                               MDIO_COMBO_IEEO_MII_CONTROL_RESET));
+                           MDIO_COMBO_IEEO_MII_CONTROL_RESET));
        if (set_serdes)
                bnx2x_set_serdes_access(bp, params->port);
@@ -1821,10 +1786,10 @@ static u8 bnx2x_reset_unicore(struct link_params *params,
                udelay(5);
                /* the reset erased the previous bank value */
-                CL45_RD_OVER_CL22(bp, phy,
+                CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
+                                  MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL,
+                                  MDIO_COMBO_IEEE0_MII_CONTROL,
-                              &mii_control);
+                                  &mii_control);
                if (!(mii_control & MDIO_COMBO_IEEO_MII_CONTROL_RESET)) {
                        udelay(5);
@@ -1832,6 +1797,9 @@ static u8 bnx2x_reset_unicore(struct link_params *params,
                }
        }
+        netdev_err(bp->dev,  "Warning: PHY was not initialized,"
+                              " Port %d\n",
+                         params->port);
        DP(NETIF_MSG_LINK, "BUG! XGXS is still in reset!\n");
        return -EINVAL;
@@ -1841,43 +1809,45 @@ static void bnx2x_set_swap_lanes(struct link_params *params,
                                 struct bnx2x_phy *phy)
 {
        struct bnx2x *bp = params->bp;
-        /* Each two bits represents a lane number:
+        /*
-           No swap is 0123 => 0x1b no need to enable the swap */
+         *  Each two bits represents a lane number:
+         *  No swap is 0123 => 0x1b no need to enable the swap
+         */
        u16 ser_lane, rx_lane_swap, tx_lane_swap;
        ser_lane = ((params->lane_config &
-                         PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
+                     PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
-                        PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
+                    PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
        rx_lane_swap = ((params->lane_config &
-                             PORT_HW_CFG_LANE_SWAP_CFG_RX_MASK) >>
+                         PORT_HW_CFG_LANE_SWAP_CFG_RX_MASK) >>
-                            PORT_HW_CFG_LANE_SWAP_CFG_RX_SHIFT);
+                        PORT_HW_CFG_LANE_SWAP_CFG_RX_SHIFT);
        tx_lane_swap = ((params->lane_config &
-                             PORT_HW_CFG_LANE_SWAP_CFG_TX_MASK) >>
+                         PORT_HW_CFG_LANE_SWAP_CFG_TX_MASK) >>
-                            PORT_HW_CFG_LANE_SWAP_CFG_TX_SHIFT);
+                        PORT_HW_CFG_LANE_SWAP_CFG_TX_SHIFT);
        if (rx_lane_swap != 0x1b) {
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                    MDIO_REG_BANK_XGXS_BLOCK2,
+                                  MDIO_REG_BANK_XGXS_BLOCK2,
-                                    MDIO_XGXS_BLOCK2_RX_LN_SWAP,
+                                  MDIO_XGXS_BLOCK2_RX_LN_SWAP,
-                                    (rx_lane_swap |
+                                  (rx_lane_swap |
-                                    MDIO_XGXS_BLOCK2_RX_LN_SWAP_ENABLE |
+                                   MDIO_XGXS_BLOCK2_RX_LN_SWAP_ENABLE |
-                                    MDIO_XGXS_BLOCK2_RX_LN_SWAP_FORCE_ENABLE));
+                                   MDIO_XGXS_BLOCK2_RX_LN_SWAP_FORCE_ENABLE));
        } else {
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_XGXS_BLOCK2,
+                                  MDIO_REG_BANK_XGXS_BLOCK2,
-                                      MDIO_XGXS_BLOCK2_RX_LN_SWAP, 0);
+                                  MDIO_XGXS_BLOCK2_RX_LN_SWAP, 0);
        }
        if (tx_lane_swap != 0x1b) {
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_XGXS_BLOCK2,
+                                  MDIO_REG_BANK_XGXS_BLOCK2,
-                                      MDIO_XGXS_BLOCK2_TX_LN_SWAP,
+                                  MDIO_XGXS_BLOCK2_TX_LN_SWAP,
-                                      (tx_lane_swap |
+                                  (tx_lane_swap |
-                                       MDIO_XGXS_BLOCK2_TX_LN_SWAP_ENABLE));
+                                   MDIO_XGXS_BLOCK2_TX_LN_SWAP_ENABLE));
        } else {
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_XGXS_BLOCK2,
+                                  MDIO_REG_BANK_XGXS_BLOCK2,
-                                      MDIO_XGXS_BLOCK2_TX_LN_SWAP, 0);
+                                  MDIO_XGXS_BLOCK2_TX_LN_SWAP, 0);
        }
 }
@@ -1886,66 +1856,66 @@ static void bnx2x_set_parallel_detection(struct bnx2x_phy *phy,
 {
        struct bnx2x *bp = params->bp;
        u16 control2;
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
-                              &control2);
+                          &control2);
        if (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)
                control2 |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN;
        else
                control2 &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN;
        DP(NETIF_MSG_LINK, "phy->speed_cap_mask = 0x%x, control2 = 0x%x\n",
                phy->speed_cap_mask, control2);
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
-                              control2);
+                          control2);
        if ((phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) &&
             (phy->speed_cap_mask &
                    PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)) {
                DP(NETIF_MSG_LINK, "XGXS\n");
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                MDIO_REG_BANK_10G_PARALLEL_DETECT,
+                                 MDIO_REG_BANK_10G_PARALLEL_DETECT,
-                                MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_LINK,
+                                 MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_LINK,
-                                MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_LINK_CNT);
+                                 MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_LINK_CNT);
-                CL45_RD_OVER_CL22(bp, phy,
+                CL22_RD_OVER_CL45(bp, phy,
-                                MDIO_REG_BANK_10G_PARALLEL_DETECT,
+                                  MDIO_REG_BANK_10G_PARALLEL_DETECT,
-                                MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL,
+                                  MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL,
-                                &control2);
+                                  &control2);
                control2 |=
                    MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL_PARDET10G_EN;
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                MDIO_REG_BANK_10G_PARALLEL_DETECT,
+                                  MDIO_REG_BANK_10G_PARALLEL_DETECT,
-                                MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL,
+                                  MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL,
-                                control2);
+                                  control2);
                /* Disable parallel detection of HiG */
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                MDIO_REG_BANK_XGXS_BLOCK2,
+                                  MDIO_REG_BANK_XGXS_BLOCK2,
-                                MDIO_XGXS_BLOCK2_UNICORE_MODE_10G,
+                                  MDIO_XGXS_BLOCK2_UNICORE_MODE_10G,
-                                MDIO_XGXS_BLOCK2_UNICORE_MODE_10G_CX4_XGXS |
+                                  MDIO_XGXS_BLOCK2_UNICORE_MODE_10G_CX4_XGXS |
-                                MDIO_XGXS_BLOCK2_UNICORE_MODE_10G_HIGIG_XGXS);
+                                  MDIO_XGXS_BLOCK2_UNICORE_MODE_10G_HIGIG_XGXS);
        }
 }
 static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                              struct link_params *params,
-                            struct link_vars *vars,
+                              struct link_vars *vars,
-                            u8 enable_cl73)
+                              u8 enable_cl73)
 {
        struct bnx2x *bp = params->bp;
        u16 reg_val;
        /* CL37 Autoneg */
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
+                          MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
        /* CL37 Autoneg Enabled */
        if (vars->line_speed == SPEED_AUTO_NEG)
@@ -1954,15 +1924,15 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                reg_val &= ~(MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
                             MDIO_COMBO_IEEO_MII_CONTROL_RESTART_AN);
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
+                          MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
        /* Enable/Disable Autodetection */
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, &reg_val);
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, &reg_val);
        reg_val &= ~(MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_SIGNAL_DETECT_EN |
                    MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_INVERT_SIGNAL_DETECT);
        reg_val |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_FIBER_MODE;
@@ -1971,14 +1941,14 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
        else
                reg_val &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET;
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, reg_val);
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, reg_val);
        /* Enable TetonII and BAM autoneg */
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_BAM_NEXT_PAGE,
+                          MDIO_REG_BANK_BAM_NEXT_PAGE,
-                              MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
+                          MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
                          &reg_val);
        if (vars->line_speed == SPEED_AUTO_NEG) {
                /* Enable BAM aneg Mode and TetonII aneg Mode */
@@ -1989,20 +1959,20 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                reg_val &= ~(MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_BAM_MODE |
                             MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_TETON_AN);
        }
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_BAM_NEXT_PAGE,
+                          MDIO_REG_BANK_BAM_NEXT_PAGE,
-                              MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
+                          MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
-                              reg_val);
+                          reg_val);
        if (enable_cl73) {
                /* Enable Cl73 FSM status bits */
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_CL73_USERB0,
+                                  MDIO_REG_BANK_CL73_USERB0,
-                                    MDIO_CL73_USERB0_CL73_UCTRL,
+                                  MDIO_CL73_USERB0_CL73_UCTRL,
-                                      0xe);
+                                  0xe);
                /* Enable BAM Station Manager*/
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
                        MDIO_REG_BANK_CL73_USERB0,
                        MDIO_CL73_USERB0_CL73_BAM_CTRL1,
                        MDIO_CL73_USERB0_CL73_BAM_CTRL1_BAM_EN |
@@ -2010,10 +1980,10 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                        MDIO_CL73_USERB0_CL73_BAM_CTRL1_BAM_NP_AFTER_BP_EN);
                /* Advertise CL73 link speeds */
-                CL45_RD_OVER_CL22(bp, phy,
+                CL22_RD_OVER_CL45(bp, phy,
-                                              MDIO_REG_BANK_CL73_IEEEB1,
+                                  MDIO_REG_BANK_CL73_IEEEB1,
-                                              MDIO_CL73_IEEEB1_AN_ADV2,
+                                  MDIO_CL73_IEEEB1_AN_ADV2,
-                                              &reg_val);
+                                  &reg_val);
                if (phy->speed_cap_mask &
                    PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)
                        reg_val |= MDIO_CL73_IEEEB1_AN_ADV2_ADVR_10G_KX4;
@@ -2021,10 +1991,10 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                    PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)
                        reg_val |= MDIO_CL73_IEEEB1_AN_ADV2_ADVR_1000M_KX;
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                              MDIO_REG_BANK_CL73_IEEEB1,
+                                  MDIO_REG_BANK_CL73_IEEEB1,
-                                              MDIO_CL73_IEEEB1_AN_ADV2,
+                                  MDIO_CL73_IEEEB1_AN_ADV2,
-                                      reg_val);
+                                  reg_val);
                /* CL73 Autoneg Enabled */
                reg_val = MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN;
@@ -2032,37 +2002,39 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
        } else /* CL73 Autoneg Disabled */
                reg_val = 0;
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_CL73_IEEEB0,
+                          MDIO_REG_BANK_CL73_IEEEB0,
-                              MDIO_CL73_IEEEB0_CL73_AN_CONTROL, reg_val);
+                          MDIO_CL73_IEEEB0_CL73_AN_CONTROL, reg_val);
 }
 /* program SerDes, forced speed */
 static void bnx2x_program_serdes(struct bnx2x_phy *phy,
                                 struct link_params *params,
-                               struct link_vars *vars)
+                                 struct link_vars *vars)
 {
        struct bnx2x *bp = params->bp;
        u16 reg_val;
        /* program duplex, disable autoneg and sgmii*/
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
+                          MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
        reg_val &= ~(MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX |
                     MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
                     MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_MASK);
        if (phy->req_duplex == DUPLEX_FULL)
                reg_val |= MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX;
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
+                          MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
-        /* program speed
+        /*
-           - needed only if the speed is greater than 1G (2.5G or 10G) */
+         * program speed
-        CL45_RD_OVER_CL22(bp, phy,
+         *  - needed only if the speed is greater than 1G (2.5G or 10G)
-                                      MDIO_REG_BANK_SERDES_DIGITAL,
+         */
-                                      MDIO_SERDES_DIGITAL_MISC1, &reg_val);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_MISC1, &reg_val);
        /* clearing the speed value before setting the right speed */
        DP(NETIF_MSG_LINK, "MDIO_REG_BANK_SERDES_DIGITAL = 0x%x\n", reg_val);
@@ -2083,9 +2055,9 @@ static void bnx2x_program_serdes(struct bnx2x_phy *phy,
                                MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_13G;
        }
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
-                                      MDIO_SERDES_DIGITAL_MISC1, reg_val);
+                          MDIO_SERDES_DIGITAL_MISC1, reg_val);
 }
@@ -2102,13 +2074,13 @@ static void bnx2x_set_brcm_cl37_advertisment(struct bnx2x_phy *phy,
                val |= MDIO_OVER_1G_UP1_2_5G;
        if (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)
                val |= MDIO_OVER_1G_UP1_10G;
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_OVER_1G,
+                          MDIO_REG_BANK_OVER_1G,
-                              MDIO_OVER_1G_UP1, val);
+                          MDIO_OVER_1G_UP1, val);
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_OVER_1G,
+                          MDIO_REG_BANK_OVER_1G,
-                              MDIO_OVER_1G_UP3, 0x400);
+                          MDIO_OVER_1G_UP3, 0x400);
 }
 static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy,
@@ -2116,22 +2088,21 @@ static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy,
 {
        struct bnx2x *bp = params->bp;
        *ieee_fc = MDIO_COMBO_IEEE0_AUTO_NEG_ADV_FULL_DUPLEX;
-        /* resolve pause mode and advertisement
+        /*
-         * Please refer to Table 28B-3 of the 802.3ab-1999 spec */
+         * Resolve pause mode and advertisement.
+         * Please refer to Table 28B-3 of the 802.3ab-1999 spec
+         */
        switch (phy->req_flow_ctrl) {
        case BNX2X_FLOW_CTRL_AUTO:
-                if (params->req_fc_auto_adv == BNX2X_FLOW_CTRL_BOTH) {
+                if (params->req_fc_auto_adv == BNX2X_FLOW_CTRL_BOTH)
-                        *ieee_fc |=
+                        *ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;
-                             MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;
+                else
-                } else {
                        *ieee_fc |=
-                       MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
+                        MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
-                }
                break;
        case BNX2X_FLOW_CTRL_TX:
-                *ieee_fc |=
+                *ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
-                       MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
                break;
        case BNX2X_FLOW_CTRL_RX:
@@ -2149,23 +2120,23 @@ static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy,
 static void bnx2x_set_ieee_aneg_advertisment(struct bnx2x_phy *phy,
                                             struct link_params *params,
-                                           u16 ieee_fc)
+                                             u16 ieee_fc)
 {
        struct bnx2x *bp = params->bp;
        u16 val;
        /* for AN, we are always publishing full duplex */
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_AUTO_NEG_ADV, ieee_fc);
+                          MDIO_COMBO_IEEE0_AUTO_NEG_ADV, ieee_fc);
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_CL73_IEEEB1,
+                          MDIO_REG_BANK_CL73_IEEEB1,
-                              MDIO_CL73_IEEEB1_AN_ADV1, &val);
+                          MDIO_CL73_IEEEB1_AN_ADV1, &val);
        val &= ~MDIO_CL73_IEEEB1_AN_ADV1_PAUSE_BOTH;
        val |= ((ieee_fc<<3) & MDIO_CL73_IEEEB1_AN_ADV1_PAUSE_MASK);
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_CL73_IEEEB1,
+                          MDIO_REG_BANK_CL73_IEEEB1,
-                              MDIO_CL73_IEEEB1_AN_ADV1, val);
+                          MDIO_CL73_IEEEB1_AN_ADV1, val);
 }
 static void bnx2x_restart_autoneg(struct bnx2x_phy *phy,
@@ -2179,67 +2150,67 @@ static void bnx2x_restart_autoneg(struct bnx2x_phy *phy,
        /* Enable and restart BAM/CL37 aneg */
        if (enable_cl73) {
-                CL45_RD_OVER_CL22(bp, phy,
+                CL22_RD_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_CL73_IEEEB0,
+                                  MDIO_REG_BANK_CL73_IEEEB0,
-                                      MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                                      &mii_control);
+                                  &mii_control);
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                MDIO_REG_BANK_CL73_IEEEB0,
+                                  MDIO_REG_BANK_CL73_IEEEB0,
-                                MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                                (mii_control |
+                                  (mii_control |
-                                MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN |
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN |
-                                MDIO_CL73_IEEEB0_CL73_AN_CONTROL_RESTART_AN));
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL_RESTART_AN));
        } else {
-                CL45_RD_OVER_CL22(bp, phy,
+                CL22_RD_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_COMBO_IEEE0,
+                                  MDIO_REG_BANK_COMBO_IEEE0,
-                                      MDIO_COMBO_IEEE0_MII_CONTROL,
+                                  MDIO_COMBO_IEEE0_MII_CONTROL,
-                                      &mii_control);
+                                  &mii_control);
                DP(NETIF_MSG_LINK,
                         "bnx2x_restart_autoneg mii_control before = 0x%x\n",
                         mii_control);
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_COMBO_IEEE0,
+                                  MDIO_REG_BANK_COMBO_IEEE0,
-                                      MDIO_COMBO_IEEE0_MII_CONTROL,
+                                  MDIO_COMBO_IEEE0_MII_CONTROL,
-                                      (mii_control |
+                                  (mii_control |
-                                       MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
+                                   MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
-                                       MDIO_COMBO_IEEO_MII_CONTROL_RESTART_AN));
+                                   MDIO_COMBO_IEEO_MII_CONTROL_RESTART_AN));
        }
 }
 static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
                                           struct link_params *params,
-                                         struct link_vars *vars)
+                                           struct link_vars *vars)
 {
        struct bnx2x *bp = params->bp;
        u16 control1;
        /* in SGMII mode, the unicore is always slave */
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
-                      &control1);
+                          &control1);
        control1 |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_INVERT_SIGNAL_DETECT;
        /* set sgmii mode (and not fiber) */
        control1 &= ~(MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_FIBER_MODE |
                      MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET |
                      MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_MSTR_MODE);
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
-                              control1);
+                          control1);
        /* if forced speed */
        if (!(vars->line_speed == SPEED_AUTO_NEG)) {
                /* set speed, disable autoneg */
                u16 mii_control;
-                CL45_RD_OVER_CL22(bp, phy,
+                CL22_RD_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_COMBO_IEEE0,
+                                  MDIO_REG_BANK_COMBO_IEEE0,
-                                      MDIO_COMBO_IEEE0_MII_CONTROL,
+                                  MDIO_COMBO_IEEE0_MII_CONTROL,
-                                      &mii_control);
+                                  &mii_control);
                mii_control &= ~(MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
                                 MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_MASK|
                                 MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX);
@@ -2267,10 +2238,10 @@ static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
                if (phy->req_duplex == DUPLEX_FULL)
                        mii_control |=
                                MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX;
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_COMBO_IEEE0,
+                                  MDIO_REG_BANK_COMBO_IEEE0,
-                                      MDIO_COMBO_IEEE0_MII_CONTROL,
+                                  MDIO_COMBO_IEEE0_MII_CONTROL,
-                                      mii_control);
+                                  mii_control);
        } else { /* AN mode */
                /* enable and restart AN */
@@ -2285,19 +2256,19 @@ static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
 static void bnx2x_pause_resolve(struct link_vars *vars, u32 pause_result)
 {                                               /*  LD      LP   */
-        switch (pause_result) {                 /* ASYM P ASYM P */
+        switch (pause_result) {                 /* ASYM P ASYM P */
-        case 0xb:                               /*   1  0   1  1 */
+        case 0xb:                               /*   1  0   1  1 */
                vars->flow_ctrl = BNX2X_FLOW_CTRL_TX;
                break;
-        case 0xe:                               /*   1  1   1  0 */
+        case 0xe:                               /*   1  1   1  0 */
                vars->flow_ctrl = BNX2X_FLOW_CTRL_RX;
                break;
-        case 0x5:                               /*   0  1   0  1 */
+        case 0x5:                               /*   0  1   0  1 */
-        case 0x7:                               /*   0  1   1  1 */
+        case 0x7:                               /*   0  1   1  1 */
-        case 0xd:                               /*   1  1   0  1 */
+        case 0xd:                               /*   1  1   0  1 */
-        case 0xf:                               /*   1  1   1  1 */
+        case 0xf:                               /*   1  1   1  1 */
                vars->flow_ctrl = BNX2X_FLOW_CTRL_BOTH;
                break;
@@ -2317,24 +2288,24 @@ static u8 bnx2x_direct_parallel_detect_used(struct bnx2x_phy *phy,
        u16 pd_10g, status2_1000x;
        if (phy->req_line_speed != SPEED_AUTO_NEG)
                return 0;
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_STATUS2,
+                          MDIO_SERDES_DIGITAL_A_1000X_STATUS2,
-                              &status2_1000x);
+                          &status2_1000x);
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_STATUS2,
+                          MDIO_SERDES_DIGITAL_A_1000X_STATUS2,
-                              &status2_1000x);
+                          &status2_1000x);
        if (status2_1000x & MDIO_SERDES_DIGITAL_A_1000X_STATUS2_AN_DISABLED) {
                DP(NETIF_MSG_LINK, "1G parallel detect link on port %d\n",
                         params->port);
                return 1;
        }
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_10G_PARALLEL_DETECT,
+                          MDIO_REG_BANK_10G_PARALLEL_DETECT,
-                              MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_STATUS,
+                          MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_STATUS,
-                              &pd_10g);
+                          &pd_10g);
        if (pd_10g & MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_STATUS_PD_LINK) {
                DP(NETIF_MSG_LINK, "10G parallel detect link on port %d\n",
@@ -2373,14 +2344,14 @@ static void bnx2x_flow_ctrl_resolve(struct bnx2x_phy *phy,
                    (MDIO_GP_STATUS_TOP_AN_STATUS1_CL73_AUTONEG_COMPLETE |
                     MDIO_GP_STATUS_TOP_AN_STATUS1_CL73_MR_LP_NP_AN_ABLE)) {
-                        CL45_RD_OVER_CL22(bp, phy,
+                        CL22_RD_OVER_CL45(bp, phy,
-                                              MDIO_REG_BANK_CL73_IEEEB1,
+                                          MDIO_REG_BANK_CL73_IEEEB1,
-                                              MDIO_CL73_IEEEB1_AN_ADV1,
+                                          MDIO_CL73_IEEEB1_AN_ADV1,
-                                              &ld_pause);
+                                          &ld_pause);
-                        CL45_RD_OVER_CL22(bp, phy,
+                        CL22_RD_OVER_CL45(bp, phy,
-                                             MDIO_REG_BANK_CL73_IEEEB1,
+                                          MDIO_REG_BANK_CL73_IEEEB1,
-                                             MDIO_CL73_IEEEB1_AN_LP_ADV1,
+                                          MDIO_CL73_IEEEB1_AN_LP_ADV1,
-                                             &lp_pause);
+                                          &lp_pause);
                        pause_result = (ld_pause &
                                        MDIO_CL73_IEEEB1_AN_ADV1_PAUSE_MASK)
                                        >> 8;
@@ -2390,18 +2361,18 @@ static void bnx2x_flow_ctrl_resolve(struct bnx2x_phy *phy,
                        DP(NETIF_MSG_LINK, "pause_result CL73 0x%x\n",
                                 pause_result);
                } else {
-                        CL45_RD_OVER_CL22(bp, phy,
+                        CL22_RD_OVER_CL45(bp, phy,
-                                              MDIO_REG_BANK_COMBO_IEEE0,
+                                          MDIO_REG_BANK_COMBO_IEEE0,
-                                              MDIO_COMBO_IEEE0_AUTO_NEG_ADV,
+                                          MDIO_COMBO_IEEE0_AUTO_NEG_ADV,
-                                              &ld_pause);
+                                          &ld_pause);
-                        CL45_RD_OVER_CL22(bp, phy,
+                        CL22_RD_OVER_CL45(bp, phy,
-                               MDIO_REG_BANK_COMBO_IEEE0,
+                                MDIO_REG_BANK_COMBO_IEEE0,
-                               MDIO_COMBO_IEEE0_AUTO_NEG_LINK_PARTNER_ABILITY1,
+                                MDIO_COMBO_IEEE0_AUTO_NEG_LINK_PARTNER_ABILITY1,
-                               &lp_pause);
+                                &lp_pause);
                        pause_result = (ld_pause &
                                MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK)>>5;
                        pause_result |= (lp_pause &
-                                 MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK)>>7;
+                                MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK)>>7;
                        DP(NETIF_MSG_LINK, "pause_result CL37 0x%x\n",
                                 pause_result);
                }
@@ -2417,25 +2388,25 @@ static void bnx2x_check_fallback_to_cl37(struct bnx2x_phy *phy,
        u16 rx_status, ustat_val, cl37_fsm_recieved;
        DP(NETIF_MSG_LINK, "bnx2x_check_fallback_to_cl37\n");
        /* Step 1: Make sure signal is detected */
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_RX0,
+                          MDIO_REG_BANK_RX0,
-                              MDIO_RX0_RX_STATUS,
+                          MDIO_RX0_RX_STATUS,
-                              &rx_status);
+                          &rx_status);
        if ((rx_status & MDIO_RX0_RX_STATUS_SIGDET) !=
            (MDIO_RX0_RX_STATUS_SIGDET)) {
                DP(NETIF_MSG_LINK, "Signal is not detected. Restoring CL73."
                             "rx_status(0x80b0) = 0x%x\n", rx_status);
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
-                                      MDIO_REG_BANK_CL73_IEEEB0,
+                                  MDIO_REG_BANK_CL73_IEEEB0,
-                                      MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                                      MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN);
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN);
                return;
        }
        /* Step 2: Check CL73 state machine */
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_CL73_USERB0,
+                          MDIO_REG_BANK_CL73_USERB0,
-                              MDIO_CL73_USERB0_CL73_USTAT1,
+                          MDIO_CL73_USERB0_CL73_USTAT1,
-                              &ustat_val);
+                          &ustat_val);
        if ((ustat_val &
             (MDIO_CL73_USERB0_CL73_USTAT1_LINK_STATUS_CHECK |
              MDIO_CL73_USERB0_CL73_USTAT1_AN_GOOD_CHECK_BAM37)) !=
@@ -2445,12 +2416,14 @@ static void bnx2x_check_fallback_to_cl37(struct bnx2x_phy *phy,
                             "ustat_val(0x8371) = 0x%x\n", ustat_val);
                return;
        }
-        /* Step 3: Check CL37 Message Pages received to indicate LP
+        /*
-        supports only CL37 */
+         * Step 3: Check CL37 Message Pages received to indicate LP
-        CL45_RD_OVER_CL22(bp, phy,
+         * supports only CL37
-                              MDIO_REG_BANK_REMOTE_PHY,
+         */
-                              MDIO_REMOTE_PHY_MISC_RX_STATUS,
+        CL22_RD_OVER_CL45(bp, phy,
-                              &cl37_fsm_recieved);
+                          MDIO_REG_BANK_REMOTE_PHY,
+                          MDIO_REMOTE_PHY_MISC_RX_STATUS,
+                          &cl37_fsm_recieved);
        if ((cl37_fsm_recieved &
             (MDIO_REMOTE_PHY_MISC_RX_STATUS_CL37_FSM_RECEIVED_OVER1G_MSG |
             MDIO_REMOTE_PHY_MISC_RX_STATUS_CL37_FSM_RECEIVED_BRCM_OUI_MSG)) !=
@@ -2461,14 +2434,18 @@ static void bnx2x_check_fallback_to_cl37(struct bnx2x_phy *phy,
                         cl37_fsm_recieved);
                return;
        }
-        /* The combined cl37/cl73 fsm state information indicating that we are
+        /*
-        connected to a device which does not support cl73, but does support
+         * The combined cl37/cl73 fsm state information indicating that
-        cl37 BAM. In this case we disable cl73 and restart cl37 auto-neg */
+         * we are connected to a device which does not support cl73, but
+         * does support cl37 BAM. In this case we disable cl73 and
+         * restart cl37 auto-neg
+         */
        /* Disable CL73 */
-        CL45_WR_OVER_CL22(bp, phy,
+        CL22_WR_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_CL73_IEEEB0,
+                          MDIO_REG_BANK_CL73_IEEEB0,
-                              MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                          MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                              0);
+                          0);
        /* Restart CL37 autoneg */
        bnx2x_restart_autoneg(phy, params, 0);
        DP(NETIF_MSG_LINK, "Disabling CL73, and restarting CL37 autoneg\n");
@@ -2493,14 +2470,14 @@ static u8 bnx2x_link_settings_status(struct bnx2x_phy *phy,
                                     struct link_vars *vars)
 {
        struct bnx2x *bp = params->bp;
-        u16 new_line_speed , gp_status;
+        u16 new_line_speed, gp_status;
        u8 rc = 0;
        /* Read gp_status */
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                                MDIO_REG_BANK_GP_STATUS,
+                          MDIO_REG_BANK_GP_STATUS,
-                                MDIO_GP_STATUS_TOP_AN_STATUS1,
+                          MDIO_GP_STATUS_TOP_AN_STATUS1,
-                                &gp_status);
+                          &gp_status);
        if (phy->req_line_speed == SPEED_AUTO_NEG)
                vars->link_status |= LINK_STATUS_AUTO_NEGOTIATE_ENABLED;
@@ -2637,9 +2614,9 @@ static void bnx2x_set_gmii_tx_driver(struct link_params *params)
        u16 bank;
        /* read precomp */
-        CL45_RD_OVER_CL22(bp, phy,
+        CL22_RD_OVER_CL45(bp, phy,
-                              MDIO_REG_BANK_OVER_1G,
+                          MDIO_REG_BANK_OVER_1G,
-                              MDIO_OVER_1G_LP_UP2, &lp_up2);
+                          MDIO_OVER_1G_LP_UP2, &lp_up2);
        /* bits [10:7] at lp_up2, positioned at [15:12] */
        lp_up2 = (((lp_up2 & MDIO_OVER_1G_LP_UP2_PREEMPHASIS_MASK) >>
@@ -2651,18 +2628,18 @@ static void bnx2x_set_gmii_tx_driver(struct link_params *params)
        for (bank = MDIO_REG_BANK_TX0; bank <= MDIO_REG_BANK_TX3;
              bank += (MDIO_REG_BANK_TX1 - MDIO_REG_BANK_TX0)) {
-                CL45_RD_OVER_CL22(bp, phy,
+                CL22_RD_OVER_CL45(bp, phy,
-                                      bank,
+                                  bank,
-                                      MDIO_TX0_TX_DRIVER, &tx_driver);
+                                  MDIO_TX0_TX_DRIVER, &tx_driver);
                /* replace tx_driver bits [15:12] */
                if (lp_up2 !=
                    (tx_driver & MDIO_TX0_TX_DRIVER_PREEMPHASIS_MASK)) {
                        tx_driver &= ~MDIO_TX0_TX_DRIVER_PREEMPHASIS_MASK;
                        tx_driver |= lp_up2;
-                        CL45_WR_OVER_CL22(bp, phy,
+                        CL22_WR_OVER_CL45(bp, phy,
-                                              bank,
+                                          bank,
-                                              MDIO_TX0_TX_DRIVER, tx_driver);
+                                          MDIO_TX0_TX_DRIVER, tx_driver);
                }
        }
 }
@@ -2676,10 +2653,10 @@ static u8 bnx2x_emac_program(struct link_params *params,
        DP(NETIF_MSG_LINK, "setting link speed & duplex\n");
        bnx2x_bits_dis(bp, GRCBASE_EMAC0 + port*0x400 +
-                     EMAC_REG_EMAC_MODE,
+                       EMAC_REG_EMAC_MODE,
-                     (EMAC_MODE_25G_MODE |
+                       (EMAC_MODE_25G_MODE |
-                     EMAC_MODE_PORT_MII_10M |
+                        EMAC_MODE_PORT_MII_10M |
-                     EMAC_MODE_HALF_DUPLEX));
+                        EMAC_MODE_HALF_DUPLEX));
        switch (vars->line_speed) {
        case SPEED_10:
                mode |= EMAC_MODE_PORT_MII_10M;
@@ -2707,8 +2684,8 @@ static u8 bnx2x_emac_program(struct link_params *params,
        if (vars->duplex == DUPLEX_HALF)
                mode |= EMAC_MODE_HALF_DUPLEX;
        bnx2x_bits_en(bp,
-                    GRCBASE_EMAC0 + port*0x400 + EMAC_REG_EMAC_MODE,
+                      GRCBASE_EMAC0 + port*0x400 + EMAC_REG_EMAC_MODE,
-                    mode);
+                      mode);
        bnx2x_set_led(params, vars, LED_MODE_OPER, vars->line_speed);
        return 0;
@@ -2723,7 +2700,7 @@ static void bnx2x_set_preemphasis(struct bnx2x_phy *phy,
        for (bank = MDIO_REG_BANK_RX0, i = 0; bank <= MDIO_REG_BANK_RX3;
              bank += (MDIO_REG_BANK_RX1-MDIO_REG_BANK_RX0), i++) {
-                        CL45_WR_OVER_CL22(bp, phy,
+                        CL22_WR_OVER_CL45(bp, phy,
                                          bank,
                                          MDIO_RX0_RX_EQ_BOOST,
                                          phy->rx_preemphasis[i]);
@@ -2731,7 +2708,7 @@ static void bnx2x_set_preemphasis(struct bnx2x_phy *phy,
        for (bank = MDIO_REG_BANK_TX0, i = 0; bank <= MDIO_REG_BANK_TX3;
                      bank += (MDIO_REG_BANK_TX1 - MDIO_REG_BANK_TX0), i++) {
-                        CL45_WR_OVER_CL22(bp, phy,
+                        CL22_WR_OVER_CL45(bp, phy,
                                          bank,
                                          MDIO_TX0_TX_DRIVER,
                                          phy->tx_preemphasis[i]);
@@ -2754,7 +2731,7 @@ static void bnx2x_init_internal_phy(struct bnx2x_phy *phy,
                /* forced speed requested? */
                if (vars->line_speed != SPEED_AUTO_NEG ||
                    (SINGLE_MEDIA_DIRECT(params) &&
-                          params->loopback_mode == LOOPBACK_EXT)) {
+                     params->loopback_mode == LOOPBACK_EXT)) {
                        DP(NETIF_MSG_LINK, "not SGMII, no AN\n");
                        /* disable autoneg */
@@ -2771,7 +2748,7 @@ static void bnx2x_init_internal_phy(struct bnx2x_phy *phy,
                        /* program duplex & pause advertisement (for aneg) */
                        bnx2x_set_ieee_aneg_advertisment(phy, params,
-                                                       vars->ieee_fc);
+                                                         vars->ieee_fc);
                        /* enable autoneg */
                        bnx2x_set_autoneg(phy, params, vars, enable_cl73);
@@ -2842,7 +2819,8 @@ static u8 bnx2x_init_xgxs(struct bnx2x_phy *phy,
 }
 static u16 bnx2x_wait_reset_complete(struct bnx2x *bp,
-                                     struct bnx2x_phy *phy)
+                                     struct bnx2x_phy *phy,
+                                     struct link_params *params)
 {
        u16 cnt, ctrl;
        /* Wait for soft reset to get cleared upto 1 sec */
@@ -2853,6 +2831,11 @@ static u16 bnx2x_wait_reset_complete(struct bnx2x *bp,
                        break;
                msleep(1);
        }
+        if (cnt == 1000)
+                netdev_err(bp->dev,  "Warning: PHY was not initialized,"
+                                      " Port %d\n",
+                         params->port);
        DP(NETIF_MSG_LINK, "control reg 0x%x (after %d ms)\n", ctrl, cnt);
        return cnt;
 }
@@ -2863,9 +2846,7 @@ static void bnx2x_link_int_enable(struct link_params *params)
        u32 mask;
        struct bnx2x *bp = params->bp;
-        /* setting the status to report on link up
+        /* Setting the status to report on link up for either XGXS or SerDes */
-           for either XGXS or SerDes */
        if (params->switch_cfg == SWITCH_CFG_10G) {
                mask = (NIG_MASK_XGXS0_LINK10G |
                        NIG_MASK_XGXS0_LINK_STATUS);
@@ -2908,7 +2889,7 @@ static void bnx2x_rearm_latch_signal(struct bnx2x *bp, u8 port,
 {
        u32 latch_status = 0;
-        /**
+        /*
         * Disable the MI INT ( external phy int ) by writing 1 to the
         * status register. Link down indication is high-active-signal,
         * so in this case we need to write the status to clear the XOR
@@ -2933,27 +2914,30 @@ static void bnx2x_rearm_latch_signal(struct bnx2x *bp, u8 port,
                /* For all latched-signal=up : Re-Arm Latch signals */
                REG_WR(bp, NIG_REG_LATCH_STATUS_0 + port*8,
-                             (latch_status & 0xfffe) | (latch_status & 1));
+                       (latch_status & 0xfffe) | (latch_status & 1));
        }
        /* For all latched-signal=up,Write original_signal to status */
 }
 static void bnx2x_link_int_ack(struct link_params *params,
-                             struct link_vars *vars, u8 is_10g)
+                               struct link_vars *vars, u8 is_10g)
 {
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
-        /* first reset all status
+        /*
-         * we assume only one line will be change at a time */
+         * First reset all status we assume only one line will be
+         * change at a time
+         */
        bnx2x_bits_dis(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,
-                     (NIG_STATUS_XGXS0_LINK10G |
+                       (NIG_STATUS_XGXS0_LINK10G |
-                      NIG_STATUS_XGXS0_LINK_STATUS |
+                        NIG_STATUS_XGXS0_LINK_STATUS |
-                      NIG_STATUS_SERDES0_LINK_STATUS));
+                        NIG_STATUS_SERDES0_LINK_STATUS));
        if (vars->phy_link_up) {
                if (is_10g) {
-                        /* Disable the 10G link interrupt
+                        /*
-                         * by writing 1 to the status register
+                         * Disable the 10G link interrupt by writing 1 to the
+                         * status register
                         */
                        DP(NETIF_MSG_LINK, "10G XGXS phy link up\n");
                        bnx2x_bits_en(bp,
@@ -2961,9 +2945,9 @@ static void bnx2x_link_int_ack(struct link_params *params,
                                      NIG_STATUS_XGXS0_LINK10G);
                } else if (params->switch_cfg == SWITCH_CFG_10G) {
-                        /* Disable the link interrupt
+                        /*
-                         * by writing 1 to the relevant lane
+                         * Disable the link interrupt by writing 1 to the
-                         * in the status register
+                         * relevant lane in the status register
                         */
                        u32 ser_lane = ((params->lane_config &
                                    PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
@@ -2978,8 +2962,9 @@ static void bnx2x_link_int_ack(struct link_params *params,
                } else { /* SerDes */
                        DP(NETIF_MSG_LINK, "SerDes phy link up\n");
-                        /* Disable the link interrupt
+                        /*
-                         * by writing 1 to the status register
+                         * Disable the link interrupt by writing 1 to the status
+                         * register
                         */
                        bnx2x_bits_en(bp,
                                      NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,
@@ -3059,8 +3044,7 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded,
        }
        if ((params->num_phys == MAX_PHYS) &&
            (params->phy[EXT_PHY2].ver_addr != 0)) {
-                spirom_ver = REG_RD(bp,
+                spirom_ver = REG_RD(bp, params->phy[EXT_PHY2].ver_addr);
-                                          params->phy[EXT_PHY2].ver_addr);
                if (params->phy[EXT_PHY2].format_fw_ver) {
                        *ver_p = '/';
                        ver_p++;
@@ -3089,29 +3073,27 @@ static void bnx2x_set_xgxs_loopback(struct bnx2x_phy *phy,
                /* change the uni_phy_addr in the nig */
                md_devad = REG_RD(bp, (NIG_REG_XGXS0_CTRL_MD_DEVAD +
-                                          port*0x18));
+                                       port*0x18));
                REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18, 0x5);
                bnx2x_cl45_write(bp, phy,
-                               5,
+                                 5,
-                               (MDIO_REG_BANK_AER_BLOCK +
+                                 (MDIO_REG_BANK_AER_BLOCK +
-                                (MDIO_AER_BLOCK_AER_REG & 0xf)),
+                                  (MDIO_AER_BLOCK_AER_REG & 0xf)),
-                               0x2800);
+                                 0x2800);
                bnx2x_cl45_write(bp, phy,
-                               5,
+                                 5,
-                               (MDIO_REG_BANK_CL73_IEEEB0 +
+                                 (MDIO_REG_BANK_CL73_IEEEB0 +
-                                (MDIO_CL73_IEEEB0_CL73_AN_CONTROL & 0xf)),
+                                  (MDIO_CL73_IEEEB0_CL73_AN_CONTROL & 0xf)),
-                               0x6041);
+                                 0x6041);
                msleep(200);
                /* set aer mmd back */
                bnx2x_set_aer_mmd_xgxs(params, phy);
                /* and md_devad */
-                REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18,
+                REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18, md_devad);
-                            md_devad);
        } else {
                u16 mii_ctrl;
                DP(NETIF_MSG_LINK, "XGXS 1G loopback enable\n");
@@ -3152,56 +3134,71 @@ u8 bnx2x_set_led(struct link_params *params,
        case LED_MODE_OFF:
                REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 0);
                REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,
-                           SHARED_HW_CFG_LED_MAC1);
+                       SHARED_HW_CFG_LED_MAC1);
                tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
                EMAC_WR(bp, EMAC_REG_EMAC_LED, (tmp | EMAC_LED_OVERRIDE));
                break;
        case LED_MODE_OPER:
-                /**
+                /*
                 * For all other phys, OPER mode is same as ON, so in case
                 * link is down, do nothing
-                 **/
+                 */
                if (!vars->link_up)
                        break;
        case LED_MODE_ON:
-                if (SINGLE_MEDIA_DIRECT(params)) {
+                if (params->phy[EXT_PHY1].type ==
-                        /**
+                    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727 &&
-                        * This is a work-around for HW issue found when link
+                    CHIP_IS_E2(bp) && params->num_phys == 2) {
-                        * is up in CL73
+                        /*
-                        */
+                         * This is a work-around for E2+8727 Configurations
+                         */
+                        if (mode == LED_MODE_ON ||
+                                speed == SPEED_10000){
+                                REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
+                                REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 1);
+                                tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
+                                EMAC_WR(bp, EMAC_REG_EMAC_LED,
+                                        (tmp | EMAC_LED_OVERRIDE));
+                                return rc;
+                        }
+                } else if (SINGLE_MEDIA_DIRECT(params)) {
+                        /*
+                         * This is a work-around for HW issue found when link
+                         * is up in CL73
+                         */
                        REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
                        REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 1);
                } else {
-                        REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,
+                        REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, hw_led_mode);
-                                   hw_led_mode);
                }
-                REG_WR(bp, NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0 +
+                REG_WR(bp, NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0 + port*4, 0);
-                           port*4, 0);
                /* Set blinking rate to ~15.9Hz */
                REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_P0 + port*4,
-                           LED_BLINK_RATE_VAL);
+                       LED_BLINK_RATE_VAL);
                REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_ENA_P0 +
-                           port*4, 1);
+                       port*4, 1);
                tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
-                EMAC_WR(bp, EMAC_REG_EMAC_LED,
+                EMAC_WR(bp, EMAC_REG_EMAC_LED, (tmp & (~EMAC_LED_OVERRIDE)));
-                            (tmp & (~EMAC_LED_OVERRIDE)));
                if (CHIP_IS_E1(bp) &&
                    ((speed == SPEED_2500) ||
                     (speed == SPEED_1000) ||
                     (speed == SPEED_100) ||
                     (speed == SPEED_10))) {
-                        /* On Everest 1 Ax chip versions for speeds less than
+                        /*
-                        10G LED scheme is different */
+                         * On Everest 1 Ax chip versions for speeds less than
+                         * 10G LED scheme is different
+                         */
                        REG_WR(bp, NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0
-                                   + port*4, 1);
+                               + port*4, 1);
                        REG_WR(bp, NIG_REG_LED_CONTROL_TRAFFIC_P0 +
-                                   port*4, 0);
+                               port*4, 0);
                        REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_TRAFFIC_P0 +
-                                   port*4, 1);
+                               port*4, 1);
                }
                break;
@@ -3215,7 +3212,7 @@ u8 bnx2x_set_led(struct link_params *params,
 }
-/**
+/*
 * This function comes to reflect the actual link state read DIRECTLY from the
 * HW
 */
@@ -3227,10 +3224,10 @@ u8 bnx2x_test_link(struct link_params *params, struct link_vars *vars,
        u8 ext_phy_link_up = 0, serdes_phy_type;
        struct link_vars temp_vars;
-        CL45_RD_OVER_CL22(bp, &params->phy[INT_PHY],
+        CL22_RD_OVER_CL45(bp, &params->phy[INT_PHY],
-                              MDIO_REG_BANK_GP_STATUS,
+                          MDIO_REG_BANK_GP_STATUS,
-                              MDIO_GP_STATUS_TOP_AN_STATUS1,
+                          MDIO_GP_STATUS_TOP_AN_STATUS1,
-                              &gp_status);
+                          &gp_status);
        /* link is up only if both local phy and external phy are up */
        if (!(gp_status & MDIO_GP_STATUS_TOP_AN_STATUS1_LINK_STATUS))
                return -ESRCH;
@@ -3274,15 +3271,15 @@ static u8 bnx2x_link_initialize(struct link_params *params,
        u8 rc = 0;
        u8 phy_index, non_ext_phy;
        struct bnx2x *bp = params->bp;
-        /**
+        /*
-        * In case of external phy existence, the line speed would be the
+         * In case of external phy existence, the line speed would be the
-        * line speed linked up by the external phy. In case it is direct
+         * line speed linked up by the external phy. In case it is direct
-        * only, then the line_speed during initialization will be
+         * only, then the line_speed during initialization will be
-        * equal to the req_line_speed
+         * equal to the req_line_speed
-        */
+         */
        vars->line_speed = params->phy[INT_PHY].req_line_speed;
-        /**
+        /*
         * Initialize the internal phy in case this is a direct board
         * (no external phys), or this board has external phy which requires
         * to first.
@@ -3310,17 +3307,16 @@ static u8 bnx2x_link_initialize(struct link_params *params,
        if (!non_ext_phy)
                for (phy_index = EXT_PHY1; phy_index < params->num_phys;
                      phy_index++) {
-                        /**
+                        /*
                         * No need to initialize second phy in case of first
                         * phy only selection. In case of second phy, we do
                         * need to initialize the first phy, since they are
                         * connected.
-                         **/
+                         */
                        if (phy_index == EXT_PHY2 &&
                            (bnx2x_phy_selection(params) ==
                             PORT_HW_CFG_PHY_SELECTION_FIRST_PHY)) {
-                                DP(NETIF_MSG_LINK, "Not initializing"
+                                DP(NETIF_MSG_LINK, "Ignoring second phy\n");
-                                                   "second phy\n");
                                continue;
                        }
                        params->phy[phy_index].config_init(
@@ -3342,9 +3338,8 @@ static void bnx2x_int_link_reset(struct bnx2x_phy *phy,
                                 struct link_params *params)
 {
        /* reset the SerDes/XGXS */
-        REG_WR(params->bp, GRCBASE_MISC +
+        REG_WR(params->bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_CLEAR,
-                     MISC_REGISTERS_RESET_REG_3_CLEAR,
+               (0x1ff << (params->port*16)));
-                     (0x1ff << (params->port*16)));
 }
 static void bnx2x_common_ext_link_reset(struct bnx2x_phy *phy,
@@ -3358,11 +3353,11 @@ static void bnx2x_common_ext_link_reset(struct bnx2x_phy *phy,
        else
                gpio_port = params->port;
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW,
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW,
-                            gpio_port);
+                       gpio_port);
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW,
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW,
-                            gpio_port);
+                       gpio_port);
        DP(NETIF_MSG_LINK, "reset external PHY\n");
 }
@@ -3393,9 +3388,8 @@ static u8 bnx2x_update_link_down(struct link_params *params,
        /* reset BigMac */
        bnx2x_bmac_rx_disable(bp, params->port);
-        REG_WR(bp, GRCBASE_MISC +
+        REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-                   MISC_REGISTERS_RESET_REG_2_CLEAR,
+               (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
-                   (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
        return 0;
 }
@@ -3446,7 +3440,7 @@ static u8 bnx2x_update_link_up(struct link_params *params,
        msleep(20);
        return rc;
 }
-/**
+/*
 * The bnx2x_link_update function should be called upon link
 * interrupt.
 * Link is considered up as follows:
@@ -3485,12 +3479,11 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                 REG_RD(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4));
        is_mi_int = (u8)(REG_RD(bp, NIG_REG_EMAC0_STATUS_MISC_MI_INT +
-                                    port*0x18) > 0);
+                                port*0x18) > 0);
        DP(NETIF_MSG_LINK, "int_mask 0x%x MI_INT %x, SERDES_LINK %x\n",
                 REG_RD(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4),
                 is_mi_int,
-                 REG_RD(bp,
+                 REG_RD(bp, NIG_REG_SERDES0_STATUS_LINK_STATUS + port*0x3c));
-                            NIG_REG_SERDES0_STATUS_LINK_STATUS + port*0x3c));
        DP(NETIF_MSG_LINK, " 10G %x, XGXS_LINK %x\n",
          REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK10G + port*0x68),
@@ -3499,14 +3492,14 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
        /* disable emac */
        REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 0);
-        /**
+        /*
-        * Step 1:
+         * Step 1:
-        * Check external link change only for external phys, and apply
+         * Check external link change only for external phys, and apply
-        * priority selection between them in case the link on both phys
+         * priority selection between them in case the link on both phys
-        * is up. Note that the instead of the common vars, a temporary
+         * is up. Note that the instead of the common vars, a temporary
-        * vars argument is used since each phy may have different link/
+         * vars argument is used since each phy may have different link/
-        * speed/duplex result
+         * speed/duplex result
-        */
+         */
        for (phy_index = EXT_PHY1; phy_index < params->num_phys;
              phy_index++) {
                struct bnx2x_phy *phy = &params->phy[phy_index];
@@ -3531,22 +3524,22 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                        switch (bnx2x_phy_selection(params)) {
                        case PORT_HW_CFG_PHY_SELECTION_HARDWARE_DEFAULT:
                        case PORT_HW_CFG_PHY_SELECTION_FIRST_PHY_PRIORITY:
-                        /**
+                        /*
                         * In this option, the first PHY makes sure to pass the
                         * traffic through itself only.
                         * Its not clear how to reset the link on the second phy
-                         **/
+                         */
                                active_external_phy = EXT_PHY1;
                                break;
                        case PORT_HW_CFG_PHY_SELECTION_SECOND_PHY_PRIORITY:
-                        /**
+                        /*
                         * In this option, the first PHY makes sure to pass the
                         * traffic through the second PHY.
-                         **/
+                         */
                                active_external_phy = EXT_PHY2;
                                break;
                        default:
-                        /**
+                        /*
                         * Link indication on both PHYs with the following cases
                         * is invalid:
                         * - FIRST_PHY means that second phy wasn't initialized,
@@ -3554,7 +3547,7 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                         * - SECOND_PHY means that first phy should not be able
                         * to link up by itself (using configuration)
                         * - DEFAULT should be overriden during initialiazation
-                         **/
+                         */
                                DP(NETIF_MSG_LINK, "Invalid link indication"
                                           "mpc=0x%x. DISABLING LINK !!!\n",
                                           params->multi_phy_config);
@@ -3564,18 +3557,18 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                }
        }
        prev_line_speed = vars->line_speed;
-        /**
+        /*
-        * Step 2:
+         * Step 2:
-        * Read the status of the internal phy. In case of
+         * Read the status of the internal phy. In case of
-        * DIRECT_SINGLE_MEDIA board, this link is the external link,
+         * DIRECT_SINGLE_MEDIA board, this link is the external link,
-        * otherwise this is the link between the 577xx and the first
+         * otherwise this is the link between the 577xx and the first
-        * external phy
+         * external phy
-        */
+         */
        if (params->phy[INT_PHY].read_status)
                params->phy[INT_PHY].read_status(
                        &params->phy[INT_PHY],
                        params, vars);
-        /**
+        /*
         * The INT_PHY flow control reside in the vars. This include the
         * case where the speed or flow control are not set to AUTO.
         * Otherwise, the active external phy flow control result is set
@@ -3585,13 +3578,13 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
         */
        if (active_external_phy > INT_PHY) {
                vars->flow_ctrl = phy_vars[active_external_phy].flow_ctrl;
-                /**
+                /*
                 * Link speed is taken from the XGXS. AN and FC result from
                 * the external phy.
                 */
                vars->link_status |= phy_vars[active_external_phy].link_status;
-                /**
+                /*
                 * if active_external_phy is first PHY and link is up - disable
                 * disable TX on second external PHY
                 */
@@ -3627,7 +3620,7 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
        DP(NETIF_MSG_LINK, "vars->flow_ctrl = 0x%x, vars->link_status = 0x%x,"
                   " ext_phy_line_speed = %d\n", vars->flow_ctrl,
                   vars->link_status, ext_phy_line_speed);
-        /**
+        /*
         * Upon link speed change set the NIG into drain mode. Comes to
         * deals with possible FIFO glitch due to clk change when speed
         * is decreased without link down indicator
@@ -3642,8 +3635,8 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                                   ext_phy_line_speed);
                        vars->phy_link_up = 0;
                } else if (prev_line_speed != vars->line_speed) {
-                        REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE
+                        REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4,
-                                     + params->port*4, 0);
+                               0);
                        msleep(1);
                }
        }
@@ -3658,14 +3651,14 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
        bnx2x_link_int_ack(params, vars, link_10g);
-        /**
+        /*
-        * In case external phy link is up, and internal link is down
+         * In case external phy link is up, and internal link is down
-        * (not initialized yet probably after link initialization, it
+         * (not initialized yet probably after link initialization, it
-        * needs to be initialized.
+         * needs to be initialized.
-        * Note that after link down-up as result of cable plug, the xgxs
+         * Note that after link down-up as result of cable plug, the xgxs
-        * link would probably become up again without the need
+         * link would probably become up again without the need
-        * initialize it
+         * initialize it
-        */
+         */
        if (!(SINGLE_MEDIA_DIRECT(params))) {
                DP(NETIF_MSG_LINK, "ext_phy_link_up = %d, int_link_up = %d,"
                           " init_preceding = %d\n", ext_phy_link_up,
@@ -3685,9 +3678,9 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                                                vars);
                }
        }
-        /**
+        /*
-         *  Link is up only if both local phy and external phy (in case of
+         * Link is up only if both local phy and external phy (in case of
-         *  non-direct board) are up
+         * non-direct board) are up
         */
        vars->link_up = (vars->phy_link_up &&
                         (ext_phy_link_up ||
@@ -3708,10 +3701,10 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
 void bnx2x_ext_phy_hw_reset(struct bnx2x *bp, u8 port)
 {
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
        msleep(1);
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, port);
 }
 static void bnx2x_save_spirom_version(struct bnx2x *bp, u8 port,
@@ -3731,9 +3724,9 @@ static void bnx2x_save_bcm_spirom_ver(struct bnx2x *bp,
        u16 fw_ver1, fw_ver2;
        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_ROM_VER1, &fw_ver1);
+                        MDIO_PMA_REG_ROM_VER1, &fw_ver1);
        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_ROM_VER2, &fw_ver2);
+                        MDIO_PMA_REG_ROM_VER2, &fw_ver2);
        bnx2x_save_spirom_version(bp, port, (u32)(fw_ver1<<16 | fw_ver2),
                                  phy->ver_addr);
 }
@@ -3754,7 +3747,7 @@ static void bnx2x_ext_phy_set_pause(struct link_params *params,
        if ((vars->ieee_fc &
            MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) ==
            MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) {
-                val |=  MDIO_AN_REG_ADV_PAUSE_ASYMMETRIC;
+                val |= MDIO_AN_REG_ADV_PAUSE_ASYMMETRIC;
        }
        if ((vars->ieee_fc &
            MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) ==
@@ -3785,11 +3778,11 @@ static u8 bnx2x_ext_phy_resolve_fc(struct bnx2x_phy *phy,
        else if (vars->link_status & LINK_STATUS_AUTO_NEGOTIATE_COMPLETE) {
                ret = 1;
                bnx2x_cl45_read(bp, phy,
-                              MDIO_AN_DEVAD,
+                                MDIO_AN_DEVAD,
-                              MDIO_AN_REG_ADV_PAUSE, &ld_pause);
+                                MDIO_AN_REG_ADV_PAUSE, &ld_pause);
                bnx2x_cl45_read(bp, phy,
-                              MDIO_AN_DEVAD,
+                                MDIO_AN_DEVAD,
-                              MDIO_AN_REG_LP_AUTO_NEG, &lp_pause);
+                                MDIO_AN_REG_LP_AUTO_NEG, &lp_pause);
                pause_result = (ld_pause &
                                MDIO_AN_REG_ADV_PAUSE_MASK) >> 8;
                pause_result |= (lp_pause &
@@ -3854,90 +3847,82 @@ static void bnx2x_8073_resolve_fc(struct bnx2x_phy *phy,
                           pause_result);
        }
 }
+static u8 bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
-static void bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
                                              struct bnx2x_phy *phy,
                                              u8 port)
 {
+        u32 count = 0;
+        u16 fw_ver1, fw_msgout;
+        u8 rc = 0;
        /* Boot port from external ROM  */
        /* EDC grst */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
+                         MDIO_PMA_REG_GEN_CTRL,
-                       0x0001);
+                         0x0001);
        /* ucode reboot and rst */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
+                         MDIO_PMA_REG_GEN_CTRL,
-                       0x008c);
+                         0x008c);
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_MISC_CTRL1, 0x0001);
+                         MDIO_PMA_REG_MISC_CTRL1, 0x0001);
        /* Reset internal microprocessor */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
+                         MDIO_PMA_REG_GEN_CTRL,
-                       MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET);
+                         MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET);
        /* Release srst bit */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
+                         MDIO_PMA_REG_GEN_CTRL,
-                       MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
+                         MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
-        /* wait for 120ms for code download via SPI port */
+        /* Delay 100ms per the PHY specifications */
-        msleep(120);
+        msleep(100);
-        /* Clear ser_boot_ctl bit */
+        /* 8073 sometimes taking longer to download */
-        bnx2x_cl45_write(bp, phy,
+        do {
-                       MDIO_PMA_DEVAD,
+                count++;
-                       MDIO_PMA_REG_MISC_CTRL1, 0x0000);
+                if (count > 300) {
-        bnx2x_save_bcm_spirom_ver(bp, phy, port);
+                        DP(NETIF_MSG_LINK,
-}
+                                 "bnx2x_8073_8727_external_rom_boot port %x:"
+                                 "Download failed. fw version = 0x%x\n",
+                                 port, fw_ver1);
+                        rc = -EINVAL;
+                        break;
+                }
-static void bnx2x_8073_set_xaui_low_power_mode(struct bnx2x *bp,
+                bnx2x_cl45_read(bp, phy,
-                                               struct bnx2x_phy *phy)
+                                MDIO_PMA_DEVAD,
-{
+                                MDIO_PMA_REG_ROM_VER1, &fw_ver1);
-        u16 val;
+                bnx2x_cl45_read(bp, phy,
-        bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD,
-                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8073_CHIP_REV, &val);
+                                MDIO_PMA_REG_M8051_MSGOUT_REG, &fw_msgout);
-        if (val == 0) {
+                msleep(1);
-                /* Mustn't set low power mode in 8073 A0 */
+        } while (fw_ver1 == 0 || fw_ver1 == 0x4321 ||
-                return;
+                        ((fw_msgout & 0xff) != 0x03 && (phy->type ==
-        }
+                        PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073)));
-        /* Disable PLL sequencer (use read-modify-write to clear bit 13) */
+        /* Clear ser_boot_ctl bit */
-        bnx2x_cl45_read(bp, phy,
-                        MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, &val);
-        val &= ~(1<<13);
        bnx2x_cl45_write(bp, phy,
-                       MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, val);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_MISC_CTRL1, 0x0000);
-        /* PLL controls */
+        bnx2x_save_bcm_spirom_ver(bp, phy, port);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805E, 0x1077);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805D, 0x0000);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805C, 0x030B);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805B, 0x1240);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805A, 0x2490);
-        /* Tx Controls */
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80A7, 0x0C74);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80A6, 0x9041);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80A5, 0x4640);
-        /* Rx Controls */
+        DP(NETIF_MSG_LINK,
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80FE, 0x01C4);
+                 "bnx2x_8073_8727_external_rom_boot port %x:"
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80FD, 0x9249);
+                 "Download complete. fw version = 0x%x\n",
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80FC, 0x2015);
+                 port, fw_ver1);
-        /* Enable PLL sequencer  (use read-modify-write to set bit 13) */
+        return rc;
-        bnx2x_cl45_read(bp, phy, MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, &val);
-        val |= (1<<13);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, val);
 }
 /******************************************************************/
@@ -3950,8 +3935,8 @@ static u8 bnx2x_8073_is_snr_needed(struct bnx2x *bp, struct bnx2x_phy *phy)
        /* Read 8073 HW revision*/
        bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
+                        MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_8073_CHIP_REV, &val);
+                        MDIO_PMA_REG_8073_CHIP_REV, &val);
        if (val != 1) {
                /* No need to workaround in 8073 A1 */
@@ -3959,8 +3944,8 @@ static u8 bnx2x_8073_is_snr_needed(struct bnx2x *bp, struct bnx2x_phy *phy)
        }
        bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
+                        MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_ROM_VER2, &val);
+                        MDIO_PMA_REG_ROM_VER2, &val);
        /* SNR should be applied only for version 0x102 */
        if (val != 0x102)
@@ -3974,8 +3959,8 @@ static u8 bnx2x_8073_xaui_wa(struct bnx2x *bp, struct bnx2x_phy *phy)
        u16 val, cnt, cnt1 ;
        bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
+                        MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_8073_CHIP_REV, &val);
+                        MDIO_PMA_REG_8073_CHIP_REV, &val);
        if (val > 0) {
                /* No need to workaround in 8073 A1 */
@@ -3983,26 +3968,32 @@ static u8 bnx2x_8073_xaui_wa(struct bnx2x *bp, struct bnx2x_phy *phy)
        }
        /* XAUI workaround in 8073 A0: */
-        /* After loading the boot ROM and restarting Autoneg,
+        /*
-        poll Dev1, Reg $C820: */
+         * After loading the boot ROM and restarting Autoneg, poll
+         * Dev1, Reg $C820:
+         */
        for (cnt = 0; cnt < 1000; cnt++) {
                bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_8073_SPEED_LINK_STATUS,
+                                MDIO_PMA_REG_8073_SPEED_LINK_STATUS,
-                              &val);
+                                &val);
-                  /* If bit [14] = 0 or bit [13] = 0, continue on with
+                  /*
-                   system initialization (XAUI work-around not required,
+                   * If bit [14] = 0 or bit [13] = 0, continue on with
-                    as these bits indicate 2.5G or 1G link up). */
+                   * system initialization (XAUI work-around not required, as
+                   * these bits indicate 2.5G or 1G link up).
+                   */
                if (!(val & (1<<14)) || !(val & (1<<13))) {
                        DP(NETIF_MSG_LINK, "XAUI work-around not required\n");
                        return 0;
                } else if (!(val & (1<<15))) {
-                        DP(NETIF_MSG_LINK, "clc bit 15 went off\n");
+                        DP(NETIF_MSG_LINK, "bit 15 went off\n");
-                         /* If bit 15 is 0, then poll Dev1, Reg $C841 until
+                        /*
-                          it's MSB (bit 15) goes to 1 (indicating that the
+                         * If bit 15 is 0, then poll Dev1, Reg $C841 until it's
-                          XAUI workaround has completed),
+                         * MSB (bit15) goes to 1 (indicating that the XAUI
-                          then continue on with system initialization.*/
+                         * workaround has completed), then continue on with
+                         * system initialization.
+                         */
                        for (cnt1 = 0; cnt1 < 1000; cnt1++) {
                                bnx2x_cl45_read(bp, phy,
                                        MDIO_PMA_DEVAD,
@@ -4085,10 +4076,10 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
                gpio_port = params->port;
        /* Restore normal power mode*/
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, gpio_port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, gpio_port);
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, gpio_port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, gpio_port);
        /* enable LASI */
        bnx2x_cl45_write(bp, phy,
@@ -4098,8 +4089,6 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
        bnx2x_8073_set_pause_cl37(params, phy, vars);
-        bnx2x_8073_set_xaui_low_power_mode(bp, phy);
        bnx2x_cl45_read(bp, phy,
                        MDIO_PMA_DEVAD, MDIO_PMA_REG_M8051_MSGOUT_REG, &tmp1);
@@ -4108,6 +4097,21 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
        DP(NETIF_MSG_LINK, "Before rom RX_ALARM(port1): 0x%x\n", tmp1);
+        /* Swap polarity if required - Must be done only in non-1G mode */
+        if (params->lane_config & PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED) {
+                /* Configure the 8073 to swap _P and _N of the KR lines */
+                DP(NETIF_MSG_LINK, "Swapping polarity for the 8073\n");
+                /* 10G Rx/Tx and 1G Tx signal polarity swap */
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_8073_OPT_DIGITAL_CTRL, &val);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_8073_OPT_DIGITAL_CTRL,
+                                 (val | (3<<9)));
+        }
        /* Enable CL37 BAM */
        if (REG_RD(bp, params->shmem_base +
                         offsetof(struct shmem_region, dev_info.
@@ -4135,8 +4139,10 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
                        val = (1<<7);
                } else if (phy->req_line_speed ==  SPEED_2500) {
                        val = (1<<5);
-                        /* Note that 2.5G works only
+                        /*
-                        when used with 1G advertisment */
+                         * Note that 2.5G works only when used with 1G
+                         * advertisment
+                         */
                } else
                        val = (1<<5);
        } else {
@@ -4145,8 +4151,7 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
                        PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)
                        val |= (1<<7);
-                /* Note that 2.5G works only when
+                /* Note that 2.5G works only when used with 1G advertisment */
-                used with 1G advertisment */
                if (phy->speed_cap_mask &
                        (PORT_HW_CFG_SPEED_CAPABILITY_D0_1G |
                         PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G))
@@ -4186,9 +4191,11 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
        /* Add support for CL37 (passive mode) III */
        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1000);
-        /* The SNR will improve about 2db by changing
+        /*
-        BW and FEE main tap. Rest commands are executed
+         * The SNR will improve about 2db by changing BW and FEE main
-        after link is up*/
+         * tap. Rest commands are executed after link is up
+         * Change FFE main cursor to 5 in EDC register
+         */
        if (bnx2x_8073_is_snr_needed(bp, phy))
                bnx2x_cl45_write(bp, phy,
                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_EDC_FFE_MAIN,
@@ -4272,12 +4279,11 @@ static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,
        link_up = (((val1 & 4) == 4) || (an1000_status & (1<<1)));
        if (link_up && bnx2x_8073_is_snr_needed(bp, phy)) {
-                /* The SNR will improve about 2dbby
+                /*
-                changing the BW and FEE main tap.*/
+                 * The SNR will improve about 2dbby changing the BW and FEE main
-                /* The 1st write to change FFE main
+                 * tap. The 1st write to change FFE main tap is set before
-                tap is set before restart AN */
+                 * restart AN. Change PLL Bandwidth in EDC register
-                /* Change PLL Bandwidth in EDC
+                 */
-                register */
                bnx2x_cl45_write(bp, phy,
                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_PLL_BANDWIDTH,
                                 0x26BC);
@@ -4314,8 +4320,32 @@ static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,
        }
        if (link_up) {
+                /* Swap polarity if required */
+                if (params->lane_config &
+                    PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED) {
+                        /* Configure the 8073 to swap P and N of the KR lines */
+                        bnx2x_cl45_read(bp, phy,
+                                        MDIO_XS_DEVAD,
+                                        MDIO_XS_REG_8073_RX_CTRL_PCIE, &val1);
+                        /*
+                         * Set bit 3 to invert Rx in 1G mode and clear this bit
+                         * when it`s in 10G mode.
+                         */
+                        if (vars->line_speed == SPEED_1000) {
+                                DP(NETIF_MSG_LINK, "Swapping 1G polarity for"
+                                              "the 8073\n");
+                                val1 |= (1<<3);
+                        } else
+                                val1 &= ~(1<<3);
+                        bnx2x_cl45_write(bp, phy,
+                                         MDIO_XS_DEVAD,
+                                         MDIO_XS_REG_8073_RX_CTRL_PCIE,
+                                         val1);
+                }
                bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
                bnx2x_8073_resolve_fc(phy, params, vars);
+                vars->duplex = DUPLEX_FULL;
        }
        return link_up;
 }
@@ -4332,8 +4362,8 @@ static void bnx2x_8073_link_reset(struct bnx2x_phy *phy,
        DP(NETIF_MSG_LINK, "Setting 8073 port %d into low power mode\n",
           gpio_port);
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW,
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW,
-                            gpio_port);
+                       gpio_port);
 }
 /******************************************************************/
@@ -4347,11 +4377,11 @@ static u8 bnx2x_8705_config_init(struct bnx2x_phy *phy,
        DP(NETIF_MSG_LINK, "init 8705\n");
        /* Restore normal power mode*/
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
        /* HW reset */
        bnx2x_ext_phy_hw_reset(bp, params->port);
        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 0xa040);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
        bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_MISC_CTRL, 0x8288);
@@ -4402,35 +4432,79 @@ static u8 bnx2x_8705_read_status(struct bnx2x_phy *phy,
 /******************************************************************/
 /*                      SFP+ module Section                       */
 /******************************************************************/
-static void bnx2x_sfp_set_transmitter(struct bnx2x *bp,
+static u8 bnx2x_get_gpio_port(struct link_params *params)
+{
+        u8 gpio_port;
+        u32 swap_val, swap_override;
+        struct bnx2x *bp = params->bp;
+        if (CHIP_IS_E2(bp))
+                gpio_port = BP_PATH(bp);
+        else
+                gpio_port = params->port;
+        swap_val = REG_RD(bp, NIG_REG_PORT_SWAP);
+        swap_override = REG_RD(bp, NIG_REG_STRAP_OVERRIDE);
+        return gpio_port ^ (swap_val && swap_override);
+}
+static void bnx2x_sfp_set_transmitter(struct link_params *params,
                                      struct bnx2x_phy *phy,
-                                      u8 port,
                                      u8 tx_en)
 {
        u16 val;
+        u8 port = params->port;
+        struct bnx2x *bp = params->bp;
+        u32 tx_en_mode;
-        DP(NETIF_MSG_LINK, "Setting transmitter tx_en=%x for port %x\n",
-                 tx_en, port);
        /* Disable/Enable transmitter ( TX laser of the SFP+ module.)*/
-        bnx2x_cl45_read(bp, phy,
+        tx_en_mode = REG_RD(bp, params->shmem_base +
-                      MDIO_PMA_DEVAD,
+                            offsetof(struct shmem_region,
-                      MDIO_PMA_REG_PHY_IDENTIFIER,
+                                     dev_info.port_hw_config[port].sfp_ctrl)) &
-                      &val);
+                PORT_HW_CFG_TX_LASER_MASK;
+        DP(NETIF_MSG_LINK, "Setting transmitter tx_en=%x for port %x "
+                           "mode = %x\n", tx_en, port, tx_en_mode);
+        switch (tx_en_mode) {
+        case PORT_HW_CFG_TX_LASER_MDIO:
-        if (tx_en)
+                bnx2x_cl45_read(bp, phy,
-                val &= ~(1<<15);
+                                MDIO_PMA_DEVAD,
-        else
+                                MDIO_PMA_REG_PHY_IDENTIFIER,
-                val |= (1<<15);
+                                &val);
-        bnx2x_cl45_write(bp, phy,
+                if (tx_en)
-                       MDIO_PMA_DEVAD,
+                        val &= ~(1<<15);
-                       MDIO_PMA_REG_PHY_IDENTIFIER,
+                else
-                       val);
+                        val |= (1<<15);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_PHY_IDENTIFIER,
+                                 val);
+        break;
+        case PORT_HW_CFG_TX_LASER_GPIO0:
+        case PORT_HW_CFG_TX_LASER_GPIO1:
+        case PORT_HW_CFG_TX_LASER_GPIO2:
+        case PORT_HW_CFG_TX_LASER_GPIO3:
+        {
+                u16 gpio_pin;
+                u8 gpio_port, gpio_mode;
+                if (tx_en)
+                        gpio_mode = MISC_REGISTERS_GPIO_OUTPUT_HIGH;
+                else
+                        gpio_mode = MISC_REGISTERS_GPIO_OUTPUT_LOW;
+                gpio_pin = tx_en_mode - PORT_HW_CFG_TX_LASER_GPIO0;
+                gpio_port = bnx2x_get_gpio_port(params);
+                bnx2x_set_gpio(bp, gpio_pin, gpio_mode, gpio_port);
+                break;
+        }
+        default:
+                DP(NETIF_MSG_LINK, "Invalid TX_LASER_MDIO 0x%x\n", tx_en_mode);
+                break;
+        }
 }
 static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                                            struct link_params *params,
-                                          u16 addr, u8 byte_cnt, u8 *o_buf)
+                                            u16 addr, u8 byte_cnt, u8 *o_buf)
 {
        struct bnx2x *bp = params->bp;
        u16 val = 0;
@@ -4443,23 +4517,23 @@ static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
        /* Set the read command byte count */
        bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_SFP_TWO_WIRE_BYTE_CNT,
-                       (byte_cnt | 0xa000));
+                         (byte_cnt | 0xa000));
        /* Set the read command address */
        bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_SFP_TWO_WIRE_MEM_ADDR,
-                       addr);
+                         addr);
        /* Activate read command */
        bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
-                       0x2c0f);
+                         0x2c0f);
        /* Wait up to 500us for command complete status */
        for (i = 0; i < 100; i++) {
                bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
+                                MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
                if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
                    MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_COMPLETE)
                        break;
@@ -4477,15 +4551,15 @@ static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
        /* Read the buffer */
        for (i = 0; i < byte_cnt; i++) {
                bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_8726_TWO_WIRE_DATA_BUF + i, &val);
+                                MDIO_PMA_REG_8726_TWO_WIRE_DATA_BUF + i, &val);
                o_buf[i] = (u8)(val & MDIO_PMA_REG_8726_TWO_WIRE_DATA_MASK);
        }
        for (i = 0; i < 100; i++) {
                bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
+                                MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
                if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
                    MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE)
                        return 0;
@@ -4496,7 +4570,7 @@ static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
 static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                                            struct link_params *params,
-                                          u16 addr, u8 byte_cnt, u8 *o_buf)
+                                            u16 addr, u8 byte_cnt, u8 *o_buf)
 {
        struct bnx2x *bp = params->bp;
        u16 val, i;
@@ -4509,41 +4583,43 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
        /* Need to read from 1.8000 to clear it */
        bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
+                        MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
+                        MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
-                      &val);
+                        &val);
        /* Set the read command byte count */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_SFP_TWO_WIRE_BYTE_CNT,
+                         MDIO_PMA_REG_SFP_TWO_WIRE_BYTE_CNT,
-                       ((byte_cnt < 2) ? 2 : byte_cnt));
+                         ((byte_cnt < 2) ? 2 : byte_cnt));
        /* Set the read command address */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_SFP_TWO_WIRE_MEM_ADDR,
+                         MDIO_PMA_REG_SFP_TWO_WIRE_MEM_ADDR,
-                       addr);
+                         addr);
        /* Set the destination address */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       0x8004,
+                         0x8004,
-                       MDIO_PMA_REG_8727_TWO_WIRE_DATA_BUF);
+                         MDIO_PMA_REG_8727_TWO_WIRE_DATA_BUF);
        /* Activate read command */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
+                         MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
-                       0x8002);
+                         0x8002);
-        /* Wait appropriate time for two-wire command to finish before
+        /*
-        polling the status register */
+         * Wait appropriate time for two-wire command to finish before
+         * polling the status register
+         */
        msleep(1);
        /* Wait up to 500us for command complete status */
        for (i = 0; i < 100; i++) {
                bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
+                                MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
                if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
                    MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_COMPLETE)
                        break;
@@ -4555,21 +4631,21 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                DP(NETIF_MSG_LINK,
                         "Got bad status 0x%x when reading from SFP+ EEPROM\n",
                         (val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK));
-                return -EINVAL;
+                return -EFAULT;
        }
        /* Read the buffer */
        for (i = 0; i < byte_cnt; i++) {
                bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_8727_TWO_WIRE_DATA_BUF + i, &val);
+                                MDIO_PMA_REG_8727_TWO_WIRE_DATA_BUF + i, &val);
                o_buf[i] = (u8)(val & MDIO_PMA_REG_8727_TWO_WIRE_DATA_MASK);
        }
        for (i = 0; i < 100; i++) {
                bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
+                                MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
                if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
                    MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE)
                        return 0;
@@ -4579,22 +4655,22 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
        return -EINVAL;
 }
-static u8 bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,
+u8 bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,
-                                       struct link_params *params, u16 addr,
+                                struct link_params *params, u16 addr,
-                                       u8 byte_cnt, u8 *o_buf)
+                                u8 byte_cnt, u8 *o_buf)
 {
        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726)
                return bnx2x_8726_read_sfp_module_eeprom(phy, params, addr,
-                                                       byte_cnt, o_buf);
+                                                         byte_cnt, o_buf);
        else if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727)
                return bnx2x_8727_read_sfp_module_eeprom(phy, params, addr,
-                                                       byte_cnt, o_buf);
+                                                         byte_cnt, o_buf);
        return -EINVAL;
 }
 static u8 bnx2x_get_edc_mode(struct bnx2x_phy *phy,
                             struct link_params *params,
-                                  u16 *edc_mode)
+                             u16 *edc_mode)
 {
        struct bnx2x *bp = params->bp;
        u8 val, check_limiting_mode = 0;
@@ -4615,8 +4691,10 @@ static u8 bnx2x_get_edc_mode(struct bnx2x_phy *phy,
        {
                u8 copper_module_type;
-                /* Check if its active cable( includes SFP+ module)
+                /*
-                of passive cable*/
+                 * Check if its active cable (includes SFP+ module)
+                 * of passive cable
+                 */
                if (bnx2x_read_sfp_module_eeprom(phy,
                                               params,
                                               SFP_EEPROM_FC_TX_TECH_ADDR,
@@ -4675,8 +4753,10 @@ static u8 bnx2x_get_edc_mode(struct bnx2x_phy *phy,
        DP(NETIF_MSG_LINK, "EDC mode is set to 0x%x\n", *edc_mode);
        return 0;
 }
-/* This function read the relevant field from the module ( SFP+ ),
+/*
-        and verify it is compliant with this board */
+ * This function read the relevant field from the module (SFP+), and verify it
+ * is compliant with this board
+ */
 static u8 bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
                                  struct link_params *params)
 {
@@ -4725,24 +4805,24 @@ static u8 bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
        /* format the warning message */
        if (bnx2x_read_sfp_module_eeprom(phy,
                                         params,
-                                       SFP_EEPROM_VENDOR_NAME_ADDR,
+                                         SFP_EEPROM_VENDOR_NAME_ADDR,
-                                       SFP_EEPROM_VENDOR_NAME_SIZE,
+                                         SFP_EEPROM_VENDOR_NAME_SIZE,
-                                       (u8 *)vendor_name))
+                                         (u8 *)vendor_name))
                vendor_name[0] = '\0';
        else
                vendor_name[SFP_EEPROM_VENDOR_NAME_SIZE] = '\0';
        if (bnx2x_read_sfp_module_eeprom(phy,
                                         params,
-                                       SFP_EEPROM_PART_NO_ADDR,
+                                         SFP_EEPROM_PART_NO_ADDR,
-                                       SFP_EEPROM_PART_NO_SIZE,
+                                         SFP_EEPROM_PART_NO_SIZE,
-                                       (u8 *)vendor_pn))
+                                         (u8 *)vendor_pn))
                vendor_pn[0] = '\0';
        else
                vendor_pn[SFP_EEPROM_PART_NO_SIZE] = '\0';
-        netdev_info(bp->dev, "Warning: Unqualified SFP+ module detected,"
+        netdev_err(bp->dev,  "Warning: Unqualified SFP+ module detected,"
-                             " Port %d from %s part number %s\n",
+                              " Port %d from %s part number %s\n",
-                    params->port, vendor_name, vendor_pn);
+                         params->port, vendor_name, vendor_pn);
        phy->flags |= FLAGS_SFP_NOT_APPROVED;
        return -EINVAL;
 }
@@ -4754,8 +4834,11 @@ static u8 bnx2x_wait_for_sfp_module_initialized(struct bnx2x_phy *phy,
        u8 val;
        struct bnx2x *bp = params->bp;
        u16 timeout;
-        /* Initialization time after hot-plug may take up to 300ms for some
+        /*
-        phys type ( e.g. JDSU ) */
+         * Initialization time after hot-plug may take up to 300ms for
+         * some phys type ( e.g. JDSU )
+         */
        for (timeout = 0; timeout < 60; timeout++) {
                if (bnx2x_read_sfp_module_eeprom(phy, params, 1, 1, &val)
                    == 0) {
@@ -4774,16 +4857,14 @@ static void bnx2x_8727_power_module(struct bnx2x *bp,
        /* Make sure GPIOs are not using for LED mode */
        u16 val;
        /*
-         * In the GPIO register, bit 4 is use to detemine if the GPIOs are
+         * In the GPIO register, bit 4 is use to determine if the GPIOs are
         * operating as INPUT or as OUTPUT. Bit 1 is for input, and 0 for
         * output
         * Bits 0-1 determine the gpios value for OUTPUT in case bit 4 val is 0
         * Bits 8-9 determine the gpios value for INPUT in case bit 4 val is 1
         * where the 1st bit is the over-current(only input), and 2nd bit is
         * for power( only output )
-        */
+         *
-        /*
         * In case of NOC feature is disabled and power is up, set GPIO control
         *  as input to enable listening of over-current indication
         */
@@ -4812,15 +4893,14 @@ static u8 bnx2x_8726_set_limiting_mode(struct bnx2x *bp,
        u16 cur_limiting_mode;
        bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
+                        MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_ROM_VER2,
+                        MDIO_PMA_REG_ROM_VER2,
-                      &cur_limiting_mode);
+                        &cur_limiting_mode);
        DP(NETIF_MSG_LINK, "Current Limiting mode is 0x%x\n",
                 cur_limiting_mode);
        if (edc_mode == EDC_MODE_LIMITING) {
-                DP(NETIF_MSG_LINK,
+                DP(NETIF_MSG_LINK, "Setting LIMITING MODE\n");
-                         "Setting LIMITING MODE\n");
                bnx2x_cl45_write(bp, phy,
                                 MDIO_PMA_DEVAD,
                                 MDIO_PMA_REG_ROM_VER2,
@@ -4829,62 +4909,63 @@ static u8 bnx2x_8726_set_limiting_mode(struct bnx2x *bp,
                DP(NETIF_MSG_LINK, "Setting LRM MODE\n");
-                /* Changing to LRM mode takes quite few seconds.
+                /*
-                So do it only if current mode is limiting
+                 * Changing to LRM mode takes quite few seconds. So do it only
-                ( default is LRM )*/
+                 * if current mode is limiting (default is LRM)
+                 */
                if (cur_limiting_mode != EDC_MODE_LIMITING)
                        return 0;
                bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
+                                 MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_LRM_MODE,
+                                 MDIO_PMA_REG_LRM_MODE,
-                               0);
+                                 0);
                bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
+                                 MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_ROM_VER2,
+                                 MDIO_PMA_REG_ROM_VER2,
-                               0x128);
+                                 0x128);
                bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
+                                 MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_MISC_CTRL0,
+                                 MDIO_PMA_REG_MISC_CTRL0,
-                               0x4008);
+                                 0x4008);
                bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
+                                 MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_LRM_MODE,
+                                 MDIO_PMA_REG_LRM_MODE,
-                               0xaaaa);
+                                 0xaaaa);
        }
        return 0;
 }
 static u8 bnx2x_8727_set_limiting_mode(struct bnx2x *bp,
                                       struct bnx2x_phy *phy,
-                                        u16 edc_mode)
+                                       u16 edc_mode)
 {
        u16 phy_identifier;
        u16 rom_ver2_val;
        bnx2x_cl45_read(bp, phy,
-                       MDIO_PMA_DEVAD,
+                        MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_PHY_IDENTIFIER,
+                        MDIO_PMA_REG_PHY_IDENTIFIER,
-                       &phy_identifier);
+                        &phy_identifier);
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_PHY_IDENTIFIER,
+                         MDIO_PMA_REG_PHY_IDENTIFIER,
-                       (phy_identifier & ~(1<<9)));
+                         (phy_identifier & ~(1<<9)));
        bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
+                        MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_ROM_VER2,
+                        MDIO_PMA_REG_ROM_VER2,
-                      &rom_ver2_val);
+                        &rom_ver2_val);
        /* Keep the MSB 8-bits, and set the LSB 8-bits with the edc_mode */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_ROM_VER2,
+                         MDIO_PMA_REG_ROM_VER2,
-                       (rom_ver2_val & 0xff00) | (edc_mode & 0x00ff));
+                         (rom_ver2_val & 0xff00) | (edc_mode & 0x00ff));
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_PHY_IDENTIFIER,
+                         MDIO_PMA_REG_PHY_IDENTIFIER,
-                       (phy_identifier | (1<<9)));
+                         (phy_identifier | (1<<9)));
        return 0;
 }
@@ -4897,11 +4978,11 @@ static void bnx2x_8727_specific_func(struct bnx2x_phy *phy,
        switch (action) {
        case DISABLE_TX:
-                bnx2x_sfp_set_transmitter(bp, phy, params->port, 0);
+                bnx2x_sfp_set_transmitter(params, phy, 0);
                break;
        case ENABLE_TX:
                if (!(phy->flags & FLAGS_SFP_NOT_APPROVED))
-                        bnx2x_sfp_set_transmitter(bp, phy, params->port, 1);
+                        bnx2x_sfp_set_transmitter(params, phy, 1);
                break;
        default:
                DP(NETIF_MSG_LINK, "Function 0x%x not supported by 8727\n",
@@ -4910,6 +4991,38 @@ static void bnx2x_8727_specific_func(struct bnx2x_phy *phy,
        }
 }
+static void bnx2x_set_sfp_module_fault_led(struct link_params *params,
+                                           u8 gpio_mode)
+{
+        struct bnx2x *bp = params->bp;
+        u32 fault_led_gpio = REG_RD(bp, params->shmem_base +
+                            offsetof(struct shmem_region,
+                        dev_info.port_hw_config[params->port].sfp_ctrl)) &
+                PORT_HW_CFG_FAULT_MODULE_LED_MASK;
+        switch (fault_led_gpio) {
+        case PORT_HW_CFG_FAULT_MODULE_LED_DISABLED:
+                return;
+        case PORT_HW_CFG_FAULT_MODULE_LED_GPIO0:
+        case PORT_HW_CFG_FAULT_MODULE_LED_GPIO1:
+        case PORT_HW_CFG_FAULT_MODULE_LED_GPIO2:
+        case PORT_HW_CFG_FAULT_MODULE_LED_GPIO3:
+        {
+                u8 gpio_port = bnx2x_get_gpio_port(params);
+                u16 gpio_pin = fault_led_gpio -
+                        PORT_HW_CFG_FAULT_MODULE_LED_GPIO0;
+                DP(NETIF_MSG_LINK, "Set fault module-detected led "
+                                   "pin %x port %x mode %x\n",
+                               gpio_pin, gpio_port, gpio_mode);
+                bnx2x_set_gpio(bp, gpio_pin, gpio_mode, gpio_port);
+        }
+        break;
+        default:
+                DP(NETIF_MSG_LINK, "Error: Invalid fault led mode 0x%x\n",
+                               fault_led_gpio);
+        }
+}
 static u8 bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
                                     struct link_params *params)
 {
@@ -4927,15 +5040,14 @@ static u8 bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
        if (bnx2x_get_edc_mode(phy, params, &edc_mode) != 0) {
                DP(NETIF_MSG_LINK, "Failed to get valid module type\n");
                return -EINVAL;
-        } else if (bnx2x_verify_sfp_module(phy, params) !=
+        } else if (bnx2x_verify_sfp_module(phy, params) != 0) {
-                   0) {
                /* check SFP+ module compatibility */
                DP(NETIF_MSG_LINK, "Module verification failed!!\n");
                rc = -EINVAL;
                /* Turn on fault module-detected led */
-                bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
+                bnx2x_set_sfp_module_fault_led(params,
-                                  MISC_REGISTERS_GPIO_HIGH,
+                                               MISC_REGISTERS_GPIO_HIGH);
-                                  params->port);
                if ((phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727) &&
                    ((val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) ==
                     PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_POWER_DOWN)) {
@@ -4946,18 +5058,17 @@ static u8 bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
                }
        } else {
                /* Turn off fault module-detected led */
-                DP(NETIF_MSG_LINK, "Turn off fault module-detected led\n");
+                bnx2x_set_sfp_module_fault_led(params, MISC_REGISTERS_GPIO_LOW);
-                bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
-                                          MISC_REGISTERS_GPIO_LOW,
-                                          params->port);
        }
        /* power up the SFP module */
        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727)
                bnx2x_8727_power_module(bp, phy, 1);
-        /* Check and set limiting mode / LRM mode on 8726.
+        /*
-        On 8727 it is done automatically */
+         * Check and set limiting mode / LRM mode on 8726. On 8727 it
+         * is done automatically
+         */
        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726)
                bnx2x_8726_set_limiting_mode(bp, phy, edc_mode);
        else
@@ -4969,9 +5080,9 @@ static u8 bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
        if (rc == 0 ||
            (val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) !=
            PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_DISABLE_TX_LASER)
-                bnx2x_sfp_set_transmitter(bp, phy, params->port, 1);
+                bnx2x_sfp_set_transmitter(params, phy, 1);
        else
-                bnx2x_sfp_set_transmitter(bp, phy, params->port, 0);
+                bnx2x_sfp_set_transmitter(params, phy, 0);
        return rc;
 }
@@ -4984,11 +5095,9 @@ void bnx2x_handle_module_detect_int(struct link_params *params)
        u8 port = params->port;
        /* Set valid module led off */
-        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
+        bnx2x_set_sfp_module_fault_led(params, MISC_REGISTERS_GPIO_HIGH);
-                          MISC_REGISTERS_GPIO_HIGH,
-                          params->port);
-        /* Get current gpio val refelecting module plugged in / out*/
+        /* Get current gpio val reflecting module plugged in / out*/
        gpio_val = bnx2x_get_gpio(bp, MISC_REGISTERS_GPIO_3, port);
        /* Call the handling function in case module is detected */
@@ -5004,18 +5113,20 @@ void bnx2x_handle_module_detect_int(struct link_params *params)
                        DP(NETIF_MSG_LINK, "SFP+ module is not initialized\n");
        } else {
                u32 val = REG_RD(bp, params->shmem_base +
-                                     offsetof(struct shmem_region, dev_info.
+                                 offsetof(struct shmem_region, dev_info.
-                                              port_feature_config[params->port].
+                                          port_feature_config[params->port].
-                                              config));
+                                          config));
                bnx2x_set_gpio_int(bp, MISC_REGISTERS_GPIO_3,
                                   MISC_REGISTERS_GPIO_INT_OUTPUT_SET,
                                   port);
-                /* Module was plugged out. */
+                /*
-                /* Disable transmit for this module */
+                 * Module was plugged out.
+                 * Disable transmit for this module
+                 */
                if ((val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) ==
                    PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_DISABLE_TX_LASER)
-                        bnx2x_sfp_set_transmitter(bp, phy, params->port, 0);
+                        bnx2x_sfp_set_transmitter(params, phy, 0);
        }
 }
@@ -5051,9 +5162,9 @@ static u8 bnx2x_8706_8726_read_status(struct bnx2x_phy *phy,
        DP(NETIF_MSG_LINK, "8706/8726 rx_sd 0x%x pcs_status 0x%x 1Gbps"
                        " link_status 0x%x\n", rx_sd, pcs_status, val2);
-        /* link is up if both bit 0 of pmd_rx_sd and
+        /*
-         * bit 0 of pcs_status are set, or if the autoneg bit
+         * link is up if both bit 0 of pmd_rx_sd and bit 0 of pcs_status
-         * 1 is set
+         * are set, or if the autoneg bit 1 is set
         */
        link_up = ((rx_sd & pcs_status & 0x1) || (val2 & (1<<1)));
        if (link_up) {
@@ -5062,6 +5173,7 @@ static u8 bnx2x_8706_8726_read_status(struct bnx2x_phy *phy,
                else
                        vars->line_speed = SPEED_10000;
                bnx2x_ext_phy_resolve_fc(phy, params, vars);
+                vars->duplex = DUPLEX_FULL;
        }
        return link_up;
 }
@@ -5073,14 +5185,15 @@ static u8 bnx2x_8706_config_init(struct bnx2x_phy *phy,
                                 struct link_params *params,
                                 struct link_vars *vars)
 {
-        u16 cnt, val;
+        u32 tx_en_mode;
+        u16 cnt, val, tmp1;
        struct bnx2x *bp = params->bp;
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
        /* HW reset */
        bnx2x_ext_phy_hw_reset(bp, params->port);
        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 0xa040);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
        /* Wait until fw is loaded */
        for (cnt = 0; cnt < 100; cnt++) {
@@ -5147,6 +5260,26 @@ static u8 bnx2x_8706_config_init(struct bnx2x_phy *phy,
                                 0x0004);
        }
        bnx2x_save_bcm_spirom_ver(bp, phy, params->port);
+        /*
+         * If TX Laser is controlled by GPIO_0, do not let PHY go into low
+         * power mode, if TX Laser is disabled
+         */
+        tx_en_mode = REG_RD(bp, params->shmem_base +
+                            offsetof(struct shmem_region,
+                                dev_info.port_hw_config[params->port].sfp_ctrl))
+                        & PORT_HW_CFG_TX_LASER_MASK;
+        if (tx_en_mode == PORT_HW_CFG_TX_LASER_GPIO0) {
+                DP(NETIF_MSG_LINK, "Enabling TXONOFF_PWRDN_DIS\n");
+                bnx2x_cl45_read(bp, phy,
+                        MDIO_PMA_DEVAD, MDIO_PMA_REG_DIGITAL_CTRL, &tmp1);
+                tmp1 |= 0x1;
+                bnx2x_cl45_write(bp, phy,
+                        MDIO_PMA_DEVAD, MDIO_PMA_REG_DIGITAL_CTRL, tmp1);
+        }
        return 0;
 }
@@ -5181,26 +5314,26 @@ static void bnx2x_8726_external_rom_boot(struct bnx2x_phy *phy,
        /* Set soft reset */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
+                         MDIO_PMA_REG_GEN_CTRL,
-                       MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET);
+                         MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET);
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_MISC_CTRL1, 0x0001);
+                         MDIO_PMA_REG_MISC_CTRL1, 0x0001);
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
+                         MDIO_PMA_REG_GEN_CTRL,
-                       MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
+                         MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
        /* wait for 150ms for microcode load */
        msleep(150);
        /* Disable serial boot control, tristates pins SS_N, SCK, MOSI, MISO */
        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
+                         MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_MISC_CTRL1, 0x0000);
+                         MDIO_PMA_REG_MISC_CTRL1, 0x0000);
        msleep(200);
        bnx2x_save_bcm_spirom_ver(bp, phy, params->port);
@@ -5235,23 +5368,18 @@ static u8 bnx2x_8726_config_init(struct bnx2x_phy *phy,
        u32 val;
        u32 swap_val, swap_override, aeu_gpio_mask, offset;
        DP(NETIF_MSG_LINK, "Initializing BCM8726\n");
-        /* Restore normal power mode*/
-        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
-        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 1<<15);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
        bnx2x_8726_external_rom_boot(phy, params);
-        /* Need to call module detected on initialization since
+        /*
-        the module detection triggered by actual module
+         * Need to call module detected on initialization since the module
-        insertion might occur before driver is loaded, and when
+         * detection triggered by actual module insertion might occur before
-        driver is loaded, it reset all registers, including the
+         * driver is loaded, and when driver is loaded, it reset all
-        transmitter */
+         * registers, including the transmitter
+         */
        bnx2x_sfp_module_detection(phy, params);
        if (phy->req_line_speed == SPEED_1000) {
@@ -5284,8 +5412,10 @@ static u8 bnx2x_8726_config_init(struct bnx2x_phy *phy,
                                 MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1000);
                bnx2x_cl45_write(bp, phy,
                                MDIO_AN_DEVAD, MDIO_AN_REG_CTRL, 0x1200);
-                /* Enable RX-ALARM control to receive
+                /*
-                interrupt for 1G speed change */
+                 * Enable RX-ALARM control to receive interrupt for 1G speed
+                 * change
+                 */
                bnx2x_cl45_write(bp, phy,
                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_LASI_CTRL, 0x4);
                bnx2x_cl45_write(bp, phy,
@@ -5317,7 +5447,7 @@ static u8 bnx2x_8726_config_init(struct bnx2x_phy *phy,
        /* Set GPIO3 to trigger SFP+ module insertion/removal */
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_3,
-                            MISC_REGISTERS_GPIO_INPUT_HI_Z, params->port);
+                       MISC_REGISTERS_GPIO_INPUT_HI_Z, params->port);
        /* The GPIO should be swapped if the swap register is set and active */
        swap_val = REG_RD(bp, NIG_REG_PORT_SWAP);
@@ -5408,7 +5538,7 @@ static void bnx2x_8727_hw_reset(struct bnx2x_phy *phy,
                                struct link_params *params) {
        u32 swap_val, swap_override;
        u8 port;
-        /**
+        /*
         * The PHY reset is controlled by GPIO 1. Fake the port number
         * to cancel the swap done in set_gpio()
         */
@@ -5417,20 +5547,21 @@ static void bnx2x_8727_hw_reset(struct bnx2x_phy *phy,
        swap_override = REG_RD(bp, NIG_REG_STRAP_OVERRIDE);
        port = (swap_val && swap_override) ^ 1;
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
 }
 static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
                                 struct link_params *params,
                                 struct link_vars *vars)
 {
-        u16 tmp1, val, mod_abs;
+        u32 tx_en_mode;
+        u16 tmp1, val, mod_abs, tmp2;
        u16 rx_alarm_ctrl_val;
        u16 lasi_ctrl_val;
        struct bnx2x *bp = params->bp;
        /* Enable PMD link, MOD_ABS_FLT, and 1G link alarm */
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
        rx_alarm_ctrl_val = (1<<2) | (1<<5) ;
        lasi_ctrl_val = 0x0004;
@@ -5443,14 +5574,17 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
        bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_LASI_CTRL, lasi_ctrl_val);
-        /* Initially configure  MOD_ABS to interrupt when
+        /*
-        module is presence( bit 8) */
+         * Initially configure MOD_ABS to interrupt when module is
+         * presence( bit 8)
+         */
        bnx2x_cl45_read(bp, phy,
                        MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER, &mod_abs);
-        /* Set EDC off by setting OPTXLOS signal input to low
+        /*
-        (bit 9).
+         * Set EDC off by setting OPTXLOS signal input to low (bit 9).
-        When the EDC is off it locks onto a reference clock and
+         * When the EDC is off it locks onto a reference clock and avoids
-        avoids becoming 'lost'.*/
+         * becoming 'lost'
+         */
        mod_abs &= ~(1<<8);
        if (!(phy->flags & FLAGS_NOC))
                mod_abs &= ~(1<<9);
@@ -5465,7 +5599,7 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
        if (phy->flags & FLAGS_NOC)
                val |= (3<<5);
-        /**
+        /*
         * Set 8727 GPIOs to input to allow reading from the 8727 GPIO0
         * status which reflect SFP+ module over-current
         */
@@ -5492,7 +5626,7 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
                bnx2x_cl45_read(bp, phy,
                                MDIO_PMA_DEVAD, MDIO_PMA_REG_10G_CTRL2, &tmp1);
                DP(NETIF_MSG_LINK, "1.7 = 0x%x\n", tmp1);
-                /**
+                /*
                 * Power down the XAUI until link is up in case of dual-media
                 * and 1G
                 */
@@ -5518,7 +5652,7 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
                bnx2x_cl45_write(bp, phy,
                                 MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1300);
        } else {
-                /**
+                /*
                 * Since the 8727 has only single reset pin, need to set the 10G
                 * registers although it is default
                 */
@@ -5534,7 +5668,8 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
                                 0x0008);
        }
-        /* Set 2-wire transfer rate of SFP+ module EEPROM
+        /*
+         * Set 2-wire transfer rate of SFP+ module EEPROM
         * to 100Khz since some DACs(direct attached cables) do
         * not work at 400Khz.
         */
@@ -5557,6 +5692,26 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
                                 phy->tx_preemphasis[1]);
        }
+        /*
+         * If TX Laser is controlled by GPIO_0, do not let PHY go into low
+         * power mode, if TX Laser is disabled
+         */
+        tx_en_mode = REG_RD(bp, params->shmem_base +
+                            offsetof(struct shmem_region,
+                                dev_info.port_hw_config[params->port].sfp_ctrl))
+                        & PORT_HW_CFG_TX_LASER_MASK;
+        if (tx_en_mode == PORT_HW_CFG_TX_LASER_GPIO0) {
+                DP(NETIF_MSG_LINK, "Enabling TXONOFF_PWRDN_DIS\n");
+                bnx2x_cl45_read(bp, phy,
+                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8727_OPT_CFG_REG, &tmp2);
+                tmp2 |= 0x1000;
+                tmp2 &= 0xFFEF;
+                bnx2x_cl45_write(bp, phy,
+                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8727_OPT_CFG_REG, tmp2);
+        }
        return 0;
 }
@@ -5570,46 +5725,49 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
                                      port_feature_config[params->port].
                                      config));
        bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
+                        MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_PHY_IDENTIFIER, &mod_abs);
+                        MDIO_PMA_REG_PHY_IDENTIFIER, &mod_abs);
        if (mod_abs & (1<<8)) {
                /* Module is absent */
                DP(NETIF_MSG_LINK, "MOD_ABS indication "
                            "show module is absent\n");
-                /* 1. Set mod_abs to detect next module
+                /*
-                presence event
+                 * 1. Set mod_abs to detect next module
-                   2. Set EDC off by setting OPTXLOS signal input to low
+                 *    presence event
-                        (bit 9).
+                 * 2. Set EDC off by setting OPTXLOS signal input to low
-                        When the EDC is off it locks onto a reference clock and
+                 *    (bit 9).
-                        avoids becoming 'lost'.*/
+                 *    When the EDC is off it locks onto a reference clock and
+                 *    avoids becoming 'lost'.
+                 */
                mod_abs &= ~(1<<8);
                if (!(phy->flags & FLAGS_NOC))
                        mod_abs &= ~(1<<9);
                bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
+                                 MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_PHY_IDENTIFIER, mod_abs);
+                                 MDIO_PMA_REG_PHY_IDENTIFIER, mod_abs);
-                /* Clear RX alarm since it stays up as long as
+                /*
-                the mod_abs wasn't changed */
+                 * Clear RX alarm since it stays up as long as
+                 * the mod_abs wasn't changed
+                 */
                bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_RX_ALARM, &rx_alarm_status);
+                                MDIO_PMA_REG_RX_ALARM, &rx_alarm_status);
        } else {
                /* Module is present */
                DP(NETIF_MSG_LINK, "MOD_ABS indication "
                            "show module is present\n");
-                /* First thing, disable transmitter,
+                /*
-                and if the module is ok, the
+                 * First disable transmitter, and if the module is ok, the
-                module_detection will enable it*/
+                 * module_detection will enable it
+                 * 1. Set mod_abs to detect next module absent event ( bit 8)
-                /* 1. Set mod_abs to detect next module
+                 * 2. Restore the default polarity of the OPRXLOS signal and
-                absent event ( bit 8)
+                 * this signal will then correctly indicate the presence or
-                   2. Restore the default polarity of the OPRXLOS signal and
+                 * absence of the Rx signal. (bit 9)
-                this signal will then correctly indicate the presence or
+                 */
-                absence of the Rx signal. (bit 9) */
                mod_abs |= (1<<8);
                if (!(phy->flags & FLAGS_NOC))
                        mod_abs |= (1<<9);
@@ -5617,10 +5775,12 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
                                 MDIO_PMA_DEVAD,
                                 MDIO_PMA_REG_PHY_IDENTIFIER, mod_abs);
-                /* Clear RX alarm since it stays up as long as
+                /*
-                the mod_abs wasn't changed. This is need to be done
+                 * Clear RX alarm since it stays up as long as the mod_abs
-                before calling the module detection, otherwise it will clear
+                 * wasn't changed. This is need to be done before calling the
-                the link update alarm */
+                 * module detection, otherwise it will clear* the link update
+                 * alarm
+                 */
                bnx2x_cl45_read(bp, phy,
                                MDIO_PMA_DEVAD,
                                MDIO_PMA_REG_RX_ALARM, &rx_alarm_status);
@@ -5628,7 +5788,7 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
                if ((val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) ==
                    PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_DISABLE_TX_LASER)
-                        bnx2x_sfp_set_transmitter(bp, phy, params->port, 0);
+                        bnx2x_sfp_set_transmitter(params, phy, 0);
                if (bnx2x_wait_for_sfp_module_initialized(phy, params) == 0)
                        bnx2x_sfp_module_detection(phy, params);
@@ -5637,9 +5797,8 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
        }
        DP(NETIF_MSG_LINK, "8727 RX_ALARM_STATUS 0x%x\n",
-                 rx_alarm_status);
+                   rx_alarm_status);
-        /* No need to check link status in case of
+        /* No need to check link status in case of module plugged in/out */
-        module plugged in/out */
 }
 static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
@@ -5675,7 +5834,7 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
        bnx2x_cl45_read(bp, phy,
                        MDIO_PMA_DEVAD, MDIO_PMA_REG_M8051_MSGOUT_REG, &val1);
-        /**
+        /*
         * If a module is present and there is need to check
         * for over current
         */
@@ -5695,12 +5854,8 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                                            " Please remove the SFP+ module and"
                                            " restart the system to clear this"
                                            " error.\n",
-                                   params->port);
+                         params->port);
+                        /* Disable all RX_ALARMs except for mod_abs */
-                        /*
-                         * Disable all RX_ALARMs except for
-                         * mod_abs
-                         */
                        bnx2x_cl45_write(bp, phy,
                                         MDIO_PMA_DEVAD,
                                         MDIO_PMA_REG_RX_ALARM_CTRL, (1<<5));
@@ -5743,11 +5898,15 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                        MDIO_PMA_DEVAD,
                        MDIO_PMA_REG_8073_SPEED_LINK_STATUS, &link_status);
-        /* Bits 0..2 --> speed detected,
+        /*
-           bits 13..15--> link is down */
+         * Bits 0..2 --> speed detected,
+         * Bits 13..15--> link is down
+         */
        if ((link_status & (1<<2)) && (!(link_status & (1<<15)))) {
                link_up = 1;
                vars->line_speed = SPEED_10000;
+                DP(NETIF_MSG_LINK, "port %x: External link up in 10G\n",
+                           params->port);
        } else if ((link_status & (1<<0)) && (!(link_status & (1<<13)))) {
                link_up = 1;
                vars->line_speed = SPEED_1000;
@@ -5758,15 +5917,18 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                DP(NETIF_MSG_LINK, "port %x: External link is down\n",
                           params->port);
        }
-        if (link_up)
+        if (link_up) {
                bnx2x_ext_phy_resolve_fc(phy, params, vars);
+                vars->duplex = DUPLEX_FULL;
+                DP(NETIF_MSG_LINK, "duplex = 0x%x\n", vars->duplex);
+        }
        if ((DUAL_MEDIA(params)) &&
            (phy->req_line_speed == SPEED_1000)) {
                bnx2x_cl45_read(bp, phy,
                                MDIO_PMA_DEVAD,
                                MDIO_PMA_REG_8727_PCS_GP, &val1);
-                /**
+                /*
                 * In case of dual-media board and 1G, power up the XAUI side,
                 * otherwise power it down. For 10G it is done automatically
                 */
@@ -5786,7 +5948,7 @@ static void bnx2x_8727_link_reset(struct bnx2x_phy *phy,
 {
        struct bnx2x *bp = params->bp;
        /* Disable Transmitter */
-        bnx2x_sfp_set_transmitter(bp, phy, params->port, 0);
+        bnx2x_sfp_set_transmitter(params, phy, 0);
        /* Clear LASI */
        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_LASI_CTRL, 0);
@@ -5798,19 +5960,23 @@ static void bnx2x_8727_link_reset(struct bnx2x_phy *phy,
 static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
                                           struct link_params *params)
 {
-        u16 val, fw_ver1, fw_ver2, cnt;
+        u16 val, fw_ver1, fw_ver2, cnt, adj;
        struct bnx2x *bp = params->bp;
+        adj = 0;
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+                adj = -1;
        /* For the 32 bits registers in 848xx, access via MDIO2ARM interface.*/
        /* (1) set register 0xc200_0014(SPI_BRIDGE_CTRL_2) to 0x03000000 */
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0014);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819 + adj, 0x0014);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A + adj, 0xc200);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81B, 0x0000);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81B + adj, 0x0000);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81C, 0x0300);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81C + adj, 0x0300);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x0009);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817 + adj, 0x0009);
        for (cnt = 0; cnt < 100; cnt++) {
-                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &val);
+                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818 + adj, &val);
                if (val & 1)
                        break;
                udelay(5);
@@ -5824,11 +5990,11 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
        /* 2) read register 0xc200_0000 (SPI_FW_STATUS) */
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0000);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819 + adj, 0x0000);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A + adj, 0xc200);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x000A);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817 + adj, 0x000A);
        for (cnt = 0; cnt < 100; cnt++) {
-                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &val);
+                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818 + adj, &val);
                if (val & 1)
                        break;
                udelay(5);
@@ -5841,9 +6007,9 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
        }
        /* lower 16 bits of the register SPI_FW_STATUS */
-        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81B, &fw_ver1);
+        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81B + adj, &fw_ver1);
        /* upper 16 bits of register SPI_FW_STATUS */
-        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81C, &fw_ver2);
+        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81C + adj, &fw_ver2);
        bnx2x_save_spirom_version(bp, params->port, (fw_ver2<<16) | fw_ver1,
                                  phy->ver_addr);
@@ -5852,33 +6018,53 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
 static void bnx2x_848xx_set_led(struct bnx2x *bp,
                                struct bnx2x_phy *phy)
 {
-        u16 val;
+        u16 val, adj;
+        adj = 0;
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+                adj = -1;
        /* PHYC_CTL_LED_CTL */
        bnx2x_cl45_read(bp, phy,
                        MDIO_PMA_DEVAD,
-                        MDIO_PMA_REG_8481_LINK_SIGNAL, &val);
+                        MDIO_PMA_REG_8481_LINK_SIGNAL + adj, &val);
        val &= 0xFE00;
        val |= 0x0092;
        bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD,
-                         MDIO_PMA_REG_8481_LINK_SIGNAL, val);
+                         MDIO_PMA_REG_8481_LINK_SIGNAL + adj, val);
        bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD,
-                         MDIO_PMA_REG_8481_LED1_MASK,
+                         MDIO_PMA_REG_8481_LED1_MASK + adj,
                         0x80);
        bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD,
-                         MDIO_PMA_REG_8481_LED2_MASK,
+                         MDIO_PMA_REG_8481_LED2_MASK + adj,
                         0x18);
+        /* Select activity source by Tx and Rx, as suggested by PHY AE */
        bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD,
-                         MDIO_PMA_REG_8481_LED3_MASK,
+                         MDIO_PMA_REG_8481_LED3_MASK + adj,
-                         0x0040);
+                         0x0006);
+        /* Select the closest activity blink rate to that in 10/100/1000 */
+        bnx2x_cl45_write(bp, phy,
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_8481_LED3_BLINK + adj,
+                        0);
+        bnx2x_cl45_read(bp, phy,
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_84823_CTL_LED_CTL_1 + adj, &val);
+        val |= MDIO_PMA_REG_84823_LED3_STRETCH_EN; /* stretch_en for LED3*/
+        bnx2x_cl45_write(bp, phy,
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_84823_CTL_LED_CTL_1 + adj, val);
        /* 'Interrupt Mask' */
        bnx2x_cl45_write(bp, phy,
@@ -5892,7 +6078,11 @@ static u8 bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,
 {
        struct bnx2x *bp = params->bp;
        u16 autoneg_val, an_1000_val, an_10_100_val;
+        /*
+         * This phy uses the NIG latch mechanism since link indication
+         * arrives through its LED4 and not via its LASI signal, so we
+         * get steady signal instead of clear on read
+         */
        bnx2x_bits_en(bp, NIG_REG_LATCH_BC_0 + params->port*4,
                      1 << NIG_LATCH_BC_ENABLE_MI_INT);
@@ -6017,11 +6207,11 @@ static u8 bnx2x_8481_config_init(struct bnx2x_phy *phy,
        struct bnx2x *bp = params->bp;
        /* Restore normal power mode*/
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
        /* HW reset */
        bnx2x_ext_phy_hw_reset(bp, params->port);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 1<<15);
        return bnx2x_848xx_cmn_config_init(phy, params, vars);
@@ -6033,12 +6223,15 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
 {
        struct bnx2x *bp = params->bp;
        u8 port, initialize = 1;
-        u16 val;
+        u16 val, adj;
        u16 temp;
-        u32 actual_phy_selection;
+        u32 actual_phy_selection, cms_enable;
        u8 rc = 0;
        /* This is just for MDIO_CTL_REG_84823_MEDIA register. */
+        adj = 0;
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+                adj = 3;
        msleep(1);
        if (CHIP_IS_E2(bp))
@@ -6048,11 +6241,12 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_3,
                       MISC_REGISTERS_GPIO_OUTPUT_HIGH,
                       port);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
        /* Wait for GPHY to come out of reset */
        msleep(50);
-        /* BCM84823 requires that XGXS links up first @ 10G for normal
+        /*
-        behavior */
+         * BCM84823 requires that XGXS links up first @ 10G for normal behavior
+         */
        temp = vars->line_speed;
        vars->line_speed = SPEED_10000;
        bnx2x_set_autoneg(&params->phy[INT_PHY], params, vars, 0);
@@ -6062,7 +6256,7 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
        /* Set dual-media configuration according to configuration */
        bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,
-                        MDIO_CTL_REG_84823_MEDIA, &val);
+                        MDIO_CTL_REG_84823_MEDIA + adj, &val);
        val &= ~(MDIO_CTL_REG_84823_MEDIA_MAC_MASK |
                 MDIO_CTL_REG_84823_MEDIA_LINE_MASK |
                 MDIO_CTL_REG_84823_MEDIA_COPPER_CORE_DOWN |
@@ -6095,7 +6289,7 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                val |= MDIO_CTL_REG_84823_MEDIA_FIBER_1G;
        bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,
-                         MDIO_CTL_REG_84823_MEDIA, val);
+                         MDIO_CTL_REG_84823_MEDIA + adj, val);
        DP(NETIF_MSG_LINK, "Multi_phy config = 0x%x, Media control = 0x%x\n",
                   params->multi_phy_config, val);
@@ -6103,29 +6297,50 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                rc = bnx2x_848xx_cmn_config_init(phy, params, vars);
        else
                bnx2x_save_848xx_spirom_version(phy, params);
+        cms_enable = REG_RD(bp, params->shmem_base +
+                        offsetof(struct shmem_region,
+                        dev_info.port_hw_config[params->port].default_cfg)) &
+                        PORT_HW_CFG_ENABLE_CMS_MASK;
+        bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,
+                MDIO_CTL_REG_84823_USER_CTRL_REG, &val);
+        if (cms_enable)
+                val |= MDIO_CTL_REG_84823_USER_CTRL_CMS;
+        else
+                val &= ~MDIO_CTL_REG_84823_USER_CTRL_CMS;
+        bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,
+                MDIO_CTL_REG_84823_USER_CTRL_REG, val);
        return rc;
 }
 static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
-                                       struct link_params *params,
+                                  struct link_params *params,
-                                       struct link_vars *vars)
+                                  struct link_vars *vars)
 {
        struct bnx2x *bp = params->bp;
-        u16 val, val1, val2;
+        u16 val, val1, val2, adj;
        u8 link_up = 0;
+        /* Reg offset adjustment for 84833 */
+        adj = 0;
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+                adj = -1;
        /* Check 10G-BaseT link status */
        /* Check PMD signal ok */
        bnx2x_cl45_read(bp, phy,
                        MDIO_AN_DEVAD, 0xFFFA, &val1);
        bnx2x_cl45_read(bp, phy,
-                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8481_PMD_SIGNAL,
+                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8481_PMD_SIGNAL + adj,
                        &val2);
        DP(NETIF_MSG_LINK, "BCM848xx: PMD_SIGNAL 1.a811 = 0x%x\n", val2);
        /* Check link 10G */
        if (val2 & (1<<11)) {
                vars->line_speed = SPEED_10000;
+                vars->duplex = DUPLEX_FULL;
                link_up = 1;
                bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
        } else { /* Check Legacy speed link */
@@ -6203,9 +6418,9 @@ static void bnx2x_8481_hw_reset(struct bnx2x_phy *phy,
                                struct link_params *params)
 {
        bnx2x_set_gpio(params->bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, 0);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, 0);
        bnx2x_set_gpio(params->bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, 1);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, 1);
 }
 static void bnx2x_8481_link_reset(struct bnx2x_phy *phy,
@@ -6227,8 +6442,8 @@ static void bnx2x_848x3_link_reset(struct bnx2x_phy *phy,
        else
                port = params->port;
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_3,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW,
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW,
-                            port);
+                       port);
 }
 static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
@@ -6283,24 +6498,24 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
                        /* Set LED masks */
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED1_MASK,
+                                         MDIO_PMA_REG_8481_LED1_MASK,
-                                        0x0);
+                                         0x0);
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED2_MASK,
+                                         MDIO_PMA_REG_8481_LED2_MASK,
-                                        0x0);
+                                         0x0);
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED3_MASK,
+                                         MDIO_PMA_REG_8481_LED3_MASK,
-                                        0x0);
+                                         0x0);
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED5_MASK,
+                                         MDIO_PMA_REG_8481_LED5_MASK,
-                                        0x20);
+                                         0x20);
                } else {
                        bnx2x_cl45_write(bp, phy,
@@ -6324,35 +6539,35 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
                        val |= 0x2492;
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LINK_SIGNAL,
+                                         MDIO_PMA_REG_8481_LINK_SIGNAL,
-                                        val);
+                                         val);
                        /* Set LED masks */
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED1_MASK,
+                                         MDIO_PMA_REG_8481_LED1_MASK,
-                                        0x0);
+                                         0x0);
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED2_MASK,
+                                         MDIO_PMA_REG_8481_LED2_MASK,
-                                        0x20);
+                                         0x20);
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED3_MASK,
+                                         MDIO_PMA_REG_8481_LED3_MASK,
-                                        0x20);
+                                         0x20);
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED5_MASK,
+                                         MDIO_PMA_REG_8481_LED5_MASK,
-                                        0x0);
+                                         0x0);
                } else {
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED1_MASK,
+                                         MDIO_PMA_REG_8481_LED1_MASK,
-                                        0x20);
+                                         0x20);
                }
                break;
@@ -6370,9 +6585,9 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
                                        &val);
                        if (!((val &
-                              MDIO_PMA_REG_8481_LINK_SIGNAL_LED4_ENABLE_MASK)
+                               MDIO_PMA_REG_8481_LINK_SIGNAL_LED4_ENABLE_MASK)
-                           >> MDIO_PMA_REG_8481_LINK_SIGNAL_LED4_ENABLE_SHIFT)){
+                          >> MDIO_PMA_REG_8481_LINK_SIGNAL_LED4_ENABLE_SHIFT)) {
-                                DP(NETIF_MSG_LINK, "Seting LINK_SIGNAL\n");
+                                DP(NETIF_MSG_LINK, "Setting LINK_SIGNAL\n");
                                bnx2x_cl45_write(bp, phy,
                                                 MDIO_PMA_DEVAD,
                                                 MDIO_PMA_REG_8481_LINK_SIGNAL,
@@ -6381,30 +6596,42 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
                        /* Set LED masks */
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED1_MASK,
+                                         MDIO_PMA_REG_8481_LED1_MASK,
-                                        0x10);
+                                         0x10);
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED2_MASK,
+                                         MDIO_PMA_REG_8481_LED2_MASK,
-                                        0x80);
+                                         0x80);
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED3_MASK,
+                                         MDIO_PMA_REG_8481_LED3_MASK,
-                                        0x98);
+                                         0x98);
                        bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
+                                         MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED5_MASK,
+                                         MDIO_PMA_REG_8481_LED5_MASK,
-                                        0x40);
+                                         0x40);
                } else {
                        bnx2x_cl45_write(bp, phy,
                                         MDIO_PMA_DEVAD,
                                         MDIO_PMA_REG_8481_LED1_MASK,
                                         0x80);
+                        /* Tell LED3 to blink on source */
+                        bnx2x_cl45_read(bp, phy,
+                                        MDIO_PMA_DEVAD,
+                                        MDIO_PMA_REG_8481_LINK_SIGNAL,
+                                        &val);
+                        val &= ~(7<<6);
+                        val |= (1<<6); /* A83B[8:6]= 1 */
+                        bnx2x_cl45_write(bp, phy,
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LINK_SIGNAL,
+                                         val);
                }
                break;
        }
@@ -6431,10 +6658,10 @@ static u8 bnx2x_7101_config_init(struct bnx2x_phy *phy,
        /* Restore normal power mode*/
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
        /* HW reset */
        bnx2x_ext_phy_hw_reset(bp, params->port);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
        bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_LASI_CTRL, 0x1);
@@ -6481,14 +6708,13 @@ static u8 bnx2x_7101_read_status(struct bnx2x_phy *phy,
        DP(NETIF_MSG_LINK, "10G-base-T PMA status 0x%x->0x%x\n",
                   val2, val1);
        link_up = ((val1 & 4) == 4);
-        /* if link is up
+        /* if link is up print the AN outcome of the SFX7101 PHY */
-         * print the AN outcome of the SFX7101 PHY
-         */
        if (link_up) {
                bnx2x_cl45_read(bp, phy,
                                MDIO_AN_DEVAD, MDIO_AN_REG_MASTER_STATUS,
                                &val2);
                vars->line_speed = SPEED_10000;
+                vars->duplex = DUPLEX_FULL;
                DP(NETIF_MSG_LINK, "SFX7101 AN status 0x%x->Master=%x\n",
                           val2, (val2 & (1<<14)));
                bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
@@ -6516,20 +6742,20 @@ void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, struct bnx2x_phy *phy)
        u16 val, cnt;
        bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
+                        MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_7101_RESET, &val);
+                        MDIO_PMA_REG_7101_RESET, &val);
        for (cnt = 0; cnt < 10; cnt++) {
                msleep(50);
                /* Writes a self-clearing reset */
                bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
+                                 MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_7101_RESET,
+                                 MDIO_PMA_REG_7101_RESET,
-                               (val | (1<<15)));
+                                 (val | (1<<15)));
                /* Wait for clear */
                bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_7101_RESET, &val);
+                                MDIO_PMA_REG_7101_RESET, &val);
                if ((val & (1<<15)) == 0)
                        break;
@@ -6540,10 +6766,10 @@ static void bnx2x_7101_hw_reset(struct bnx2x_phy *phy,
                                struct link_params *params) {
        /* Low power mode is controlled by GPIO 2 */
        bnx2x_set_gpio(params->bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, params->port);
        /* The PHY reset is controlled by GPIO 1 */
        bnx2x_set_gpio(params->bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, params->port);
 }
 static void bnx2x_7101_set_link_led(struct bnx2x_phy *phy,
@@ -6585,9 +6811,9 @@ static struct bnx2x_phy phy_null = {
        .supported      = 0,
        .media_type     = ETH_PHY_NOT_PRESENT,
        .ver_addr       = 0,
-        .req_flow_ctrl  = 0,
+        .req_flow_ctrl  = 0,
-        .req_line_speed = 0,
+        .req_line_speed = 0,
-        .speed_cap_mask = 0,
+        .speed_cap_mask = 0,
        .req_duplex     = 0,
        .rsrv           = 0,
        .config_init    = (config_init_t)NULL,
@@ -6622,8 +6848,8 @@ static struct bnx2x_phy phy_serdes = {
        .media_type     = ETH_PHY_UNSPECIFIED,
        .ver_addr       = 0,
        .req_flow_ctrl  = 0,
-        .req_line_speed = 0,
+        .req_line_speed = 0,
-        .speed_cap_mask = 0,
+        .speed_cap_mask = 0,
        .req_duplex     = 0,
        .rsrv           = 0,
        .config_init    = (config_init_t)bnx2x_init_serdes,
@@ -6659,8 +6885,8 @@ static struct bnx2x_phy phy_xgxs = {
        .media_type     = ETH_PHY_UNSPECIFIED,
        .ver_addr       = 0,
        .req_flow_ctrl  = 0,
-        .req_line_speed = 0,
+        .req_line_speed = 0,
-        .speed_cap_mask = 0,
+        .speed_cap_mask = 0,
        .req_duplex     = 0,
        .rsrv           = 0,
        .config_init    = (config_init_t)bnx2x_init_xgxs,
@@ -6690,8 +6916,8 @@ static struct bnx2x_phy phy_7101 = {
        .media_type     = ETH_PHY_BASE_T,
        .ver_addr       = 0,
        .req_flow_ctrl  = 0,
-        .req_line_speed = 0,
+        .req_line_speed = 0,
-        .speed_cap_mask = 0,
+        .speed_cap_mask = 0,
        .req_duplex     = 0,
        .rsrv           = 0,
        .config_init    = (config_init_t)bnx2x_7101_config_init,
@@ -6721,9 +6947,9 @@ static struct bnx2x_phy phy_8073 = {
                           SUPPORTED_Asym_Pause),
        .media_type     = ETH_PHY_UNSPECIFIED,
        .ver_addr       = 0,
-        .req_flow_ctrl  = 0,
+        .req_flow_ctrl  = 0,
-        .req_line_speed = 0,
+        .req_line_speed = 0,
-        .speed_cap_mask = 0,
+        .speed_cap_mask = 0,
        .req_duplex     = 0,
        .rsrv           = 0,
        .config_init    = (config_init_t)bnx2x_8073_config_init,
@@ -6932,6 +7158,43 @@ static struct bnx2x_phy phy_84823 = {
        .phy_specific_func = (phy_specific_func_t)NULL
 };
+static struct bnx2x_phy phy_84833 = {
+        .type           = PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833,
+        .addr           = 0xff,
+        .flags          = FLAGS_FAN_FAILURE_DET_REQ |
+                            FLAGS_REARM_LATCH_SIGNAL,
+        .def_md_devad   = 0,
+        .reserved       = 0,
+        .rx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
+        .tx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
+        .mdio_ctrl      = 0,
+        .supported      = (SUPPORTED_10baseT_Half |
+                           SUPPORTED_10baseT_Full |
+                           SUPPORTED_100baseT_Half |
+                           SUPPORTED_100baseT_Full |
+                           SUPPORTED_1000baseT_Full |
+                           SUPPORTED_10000baseT_Full |
+                           SUPPORTED_TP |
+                           SUPPORTED_Autoneg |
+                           SUPPORTED_Pause |
+                           SUPPORTED_Asym_Pause),
+        .media_type     = ETH_PHY_BASE_T,
+        .ver_addr       = 0,
+        .req_flow_ctrl  = 0,
+        .req_line_speed = 0,
+        .speed_cap_mask = 0,
+        .req_duplex     = 0,
+        .rsrv           = 0,
+        .config_init    = (config_init_t)bnx2x_848x3_config_init,
+        .read_status    = (read_status_t)bnx2x_848xx_read_status,
+        .link_reset     = (link_reset_t)bnx2x_848x3_link_reset,
+        .config_loopback = (config_loopback_t)NULL,
+        .format_fw_ver  = (format_fw_ver_t)bnx2x_848xx_format_ver,
+        .hw_reset       = (hw_reset_t)NULL,
+        .set_link_led   = (set_link_led_t)bnx2x_848xx_set_link_led,
+        .phy_specific_func = (phy_specific_func_t)NULL
+};
 /*****************************************************************/
 /*                                                               */
 /* Populate the phy according. Main function: bnx2x_populate_phy   */
@@ -6945,7 +7208,7 @@ static void bnx2x_populate_preemphasis(struct bnx2x *bp, u32 shmem_base,
        /* Get the 4 lanes xgxs config rx and tx */
        u32 rx = 0, tx = 0, i;
        for (i = 0; i < 2; i++) {
-                /**
+                /*
                 * INT_PHY and EXT_PHY1 share the same value location in the
                 * shmem. When num_phys is greater than 1, than this value
                 * applies only to EXT_PHY1
@@ -6953,19 +7216,19 @@ static void bnx2x_populate_preemphasis(struct bnx2x *bp, u32 shmem_base,
                if (phy_index == INT_PHY || phy_index == EXT_PHY1) {
                        rx = REG_RD(bp, shmem_base +
                                    offsetof(struct shmem_region,
-                           dev_info.port_hw_config[port].xgxs_config_rx[i<<1]));
+                          dev_info.port_hw_config[port].xgxs_config_rx[i<<1]));
                        tx = REG_RD(bp, shmem_base +
                                    offsetof(struct shmem_region,
-                           dev_info.port_hw_config[port].xgxs_config_tx[i<<1]));
+                          dev_info.port_hw_config[port].xgxs_config_tx[i<<1]));
                } else {
                        rx = REG_RD(bp, shmem_base +
                                    offsetof(struct shmem_region,
-                          dev_info.port_hw_config[port].xgxs_config2_rx[i<<1]));
+                         dev_info.port_hw_config[port].xgxs_config2_rx[i<<1]));
                        tx = REG_RD(bp, shmem_base +
                                    offsetof(struct shmem_region,
-                          dev_info.port_hw_config[port].xgxs_config2_rx[i<<1]));
+                         dev_info.port_hw_config[port].xgxs_config2_rx[i<<1]));
                }
                phy->rx_preemphasis[i << 1] = ((rx>>16) & 0xffff);
@@ -7085,6 +7348,9 @@ static u8 bnx2x_populate_ext_phy(struct bnx2x *bp,
        case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823:
                *phy = phy_84823;
                break;
+        case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833:
+                *phy = phy_84833;
+                break;
        case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:
                *phy = phy_7101;
                break;
@@ -7099,21 +7365,21 @@ static u8 bnx2x_populate_ext_phy(struct bnx2x *bp,
        phy->addr = XGXS_EXT_PHY_ADDR(ext_phy_config);
        bnx2x_populate_preemphasis(bp, shmem_base, phy, port, phy_index);
-        /**
+        /*
-        * The shmem address of the phy version is located on different
+         * The shmem address of the phy version is located on different
-        * structures. In case this structure is too old, do not set
+         * structures. In case this structure is too old, do not set
-        * the address
+         * the address
-        */
+         */
        config2 = REG_RD(bp, shmem_base + offsetof(struct shmem_region,
                                        dev_info.shared_hw_config.config2));
        if (phy_index == EXT_PHY1) {
                phy->ver_addr = shmem_base + offsetof(struct shmem_region,
                                port_mb[port].ext_phy_fw_version);
-        /* Check specific mdc mdio settings */
+                /* Check specific mdc mdio settings */
-        if (config2 & SHARED_HW_CFG_MDC_MDIO_ACCESS1_MASK)
+                if (config2 & SHARED_HW_CFG_MDC_MDIO_ACCESS1_MASK)
-                mdc_mdio_access = config2 &
+                        mdc_mdio_access = config2 &
-                SHARED_HW_CFG_MDC_MDIO_ACCESS1_MASK;
+                        SHARED_HW_CFG_MDC_MDIO_ACCESS1_MASK;
        } else {
                u32 size = REG_RD(bp, shmem2_base);
@@ -7132,7 +7398,7 @@ static u8 bnx2x_populate_ext_phy(struct bnx2x *bp,
        }
        phy->mdio_ctrl = bnx2x_get_emac_base(bp, mdc_mdio_access, port);
-        /**
+        /*
         * In case mdc/mdio_access of the external phy is different than the
         * mdc/mdio access of the XGXS, a HW lock must be taken in each access
         * to prevent one port interfere with another port's CL45 operations.
@@ -7167,18 +7433,20 @@ static void bnx2x_phy_def_cfg(struct link_params *params,
        /* Populate the default phy configuration for MF mode */
        if (phy_index == EXT_PHY2) {
                link_config = REG_RD(bp, params->shmem_base +
-                                         offsetof(struct shmem_region, dev_info.
+                                     offsetof(struct shmem_region, dev_info.
                        port_feature_config[params->port].link_config2));
                phy->speed_cap_mask = REG_RD(bp, params->shmem_base +
-                                        offsetof(struct shmem_region, dev_info.
+                                             offsetof(struct shmem_region,
+                                                      dev_info.
                        port_hw_config[params->port].speed_capability_mask2));
        } else {
                link_config = REG_RD(bp, params->shmem_base +
-                                offsetof(struct shmem_region, dev_info.
+                                     offsetof(struct shmem_region, dev_info.
                                port_feature_config[params->port].link_config));
                phy->speed_cap_mask = REG_RD(bp, params->shmem_base +
-                                offsetof(struct shmem_region, dev_info.
+                                             offsetof(struct shmem_region,
-                           port_hw_config[params->port].speed_capability_mask));
+                                                      dev_info.
+                        port_hw_config[params->port].speed_capability_mask));
        }
        DP(NETIF_MSG_LINK, "Default config phy idx %x cfg 0x%x speed_cap_mask"
                       " 0x%x\n", phy_index, link_config, phy->speed_cap_mask);
@@ -7325,7 +7593,7 @@ static void set_phy_vars(struct link_params *params)
                        else if (phy_index == EXT_PHY2)
                                actual_phy_idx = EXT_PHY1;
                }
-                params->phy[actual_phy_idx].req_flow_ctrl  =
+                params->phy[actual_phy_idx].req_flow_ctrl =
                        params->req_flow_ctrl[link_cfg_idx];
                params->phy[actual_phy_idx].req_line_speed =
@@ -7378,57 +7646,6 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
        set_phy_vars(params);
        DP(NETIF_MSG_LINK, "Num of phys on board: %d\n", params->num_phys);
-        if (CHIP_REV_IS_FPGA(bp)) {
-                vars->link_up = 1;
-                vars->line_speed = SPEED_10000;
-                vars->duplex = DUPLEX_FULL;
-                vars->flow_ctrl = BNX2X_FLOW_CTRL_NONE;
-                vars->link_status = (LINK_STATUS_LINK_UP | LINK_10GTFD);
-                /* enable on E1.5 FPGA */
-                if (CHIP_IS_E1H(bp)) {
-                        vars->flow_ctrl |=
-                                        (BNX2X_FLOW_CTRL_TX |
-                                         BNX2X_FLOW_CTRL_RX);
-                        vars->link_status |=
-                                        (LINK_STATUS_TX_FLOW_CONTROL_ENABLED |
-                                         LINK_STATUS_RX_FLOW_CONTROL_ENABLED);
-                }
-                bnx2x_emac_enable(params, vars, 0);
-                if (!(CHIP_IS_E2(bp)))
-                        bnx2x_pbf_update(params, vars->flow_ctrl,
-                                         vars->line_speed);
-                /* disable drain */
-                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
-                /* update shared memory */
-                bnx2x_update_mng(params, vars->link_status);
-                return 0;
-        } else
-        if (CHIP_REV_IS_EMUL(bp)) {
-                vars->link_up = 1;
-                vars->line_speed = SPEED_10000;
-                vars->duplex = DUPLEX_FULL;
-                vars->flow_ctrl = BNX2X_FLOW_CTRL_NONE;
-                vars->link_status = (LINK_STATUS_LINK_UP | LINK_10GTFD);
-                bnx2x_bmac_enable(params, vars, 0);
-                bnx2x_pbf_update(params, vars->flow_ctrl, vars->line_speed);
-                /* Disable drain */
-                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE
-                                    + params->port*4, 0);
-                /* update shared memory */
-                bnx2x_update_mng(params, vars->link_status);
-                return 0;
-        } else
        if (params->loopback_mode == LOOPBACK_BMAC) {
                vars->link_up = 1;
@@ -7444,8 +7661,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                /* set bmac loopback */
                bnx2x_bmac_enable(params, vars, 1);
-                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE +
+                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
-                    params->port*4, 0);
        } else if (params->loopback_mode == LOOPBACK_EMAC) {
@@ -7461,8 +7677,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                /* set bmac loopback */
                bnx2x_emac_enable(params, vars, 1);
                bnx2x_emac_program(params, vars);
-                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE +
+                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
-                    params->port*4, 0);
        } else if ((params->loopback_mode == LOOPBACK_XGXS) ||
                   (params->loopback_mode == LOOPBACK_EXT_PHY)) {
@@ -7485,8 +7700,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                        bnx2x_emac_program(params, vars);
                        bnx2x_emac_enable(params, vars, 0);
                } else
-                bnx2x_bmac_enable(params, vars, 0);
+                        bnx2x_bmac_enable(params, vars, 0);
                if (params->loopback_mode == LOOPBACK_XGXS) {
                        /* set 10G XGXS loopback */
                        params->phy[INT_PHY].config_loopback(
@@ -7504,9 +7718,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                                                params);
                        }
                }
+                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
-                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE +
-                            params->port*4, 0);
                bnx2x_set_led(params, vars,
                              LED_MODE_OPER, vars->line_speed);
@@ -7525,7 +7737,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
        return 0;
 }
 u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
-                  u8 reset_ext_phy)
+                    u8 reset_ext_phy)
 {
        struct bnx2x *bp = params->bp;
        u8 phy_index, port = params->port, clear_latch_ind = 0;
@@ -7534,10 +7746,10 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
        vars->link_status = 0;
        bnx2x_update_mng(params, vars->link_status);
        bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4,
-                     (NIG_MASK_XGXS0_LINK_STATUS |
+                       (NIG_MASK_XGXS0_LINK_STATUS |
-                      NIG_MASK_XGXS0_LINK10G |
+                        NIG_MASK_XGXS0_LINK10G |
-                      NIG_MASK_SERDES0_LINK_STATUS |
+                        NIG_MASK_SERDES0_LINK_STATUS |
-                      NIG_MASK_MI_INT));
+                        NIG_MASK_MI_INT));
        /* activate nig drain */
        REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 1);
@@ -7605,10 +7817,13 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
        struct bnx2x_phy phy[PORT_MAX];
        struct bnx2x_phy *phy_blk[PORT_MAX];
        u16 val;
-        s8 port;
+        s8 port = 0;
        s8 port_of_path = 0;
+        u32 swap_val, swap_override;
-        bnx2x_ext_phy_hw_reset(bp, 0);
+        swap_val = REG_RD(bp,  NIG_REG_PORT_SWAP);
+        swap_override = REG_RD(bp,  NIG_REG_STRAP_OVERRIDE);
+        port ^= (swap_val && swap_override);
+        bnx2x_ext_phy_hw_reset(bp, port);
        /* PART1 - Reset both phys */
        for (port = PORT_MAX - 1; port >= PORT_0; port--) {
                u32 shmem_base, shmem2_base;
@@ -7633,21 +7848,22 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
                /* disable attentions */
                bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 +
                               port_of_path*4,
-                             (NIG_MASK_XGXS0_LINK_STATUS |
+                               (NIG_MASK_XGXS0_LINK_STATUS |
-                              NIG_MASK_XGXS0_LINK10G |
+                                NIG_MASK_XGXS0_LINK10G |
-                              NIG_MASK_SERDES0_LINK_STATUS |
+                                NIG_MASK_SERDES0_LINK_STATUS |
-                              NIG_MASK_MI_INT));
+                                NIG_MASK_MI_INT));
                /* Need to take the phy out of low power mode in order
                        to write to access its registers */
                bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                                  MISC_REGISTERS_GPIO_OUTPUT_HIGH, port);
+                               MISC_REGISTERS_GPIO_OUTPUT_HIGH,
+                               port);
                /* Reset the phy */
                bnx2x_cl45_write(bp, &phy[port],
-                               MDIO_PMA_DEVAD,
+                                 MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_CTRL,
+                                 MDIO_PMA_REG_CTRL,
-                               1<<15);
+                                 1<<15);
        }
        /* Add delay of 150ms after reset */
@@ -7663,7 +7879,6 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
        /* PART2 - Download firmware to both phys */
        for (port = PORT_MAX - 1; port >= PORT_0; port--) {
-                u16 fw_ver1;
                if (CHIP_IS_E2(bp))
                        port_of_path = 0;
                else
@@ -7671,34 +7886,26 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
                DP(NETIF_MSG_LINK, "Loading spirom for phy address 0x%x\n",
                           phy_blk[port]->addr);
-                bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
+                if (bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
-                                                  port_of_path);
+                                                      port_of_path))
-                bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_ROM_VER1, &fw_ver1);
-                if (fw_ver1 == 0 || fw_ver1 == 0x4321) {
-                        DP(NETIF_MSG_LINK,
-                                 "bnx2x_8073_common_init_phy port %x:"
-                                 "Download failed. fw version = 0x%x\n",
-                                 port, fw_ver1);
                        return -EINVAL;
-                }
                /* Only set bit 10 = 1 (Tx power down) */
                bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_TX_POWER_DOWN, &val);
+                                MDIO_PMA_REG_TX_POWER_DOWN, &val);
                /* Phase1 of TX_POWER_DOWN reset */
                bnx2x_cl45_write(bp, phy_blk[port],
-                               MDIO_PMA_DEVAD,
+                                 MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_TX_POWER_DOWN,
+                                 MDIO_PMA_REG_TX_POWER_DOWN,
-                               (val | 1<<10));
+                                 (val | 1<<10));
        }
-        /* Toggle Transmitter: Power down and then up with 600ms
+        /*
-           delay between */
+         * Toggle Transmitter: Power down and then up with 600ms delay
+         * between
+         */
        msleep(600);
        /* PART3 - complete TX_POWER_DOWN process, and set GPIO2 back to low */
@@ -7706,25 +7913,25 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
                /* Phase2 of POWER_DOWN_RESET */
                /* Release bit 10 (Release Tx power down) */
                bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_TX_POWER_DOWN, &val);
+                                MDIO_PMA_REG_TX_POWER_DOWN, &val);
                bnx2x_cl45_write(bp, phy_blk[port],
-                               MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_TX_POWER_DOWN, (val & (~(1<<10))));
+                                MDIO_PMA_REG_TX_POWER_DOWN, (val & (~(1<<10))));
                msleep(15);
                /* Read modify write the SPI-ROM version select register */
                bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
+                                MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_EDC_FFE_MAIN, &val);
+                                MDIO_PMA_REG_EDC_FFE_MAIN, &val);
                bnx2x_cl45_write(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
+                                 MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_EDC_FFE_MAIN, (val | (1<<12)));
+                                 MDIO_PMA_REG_EDC_FFE_MAIN, (val | (1<<12)));
                /* set GPIO2 back to LOW */
                bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                                  MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
+                               MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
        }
        return 0;
 }
@@ -7771,32 +7978,90 @@ static u8 bnx2x_8726_common_init_phy(struct bnx2x *bp,
                /* Set fault module detected LED on */
                bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
-                                  MISC_REGISTERS_GPIO_HIGH,
+                               MISC_REGISTERS_GPIO_HIGH,
-                                  port);
+                               port);
        }
        return 0;
 }
+static void bnx2x_get_ext_phy_reset_gpio(struct bnx2x *bp, u32 shmem_base,
+                                         u8 *io_gpio, u8 *io_port)
+{
+        u32 phy_gpio_reset = REG_RD(bp, shmem_base +
+                                          offsetof(struct shmem_region,
+                                dev_info.port_hw_config[PORT_0].default_cfg));
+        switch (phy_gpio_reset) {
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO0_P0:
+                *io_gpio = 0;
+                *io_port = 0;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO1_P0:
+                *io_gpio = 1;
+                *io_port = 0;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO2_P0:
+                *io_gpio = 2;
+                *io_port = 0;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO3_P0:
+                *io_gpio = 3;
+                *io_port = 0;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO0_P1:
+                *io_gpio = 0;
+                *io_port = 1;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO1_P1:
+                *io_gpio = 1;
+                *io_port = 1;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO2_P1:
+                *io_gpio = 2;
+                *io_port = 1;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO3_P1:
+                *io_gpio = 3;
+                *io_port = 1;
+                break;
+        default:
+                /* Don't override the io_gpio and io_port */
+                break;
+        }
+}
 static u8 bnx2x_8727_common_init_phy(struct bnx2x *bp,
                                     u32 shmem_base_path[],
                                     u32 shmem2_base_path[], u8 phy_index,
                                     u32 chip_id)
 {
-        s8 port;
+        s8 port, reset_gpio;
        u32 swap_val, swap_override;
        struct bnx2x_phy phy[PORT_MAX];
        struct bnx2x_phy *phy_blk[PORT_MAX];
        s8 port_of_path;
-        swap_val = REG_RD(bp,  NIG_REG_PORT_SWAP);
+        swap_val = REG_RD(bp, NIG_REG_PORT_SWAP);
-        swap_override = REG_RD(bp,  NIG_REG_STRAP_OVERRIDE);
+        swap_override = REG_RD(bp, NIG_REG_STRAP_OVERRIDE);
+        reset_gpio = MISC_REGISTERS_GPIO_1;
        port = 1;
-        bnx2x_ext_phy_hw_reset(bp, port ^ (swap_val && swap_override));
+        /*
+         * Retrieve the reset gpio/port which control the reset.
+         * Default is GPIO1, PORT1
+         */
+        bnx2x_get_ext_phy_reset_gpio(bp, shmem_base_path[0],
+                                     (u8 *)&reset_gpio, (u8 *)&port);
        /* Calculate the port based on port swap */
        port ^= (swap_val && swap_override);
+        /* Initiate PHY reset*/
+        bnx2x_set_gpio(bp, reset_gpio, MISC_REGISTERS_GPIO_OUTPUT_LOW,
+                       port);
+        msleep(1);
+        bnx2x_set_gpio(bp, reset_gpio, MISC_REGISTERS_GPIO_OUTPUT_HIGH,
+                       port);
        msleep(5);
        /* PART1 - Reset both phys */
@@ -7832,9 +8097,7 @@ static u8 bnx2x_8727_common_init_phy(struct bnx2x *bp,
                /* Reset the phy */
                bnx2x_cl45_write(bp, &phy[port],
-                               MDIO_PMA_DEVAD,
+                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 1<<15);
-                               MDIO_PMA_REG_CTRL,
-                               1<<15);
        }
        /* Add delay of 150ms after reset */
@@ -7848,27 +8111,17 @@ static u8 bnx2x_8727_common_init_phy(struct bnx2x *bp,
        }
        /* PART2 - Download firmware to both phys */
        for (port = PORT_MAX - 1; port >= PORT_0; port--) {
-                u16 fw_ver1;
+                if (CHIP_IS_E2(bp))
-                 if (CHIP_IS_E2(bp))
                        port_of_path = 0;
                else
                        port_of_path = port;
                DP(NETIF_MSG_LINK, "Loading spirom for phy address 0x%x\n",
                           phy_blk[port]->addr);
-                bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
+                if (bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
-                                                  port_of_path);
+                                                      port_of_path))
-                bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_ROM_VER1, &fw_ver1);
-                if (fw_ver1 == 0 || fw_ver1 == 0x4321) {
-                        DP(NETIF_MSG_LINK,
-                                 "bnx2x_8727_common_init_phy port %x:"
-                                 "Download failed. fw version = 0x%x\n",
-                                 port, fw_ver1);
                        return -EINVAL;
-                }
-        }
+        }
        return 0;
 }
@@ -7893,8 +8146,10 @@ static u8 bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[],
                break;
        case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726:
-                /* GPIO1 affects both ports, so there's need to pull
+                /*
-                it for single port alone */
+                 * GPIO1 affects both ports, so there's need to pull
+                 * it for single port alone
+                 */
                rc = bnx2x_8726_common_init_phy(bp, shmem_base_path,
                                                shmem2_base_path,
                                                phy_index, chip_id);
@@ -7904,11 +8159,15 @@ static u8 bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[],
                break;
        default:
                DP(NETIF_MSG_LINK,
-                         "bnx2x_common_init_phy: ext_phy 0x%x not required\n",
+                           "ext_phy 0x%x common init not required\n",
-                         ext_phy_type);
+                           ext_phy_type);
                break;
        }
+        if (rc != 0)
+                netdev_err(bp->dev,  "Warning: PHY was not initialized,"
+                                      " Port %d\n",
+                         0);
        return rc;
 }
@@ -7916,12 +8175,20 @@ u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base_path[],
                         u32 shmem2_base_path[], u32 chip_id)
 {
        u8 rc = 0;
+        u32 phy_ver;
        u8 phy_index;
        u32 ext_phy_type, ext_phy_config;
        DP(NETIF_MSG_LINK, "Begin common phy init\n");
-        if (CHIP_REV_IS_EMUL(bp))
+        /* Check if common init was already done */
+        phy_ver = REG_RD(bp, shmem_base_path[0] +
+                         offsetof(struct shmem_region,
+                                  port_mb[PORT_0].ext_phy_fw_version));
+        if (phy_ver) {
+                DP(NETIF_MSG_LINK, "Not doing common init; phy ver is 0x%x\n",
+                               phy_ver);
                return 0;
+        }
        /* Read the ext_phy_type for arbitrary port(0) */
        for (phy_index = EXT_PHY1; phy_index < MAX_PHYS;
diff --git a/drivers/net/bnx2x/bnx2x_link.h b/drivers/net/bnx2x/bnx2x_link.h
index bedab1a942c4..92f36b6950dc 100644
--- a/drivers/net/bnx2x/bnx2x_link.h
+++ b/drivers/net/bnx2x/bnx2x_link.h
@@ -1,4 +1,4 @@
-/* Copyright 2008-2010 Broadcom Corporation
+/* Copyright 2008-2011 Broadcom Corporation
 *
 * Unless you and Broadcom execute a separate written software license
 * agreement governing use of this software, this software is licensed to you
@@ -33,7 +33,7 @@
 #define BNX2X_FLOW_CTRL_BOTH            PORT_FEATURE_FLOW_CONTROL_BOTH
 #define BNX2X_FLOW_CTRL_NONE            PORT_FEATURE_FLOW_CONTROL_NONE
-#define SPEED_AUTO_NEG      0
+#define SPEED_AUTO_NEG          0
 #define SPEED_12000             12000
 #define SPEED_12500             12500
 #define SPEED_13000             13000
@@ -44,8 +44,8 @@
 #define SFP_EEPROM_VENDOR_NAME_SIZE             16
 #define SFP_EEPROM_VENDOR_OUI_ADDR              0x25
 #define SFP_EEPROM_VENDOR_OUI_SIZE              3
-#define SFP_EEPROM_PART_NO_ADDR                 0x28
+#define SFP_EEPROM_PART_NO_ADDR                 0x28
-#define SFP_EEPROM_PART_NO_SIZE         16
+#define SFP_EEPROM_PART_NO_SIZE                 16
 #define PWR_FLT_ERR_MSG_LEN                     250
 #define XGXS_EXT_PHY_TYPE(ext_phy_config) \
@@ -62,7 +62,7 @@
 #define SINGLE_MEDIA(params)            (params->num_phys == 2)
 /* Dual Media board contains two external phy with different media */
 #define DUAL_MEDIA(params)              (params->num_phys == 3)
-#define FW_PARAM_MDIO_CTRL_OFFSET 16
+#define FW_PARAM_MDIO_CTRL_OFFSET               16
 #define FW_PARAM_SET(phy_addr, phy_type, mdio_access) \
        (phy_addr | phy_type | mdio_access << FW_PARAM_MDIO_CTRL_OFFSET)
@@ -201,12 +201,14 @@ struct link_params {
        /* Default / User Configuration */
        u8 loopback_mode;
-#define LOOPBACK_NONE   0
+#define LOOPBACK_NONE           0
-#define LOOPBACK_EMAC   1
+#define LOOPBACK_EMAC           1
-#define LOOPBACK_BMAC   2
+#define LOOPBACK_BMAC           2
 #define LOOPBACK_XGXS           3
 #define LOOPBACK_EXT_PHY        4
-#define LOOPBACK_EXT    5
+#define LOOPBACK_EXT            5
+#define LOOPBACK_UMAC           6
+#define LOOPBACK_XMAC           7
        /* Device parameters */
        u8 mac_addr[6];
@@ -230,10 +232,11 @@ struct link_params {
        /* Phy register parameter */
        u32 chip_id;
+        /* features */
        u32 feature_config_flags;
-#define FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED (1<<0)
+#define FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED     (1<<0)
-#define FEATURE_CONFIG_PFC_ENABLED              (1<<1)
+#define FEATURE_CONFIG_PFC_ENABLED                      (1<<1)
-#define FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY (1<<2)
+#define FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY         (1<<2)
 #define FEATURE_CONFIG_BC_SUPPORTS_DUAL_PHY_OPT_MDL_VRFY        (1<<3)
        /* Will be populated during common init */
        struct bnx2x_phy phy[MAX_PHYS];
@@ -334,6 +337,11 @@ void bnx2x_ext_phy_hw_reset(struct bnx2x *bp, u8 port);
 /* Reset the external of SFX7101 */
 void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, struct bnx2x_phy *phy);
+/* Read "byte_cnt" bytes from address "addr" from the SFP+ EEPROM */
+u8 bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,
+                                struct link_params *params, u16 addr,
+                                u8 byte_cnt, u8 *o_buf);
 void bnx2x_hw_reset_phy(struct link_params *params);
 /* Checks if HW lock is required for this phy/board type */
@@ -379,7 +387,7 @@ void bnx2x_ets_disabled(struct link_params *params);
 /* Used to configure the ETS to BW limited */
 void bnx2x_ets_bw_limit(const struct link_params *params, const u32 cos0_bw,
-                                                const u32 cos1_bw);
+                        const u32 cos1_bw);
 /* Used to configure the ETS to strict */
 u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos);
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 8cdcf5b39d1e..6c7745eee00d 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -586,7 +586,7 @@ static int bnx2x_issue_dmae_with_comp(struct bnx2x *bp,
           bp->slowpath->wb_data[2], bp->slowpath->wb_data[3]);
        /* lock the dmae channel */
-        mutex_lock(&bp->dmae_mutex);
+        spin_lock_bh(&bp->dmae_lock);
        /* reset completion */
        *wb_comp = 0;
@@ -617,7 +617,7 @@ static int bnx2x_issue_dmae_with_comp(struct bnx2x *bp,
           bp->slowpath->wb_data[2], bp->slowpath->wb_data[3]);
 unlock:
-        mutex_unlock(&bp->dmae_mutex);
+        spin_unlock_bh(&bp->dmae_lock);
        return rc;
 }
@@ -1397,7 +1397,7 @@ void bnx2x_sp_event(struct bnx2x_fastpath *fp,
        }
        smp_mb__before_atomic_inc();
-        atomic_inc(&bp->spq_left);
+        atomic_inc(&bp->cq_spq_left);
        /* push the change in fp->state and towards the memory */
        smp_wmb();
@@ -2301,15 +2301,10 @@ static void bnx2x_rxq_set_mac_filters(struct bnx2x *bp, u16 cl_id, u32 filters)
                /* accept matched ucast */
                drop_all_ucast = 0;
        }
-        if (filters & BNX2X_ACCEPT_MULTICAST) {
+        if (filters & BNX2X_ACCEPT_MULTICAST)
                /* accept matched mcast */
                drop_all_mcast = 0;
-                if (IS_MF_SI(bp))
-                        /* since mcast addresses won't arrive with ovlan,
-                         * fw needs to accept all of them in
-                         * switch-independent mode */
-                        accp_all_mcast = 1;
-        }
        if (filters & BNX2X_ACCEPT_ALL_UNICAST) {
                /* accept all mcast */
                drop_all_ucast = 0;
@@ -2478,8 +2473,14 @@ static void bnx2x_pf_rx_cl_prep(struct bnx2x *bp,
        rxq_init->sge_map = fp->rx_sge_mapping;
        rxq_init->rcq_map = fp->rx_comp_mapping;
        rxq_init->rcq_np_map = fp->rx_comp_mapping + BCM_PAGE_SIZE;
-        rxq_init->mtu = bp->dev->mtu;
-        rxq_init->buf_sz = bp->rx_buf_size;
+        /* Always use mini-jumbo MTU for FCoE L2 ring */
+        if (IS_FCOE_FP(fp))
+                rxq_init->mtu = BNX2X_FCOE_MINI_JUMBO_MTU;
+        else
+                rxq_init->mtu = bp->dev->mtu;
+        rxq_init->buf_sz = fp->rx_buf_size;
        rxq_init->cl_qzone_id = fp->cl_qzone_id;
        rxq_init->cl_id = fp->cl_id;
        rxq_init->spcl_id = fp->cl_id;
@@ -2731,11 +2732,18 @@ int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
        spin_lock_bh(&bp->spq_lock);
-        if (!atomic_read(&bp->spq_left)) {
+        if (common) {
-                BNX2X_ERR("BUG! SPQ ring full!\n");
+                if (!atomic_read(&bp->eq_spq_left)) {
-                spin_unlock_bh(&bp->spq_lock);
+                        BNX2X_ERR("BUG! EQ ring full!\n");
-                bnx2x_panic();
+                        spin_unlock_bh(&bp->spq_lock);
-                return -EBUSY;
+                        bnx2x_panic();
+                        return -EBUSY;
+                }
+        } else if (!atomic_read(&bp->cq_spq_left)) {
+                        BNX2X_ERR("BUG! SPQ ring full!\n");
+                        spin_unlock_bh(&bp->spq_lock);
+                        bnx2x_panic();
+                        return -EBUSY;
        }
        spe = bnx2x_sp_get_next(bp);
@@ -2766,20 +2774,26 @@ int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
        spe->data.update_data_addr.lo = cpu_to_le32(data_lo);
        /* stats ramrod has it's own slot on the spq */
-        if (command != RAMROD_CMD_ID_COMMON_STAT_QUERY)
+        if (command != RAMROD_CMD_ID_COMMON_STAT_QUERY) {
                /* It's ok if the actual decrement is issued towards the memory
                 * somewhere between the spin_lock and spin_unlock. Thus no
                 * more explict memory barrier is needed.
                 */
-                atomic_dec(&bp->spq_left);
+                if (common)
+                        atomic_dec(&bp->eq_spq_left);
+                else
+                        atomic_dec(&bp->cq_spq_left);
+        }
        DP(BNX2X_MSG_SP/*NETIF_MSG_TIMER*/,
           "SPQE[%x] (%x:%x)  command %d  hw_cid %x  data (%x:%x) "
-           "type(0x%x) left %x\n",
+           "type(0x%x) left (ETH, COMMON) (%x,%x)\n",
           bp->spq_prod_idx, (u32)U64_HI(bp->spq_mapping),
           (u32)(U64_LO(bp->spq_mapping) +
           (void *)bp->spq_prod_bd - (void *)bp->spq), command,
-           HW_CID(bp, cid), data_hi, data_lo, type, atomic_read(&bp->spq_left));
+           HW_CID(bp, cid), data_hi, data_lo, type,
+           atomic_read(&bp->cq_spq_left), atomic_read(&bp->eq_spq_left));
        bnx2x_sp_prod_update(bp);
        spin_unlock_bh(&bp->spq_lock);
@@ -3691,8 +3705,8 @@ static void bnx2x_eq_int(struct bnx2x *bp)
        sw_cons = bp->eq_cons;
        sw_prod = bp->eq_prod;
-        DP(BNX2X_MSG_SP, "EQ:  hw_cons %u  sw_cons %u bp->spq_left %u\n",
+        DP(BNX2X_MSG_SP, "EQ:  hw_cons %u  sw_cons %u bp->cq_spq_left %u\n",
-                        hw_cons, sw_cons, atomic_read(&bp->spq_left));
+                        hw_cons, sw_cons, atomic_read(&bp->eq_spq_left));
        for (; sw_cons != hw_cons;
              sw_prod = NEXT_EQ_IDX(sw_prod), sw_cons = NEXT_EQ_IDX(sw_cons)) {
@@ -3757,13 +3771,15 @@ static void bnx2x_eq_int(struct bnx2x *bp)
                case (EVENT_RING_OPCODE_SET_MAC | BNX2X_STATE_OPEN):
                case (EVENT_RING_OPCODE_SET_MAC | BNX2X_STATE_DIAG):
                        DP(NETIF_MSG_IFUP, "got set mac ramrod\n");
-                        bp->set_mac_pending = 0;
+                        if (elem->message.data.set_mac_event.echo)
+                                bp->set_mac_pending = 0;
                        break;
                case (EVENT_RING_OPCODE_SET_MAC |
                      BNX2X_STATE_CLOSING_WAIT4_HALT):
                        DP(NETIF_MSG_IFDOWN, "got (un)set mac ramrod\n");
-                        bp->set_mac_pending = 0;
+                        if (elem->message.data.set_mac_event.echo)
+                                bp->set_mac_pending = 0;
                        break;
                default:
                        /* unknown event log error and continue */
@@ -3775,7 +3791,7 @@ next_spqe:
        } /* for */
        smp_mb__before_atomic_inc();
-        atomic_add(spqe_cnt, &bp->spq_left);
+        atomic_add(spqe_cnt, &bp->eq_spq_left);
        bp->eq_cons = sw_cons;
        bp->eq_prod = sw_prod;
@@ -4208,7 +4224,7 @@ void bnx2x_update_coalesce(struct bnx2x *bp)
 static void bnx2x_init_sp_ring(struct bnx2x *bp)
 {
        spin_lock_init(&bp->spq_lock);
-        atomic_set(&bp->spq_left, MAX_SPQ_PENDING);
+        atomic_set(&bp->cq_spq_left, MAX_SPQ_PENDING);
        bp->spq_prod_idx = 0;
        bp->dsb_sp_prod = BNX2X_SP_DSB_INDEX;
@@ -4233,9 +4249,12 @@ static void bnx2x_init_eq_ring(struct bnx2x *bp)
        bp->eq_cons = 0;
        bp->eq_prod = NUM_EQ_DESC;
        bp->eq_cons_sb = BNX2X_EQ_INDEX;
+        /* we want a warning message before it gets rought... */
+        atomic_set(&bp->eq_spq_left,
+                min_t(int, MAX_SP_DESC_CNT - MAX_SPQ_PENDING, NUM_EQ_DESC) - 1);
 }
-static void bnx2x_init_ind_table(struct bnx2x *bp)
+void bnx2x_push_indir_table(struct bnx2x *bp)
 {
        int func = BP_FUNC(bp);
        int i;
@@ -4243,13 +4262,20 @@ static void bnx2x_init_ind_table(struct bnx2x *bp)
        if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
                return;
-        DP(NETIF_MSG_IFUP,
-           "Initializing indirection table  multi_mode %d\n", bp->multi_mode);
        for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
                REG_WR8(bp, BAR_TSTRORM_INTMEM +
                        TSTORM_INDIRECTION_TABLE_OFFSET(func) + i,
-                        bp->fp->cl_id + (i % (bp->num_queues -
+                        bp->fp->cl_id + bp->rx_indir_table[i]);
-                                NONE_ETH_CONTEXT_USE)));
+}
+static void bnx2x_init_ind_table(struct bnx2x *bp)
+{
+        int i;
+        for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
+                bp->rx_indir_table[i] = i % BNX2X_NUM_ETH_QUEUES(bp);
+        bnx2x_push_indir_table(bp);
 }
 void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
@@ -4281,9 +4307,12 @@ void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
                def_q_filters |= BNX2X_ACCEPT_UNICAST | BNX2X_ACCEPT_BROADCAST |
                                BNX2X_ACCEPT_MULTICAST;
 #ifdef BCM_CNIC
-                cl_id = bnx2x_fcoe(bp, cl_id);
+                if (!NO_FCOE(bp)) {
-                bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST |
+                        cl_id = bnx2x_fcoe(bp, cl_id);
-                                          BNX2X_ACCEPT_MULTICAST);
+                        bnx2x_rxq_set_mac_filters(bp, cl_id,
+                                                  BNX2X_ACCEPT_UNICAST |
+                                                  BNX2X_ACCEPT_MULTICAST);
+                }
 #endif
                break;
@@ -4291,18 +4320,29 @@ void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
                def_q_filters |= BNX2X_ACCEPT_UNICAST | BNX2X_ACCEPT_BROADCAST |
                                BNX2X_ACCEPT_ALL_MULTICAST;
 #ifdef BCM_CNIC
-                cl_id = bnx2x_fcoe(bp, cl_id);
+                /*
-                bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST |
+                 *  Prevent duplication of multicast packets by configuring FCoE
-                                          BNX2X_ACCEPT_MULTICAST);
+                 *  L2 Client to receive only matched unicast frames.
+                 */
+                if (!NO_FCOE(bp)) {
+                        cl_id = bnx2x_fcoe(bp, cl_id);
+                        bnx2x_rxq_set_mac_filters(bp, cl_id,
+                                                  BNX2X_ACCEPT_UNICAST);
+                }
 #endif
                break;
        case BNX2X_RX_MODE_PROMISC:
                def_q_filters |= BNX2X_PROMISCUOUS_MODE;
 #ifdef BCM_CNIC
-                cl_id = bnx2x_fcoe(bp, cl_id);
+                /*
-                bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST |
+                 *  Prevent packets duplication by configuring DROP_ALL for FCoE
-                                          BNX2X_ACCEPT_MULTICAST);
+                 *  L2 Client.
+                 */
+                if (!NO_FCOE(bp)) {
+                        cl_id = bnx2x_fcoe(bp, cl_id);
+                        bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_NONE);
+                }
 #endif
                /* pass management unicast packets as well */
                llh_mask |= NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_UNCST;
@@ -5296,10 +5336,6 @@ static int bnx2x_init_hw_common(struct bnx2x *bp, u32 load_code)
                }
        }
-        bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
-                                                       bp->common.shmem_base,
-                                                       bp->common.shmem2_base);
        bnx2x_setup_fan_failure_detection(bp);
        /* clear PXP2 attentions */
@@ -5503,9 +5539,6 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
        bnx2x_init_block(bp, MCP_BLOCK, init_stage);
        bnx2x_init_block(bp, DMAE_BLOCK, init_stage);
-        bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
-                                                       bp->common.shmem_base,
-                                                       bp->common.shmem2_base);
        if (bnx2x_fan_failure_det_req(bp, bp->common.shmem_base,
                                      bp->common.shmem2_base, port)) {
                u32 reg_addr = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 :
@@ -5838,7 +5871,7 @@ int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)
           BP_ABS_FUNC(bp), load_code);
        bp->dmae_ready = 0;
-        mutex_init(&bp->dmae_mutex);
+        spin_lock_init(&bp->dmae_lock);
        rc = bnx2x_gunzip_init(bp);
        if (rc)
                return rc;
@@ -5990,6 +6023,8 @@ void bnx2x_free_mem(struct bnx2x *bp)
        BNX2X_PCI_FREE(bp->eq_ring, bp->eq_mapping,
                       BCM_PAGE_SIZE * NUM_EQ_PAGES);
+        BNX2X_FREE(bp->rx_indir_table);
 #undef BNX2X_PCI_FREE
 #undef BNX2X_KFREE
 }
@@ -6120,6 +6155,9 @@ int bnx2x_alloc_mem(struct bnx2x *bp)
        /* EQ */
        BNX2X_PCI_ALLOC(bp->eq_ring, &bp->eq_mapping,
                        BCM_PAGE_SIZE * NUM_EQ_PAGES);
+        BNX2X_ALLOC(bp->rx_indir_table, sizeof(bp->rx_indir_table[0]) *
+                    TSTORM_INDIRECTION_TABLE_SIZE);
        return 0;
 alloc_mem_err:
@@ -6173,12 +6211,14 @@ static void bnx2x_set_mac_addr_gen(struct bnx2x *bp, int set, const u8 *mac,
        int ramrod_flags = WAIT_RAMROD_COMMON;
        bp->set_mac_pending = 1;
-        smp_wmb();
        config->hdr.length = 1;
        config->hdr.offset = cam_offset;
        config->hdr.client_id = 0xff;
-        config->hdr.reserved1 = 0;
+        /* Mark the single MAC configuration ramrod as opposed to a
+         * UC/MC list configuration).
+         */
+        config->hdr.echo = 1;
        /* primary MAC */
        config->config_table[0].msb_mac_addr =
@@ -6210,6 +6250,8 @@ static void bnx2x_set_mac_addr_gen(struct bnx2x *bp, int set, const u8 *mac,
           config->config_table[0].middle_mac_addr,
           config->config_table[0].lsb_mac_addr, BP_FUNC(bp), cl_bit_vec);
+        mb();
        bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
                      U64_HI(bnx2x_sp_mapping(bp, mac_config)),
                      U64_LO(bnx2x_sp_mapping(bp, mac_config)), 1);
@@ -6274,20 +6316,15 @@ static u8 bnx2x_e1h_cam_offset(struct bnx2x *bp, u8 rel_offset)
        if (CHIP_IS_E1H(bp))
                return E1H_FUNC_MAX * rel_offset + BP_FUNC(bp);
        else if (CHIP_MODE_IS_4_PORT(bp))
-                return BP_FUNC(bp) * 32  + rel_offset;
+                return E2_FUNC_MAX * rel_offset + BP_FUNC(bp);
        else
-                return BP_VN(bp) * 32  + rel_offset;
+                return E2_FUNC_MAX * rel_offset + BP_VN(bp);
 }
 /**
 *  LLH CAM line allocations: currently only iSCSI and ETH macs are
 *  relevant. In addition, current implementation is tuned for a
 *  single ETH MAC.
- *
- *  When multiple unicast ETH MACs PF configuration in switch
- *  independent mode is required (NetQ, multiple netdev MACs,
- *  etc.), consider better utilisation of 16 per function MAC
- *  entries in the LLH memory.
 */
 enum {
        LLH_CAM_ISCSI_ETH_LINE = 0,
@@ -6362,14 +6399,37 @@ void bnx2x_set_eth_mac(struct bnx2x *bp, int set)
                bnx2x_set_mac_addr_gen(bp, set, bcast, 0, cam_offset + 1, 1);
        }
 }
-static void bnx2x_set_e1_mc_list(struct bnx2x *bp, u8 offset)
+static inline u8 bnx2x_e1_cam_mc_offset(struct bnx2x *bp)
+{
+        return CHIP_REV_IS_SLOW(bp) ?
+                (BNX2X_MAX_EMUL_MULTI * (1 + BP_PORT(bp))) :
+                (BNX2X_MAX_MULTICAST * (1 + BP_PORT(bp)));
+}
+/* set mc list, do not wait as wait implies sleep and
+ * set_rx_mode can be invoked from non-sleepable context.
+ *
+ * Instead we use the same ramrod data buffer each time we need
+ * to configure a list of addresses, and use the fact that the
+ * list of MACs is changed in an incremental way and that the
+ * function is called under the netif_addr_lock. A temporary
+ * inconsistent CAM configuration (possible in case of a very fast
+ * sequence of add/del/add on the host side) will shortly be
+ * restored by the handler of the last ramrod.
+ */
+static int bnx2x_set_e1_mc_list(struct bnx2x *bp)
 {
        int i = 0, old;
        struct net_device *dev = bp->dev;
+        u8 offset = bnx2x_e1_cam_mc_offset(bp);
        struct netdev_hw_addr *ha;
        struct mac_configuration_cmd *config_cmd = bnx2x_sp(bp, mcast_config);
        dma_addr_t config_cmd_map = bnx2x_sp_mapping(bp, mcast_config);
+        if (netdev_mc_count(dev) > BNX2X_MAX_MULTICAST)
+                return -EINVAL;
        netdev_for_each_mc_addr(ha, dev) {
                /* copy mac */
                config_cmd->config_table[i].msb_mac_addr =
@@ -6410,32 +6470,47 @@ static void bnx2x_set_e1_mc_list(struct bnx2x *bp, u8 offset)
                }
        }
+        wmb();
        config_cmd->hdr.length = i;
        config_cmd->hdr.offset = offset;
        config_cmd->hdr.client_id = 0xff;
-        config_cmd->hdr.reserved1 = 0;
+        /* Mark that this ramrod doesn't use bp->set_mac_pending for
+         * synchronization.
+         */
+        config_cmd->hdr.echo = 0;
-        bp->set_mac_pending = 1;
+        mb();
-        smp_wmb();
-        bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
+        return bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
                   U64_HI(config_cmd_map), U64_LO(config_cmd_map), 1);
 }
-static void bnx2x_invlidate_e1_mc_list(struct bnx2x *bp)
+void bnx2x_invalidate_e1_mc_list(struct bnx2x *bp)
 {
        int i;
        struct mac_configuration_cmd *config_cmd = bnx2x_sp(bp, mcast_config);
        dma_addr_t config_cmd_map = bnx2x_sp_mapping(bp, mcast_config);
        int ramrod_flags = WAIT_RAMROD_COMMON;
+        u8 offset = bnx2x_e1_cam_mc_offset(bp);
-        bp->set_mac_pending = 1;
+        for (i = 0; i < BNX2X_MAX_MULTICAST; i++)
-        smp_wmb();
-        for (i = 0; i < config_cmd->hdr.length; i++)
                SET_FLAG(config_cmd->config_table[i].flags,
                        MAC_CONFIGURATION_ENTRY_ACTION_TYPE,
                        T_ETH_MAC_COMMAND_INVALIDATE);
+        wmb();
+        config_cmd->hdr.length = BNX2X_MAX_MULTICAST;
+        config_cmd->hdr.offset = offset;
+        config_cmd->hdr.client_id = 0xff;
+        /* We'll wait for a completion this time... */
+        config_cmd->hdr.echo = 1;
+        bp->set_mac_pending = 1;
+        mb();
        bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
                      U64_HI(config_cmd_map), U64_LO(config_cmd_map), 1);
@@ -6445,6 +6520,44 @@ static void bnx2x_invlidate_e1_mc_list(struct bnx2x *bp)
 }
+/* Accept one or more multicasts */
+static int bnx2x_set_e1h_mc_list(struct bnx2x *bp)
+{
+        struct net_device *dev = bp->dev;
+        struct netdev_hw_addr *ha;
+        u32 mc_filter[MC_HASH_SIZE];
+        u32 crc, bit, regidx;
+        int i;
+        memset(mc_filter, 0, 4 * MC_HASH_SIZE);
+        netdev_for_each_mc_addr(ha, dev) {
+                DP(NETIF_MSG_IFUP, "Adding mcast MAC: %pM\n",
+                   bnx2x_mc_addr(ha));
+                crc = crc32c_le(0, bnx2x_mc_addr(ha),
+                                ETH_ALEN);
+                bit = (crc >> 24) & 0xff;
+                regidx = bit >> 5;
+                bit &= 0x1f;
+                mc_filter[regidx] |= (1 << bit);
+        }
+        for (i = 0; i < MC_HASH_SIZE; i++)
+                REG_WR(bp, MC_HASH_OFFSET(bp, i),
+                       mc_filter[i]);
+        return 0;
+}
+void bnx2x_invalidate_e1h_mc_list(struct bnx2x *bp)
+{
+        int i;
+        for (i = 0; i < MC_HASH_SIZE; i++)
+                REG_WR(bp, MC_HASH_OFFSET(bp, i), 0);
+}
 #ifdef BCM_CNIC
 /**
 * Set iSCSI MAC(s) at the next enties in the CAM after the ETH
@@ -6463,12 +6576,13 @@ static int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp, int set)
        u32 iscsi_l2_cl_id = BNX2X_ISCSI_ETH_CL_ID +
                BP_E1HVN(bp) * NONE_ETH_CONTEXT_USE;
        u32 cl_bit_vec = (1 << iscsi_l2_cl_id);
+        u8 *iscsi_mac = bp->cnic_eth_dev.iscsi_mac;
        /* Send a SET_MAC ramrod */
-        bnx2x_set_mac_addr_gen(bp, set, bp->iscsi_mac, cl_bit_vec,
+        bnx2x_set_mac_addr_gen(bp, set, iscsi_mac, cl_bit_vec,
                               cam_offset, 0);
-        bnx2x_set_mac_in_nig(bp, set, bp->iscsi_mac, LLH_CAM_ISCSI_ETH_LINE);
+        bnx2x_set_mac_in_nig(bp, set, iscsi_mac, LLH_CAM_ISCSI_ETH_LINE);
        return 0;
 }
@@ -7110,20 +7224,15 @@ void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode)
        /* Give HW time to discard old tx messages */
        msleep(1);
-        if (CHIP_IS_E1(bp)) {
+        bnx2x_set_eth_mac(bp, 0);
-                /* invalidate mc list,
-                 * wait and poll (interrupts are off)
-                 */
-                bnx2x_invlidate_e1_mc_list(bp);
-                bnx2x_set_eth_mac(bp, 0);
-        } else {
-                REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0);
-                bnx2x_set_eth_mac(bp, 0);
+        bnx2x_invalidate_uc_list(bp);
-                for (i = 0; i < MC_HASH_SIZE; i++)
+        if (CHIP_IS_E1(bp))
-                        REG_WR(bp, MC_HASH_OFFSET(bp, i), 0);
+                bnx2x_invalidate_e1_mc_list(bp);
+        else {
+                bnx2x_invalidate_e1h_mc_list(bp);
+                REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0);
        }
 #ifdef BCM_CNIC
@@ -8379,13 +8488,60 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)
                 (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN))
                bp->mdio.prtad =
                        XGXS_EXT_PHY_ADDR(ext_phy_config);
+        /*
+         * Check if hw lock is required to access MDC/MDIO bus to the PHY(s)
+         * In MF mode, it is set to cover self test cases
+         */
+        if (IS_MF(bp))
+                bp->port.need_hw_lock = 1;
+        else
+                bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
+                                                        bp->common.shmem_base,
+                                                        bp->common.shmem2_base);
 }
+#ifdef BCM_CNIC
+static void __devinit bnx2x_get_cnic_info(struct bnx2x *bp)
+{
+        u32 max_iscsi_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,
+                                drv_lic_key[BP_PORT(bp)].max_iscsi_conn);
+        u32 max_fcoe_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,
+                                drv_lic_key[BP_PORT(bp)].max_fcoe_conn);
+        /* Get the number of maximum allowed iSCSI and FCoE connections */
+        bp->cnic_eth_dev.max_iscsi_conn =
+                (max_iscsi_conn & BNX2X_MAX_ISCSI_INIT_CONN_MASK) >>
+                BNX2X_MAX_ISCSI_INIT_CONN_SHIFT;
+        bp->cnic_eth_dev.max_fcoe_conn =
+                (max_fcoe_conn & BNX2X_MAX_FCOE_INIT_CONN_MASK) >>
+                BNX2X_MAX_FCOE_INIT_CONN_SHIFT;
+        BNX2X_DEV_INFO("max_iscsi_conn 0x%x max_fcoe_conn 0x%x\n",
+                       bp->cnic_eth_dev.max_iscsi_conn,
+                       bp->cnic_eth_dev.max_fcoe_conn);
+        /* If mamimum allowed number of connections is zero -
+         * disable the feature.
+         */
+        if (!bp->cnic_eth_dev.max_iscsi_conn)
+                bp->flags |= NO_ISCSI_OOO_FLAG | NO_ISCSI_FLAG;
+        if (!bp->cnic_eth_dev.max_fcoe_conn)
+                bp->flags |= NO_FCOE_FLAG;
+}
+#endif
 static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
 {
        u32 val, val2;
        int func = BP_ABS_FUNC(bp);
        int port = BP_PORT(bp);
+#ifdef BCM_CNIC
+        u8 *iscsi_mac = bp->cnic_eth_dev.iscsi_mac;
+        u8 *fip_mac = bp->fip_mac;
+#endif
        if (BP_NOMCP(bp)) {
                BNX2X_ERROR("warning: random MAC workaround active\n");
@@ -8398,7 +8554,9 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
                        bnx2x_set_mac_buf(bp->dev->dev_addr, val, val2);
 #ifdef BCM_CNIC
-                /* iSCSI NPAR MAC */
+                /* iSCSI and FCoE NPAR MACs: if there is no either iSCSI or
+                 * FCoE MAC then the appropriate feature should be disabled.
+                 */
                if (IS_MF_SI(bp)) {
                        u32 cfg = MF_CFG_RD(bp, func_ext_config[func].func_cfg);
                        if (cfg & MACP_FUNC_CFG_FLAGS_ISCSI_OFFLOAD) {
@@ -8406,8 +8564,39 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
                                                     iscsi_mac_addr_upper);
                                val = MF_CFG_RD(bp, func_ext_config[func].
                                                    iscsi_mac_addr_lower);
-                                bnx2x_set_mac_buf(bp->iscsi_mac, val, val2);
+                                BNX2X_DEV_INFO("Read iSCSI MAC: "
-                        }
+                                               "0x%x:0x%04x\n", val2, val);
+                                bnx2x_set_mac_buf(iscsi_mac, val, val2);
+                                /* Disable iSCSI OOO if MAC configuration is
+                                 * invalid.
+                                 */
+                                if (!is_valid_ether_addr(iscsi_mac)) {
+                                        bp->flags |= NO_ISCSI_OOO_FLAG |
+                                                     NO_ISCSI_FLAG;
+                                        memset(iscsi_mac, 0, ETH_ALEN);
+                                }
+                        } else
+                                bp->flags |= NO_ISCSI_OOO_FLAG | NO_ISCSI_FLAG;
+                        if (cfg & MACP_FUNC_CFG_FLAGS_FCOE_OFFLOAD) {
+                                val2 = MF_CFG_RD(bp, func_ext_config[func].
+                                                     fcoe_mac_addr_upper);
+                                val = MF_CFG_RD(bp, func_ext_config[func].
+                                                    fcoe_mac_addr_lower);
+                                BNX2X_DEV_INFO("Read FCoE MAC to "
+                                               "0x%x:0x%04x\n", val2, val);
+                                bnx2x_set_mac_buf(fip_mac, val, val2);
+                                /* Disable FCoE if MAC configuration is
+                                 * invalid.
+                                 */
+                                if (!is_valid_ether_addr(fip_mac)) {
+                                        bp->flags |= NO_FCOE_FLAG;
+                                        memset(bp->fip_mac, 0, ETH_ALEN);
+                                }
+                        } else
+                                bp->flags |= NO_FCOE_FLAG;
                }
 #endif
        } else {
@@ -8421,7 +8610,7 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
                                    iscsi_mac_upper);
                val = SHMEM_RD(bp, dev_info.port_hw_config[port].
                                   iscsi_mac_lower);
-                bnx2x_set_mac_buf(bp->iscsi_mac, val, val2);
+                bnx2x_set_mac_buf(iscsi_mac, val, val2);
 #endif
        }
@@ -8429,14 +8618,12 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
        memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN);
 #ifdef BCM_CNIC
-        /* Inform the upper layers about FCoE MAC */
+        /* Set the FCoE MAC in modes other then MF_SI */
        if (!CHIP_IS_E1x(bp)) {
                if (IS_MF_SD(bp))
-                        memcpy(bp->fip_mac, bp->dev->dev_addr,
+                        memcpy(fip_mac, bp->dev->dev_addr, ETH_ALEN);
-                               sizeof(bp->fip_mac));
+                else if (!IS_MF(bp))
-                else
+                        memcpy(fip_mac, iscsi_mac, ETH_ALEN);
-                        memcpy(bp->fip_mac, bp->iscsi_mac,
-                               sizeof(bp->fip_mac));
        }
 #endif
 }
@@ -8599,6 +8786,10 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)
        /* Get MAC addresses */
        bnx2x_get_mac_hwinfo(bp);
+#ifdef BCM_CNIC
+        bnx2x_get_cnic_info(bp);
+#endif
        return rc;
 }
@@ -8813,12 +9004,197 @@ static int bnx2x_close(struct net_device *dev)
        return 0;
 }
+#define E1_MAX_UC_LIST  29
+#define E1H_MAX_UC_LIST 30
+#define E2_MAX_UC_LIST  14
+static inline u8 bnx2x_max_uc_list(struct bnx2x *bp)
+{
+        if (CHIP_IS_E1(bp))
+                return E1_MAX_UC_LIST;
+        else if (CHIP_IS_E1H(bp))
+                return E1H_MAX_UC_LIST;
+        else
+                return E2_MAX_UC_LIST;
+}
+static inline u8 bnx2x_uc_list_cam_offset(struct bnx2x *bp)
+{
+        if (CHIP_IS_E1(bp))
+                /* CAM Entries for Port0:
+                 *      0 - prim ETH MAC
+                 *      1 - BCAST MAC
+                 *      2 - iSCSI L2 ring ETH MAC
+                 *      3-31 - UC MACs
+                 *
+                 * Port1 entries are allocated the same way starting from
+                 * entry 32.
+                 */
+                return 3 + 32 * BP_PORT(bp);
+        else if (CHIP_IS_E1H(bp)) {
+                /* CAM Entries:
+                 *      0-7  - prim ETH MAC for each function
+                 *      8-15 - iSCSI L2 ring ETH MAC for each function
+                 *      16 till 255 UC MAC lists for each function
+                 *
+                 * Remark: There is no FCoE support for E1H, thus FCoE related
+                 *         MACs are not considered.
+                 */
+                return E1H_FUNC_MAX * (CAM_ISCSI_ETH_LINE + 1) +
+                        bnx2x_max_uc_list(bp) * BP_FUNC(bp);
+        } else {
+                /* CAM Entries (there is a separate CAM per engine):
+                 *      0-4  - prim ETH MAC for each function
+                 *      4-7 - iSCSI L2 ring ETH MAC for each function
+                 *      8-11 - FIP ucast L2 MAC for each function
+                 *      12-15 - ALL_ENODE_MACS mcast MAC for each function
+                 *      16 till 71 UC MAC lists for each function
+                 */
+                u8 func_idx =
+                        (CHIP_MODE_IS_4_PORT(bp) ? BP_FUNC(bp) : BP_VN(bp));
+                return E2_FUNC_MAX * (CAM_MAX_PF_LINE + 1) +
+                        bnx2x_max_uc_list(bp) * func_idx;
+        }
+}
+/* set uc list, do not wait as wait implies sleep and
+ * set_rx_mode can be invoked from non-sleepable context.
+ *
+ * Instead we use the same ramrod data buffer each time we need
+ * to configure a list of addresses, and use the fact that the
+ * list of MACs is changed in an incremental way and that the
+ * function is called under the netif_addr_lock. A temporary
+ * inconsistent CAM configuration (possible in case of very fast
+ * sequence of add/del/add on the host side) will shortly be
+ * restored by the handler of the last ramrod.
+ */
+static int bnx2x_set_uc_list(struct bnx2x *bp)
+{
+        int i = 0, old;
+        struct net_device *dev = bp->dev;
+        u8 offset = bnx2x_uc_list_cam_offset(bp);
+        struct netdev_hw_addr *ha;
+        struct mac_configuration_cmd *config_cmd = bnx2x_sp(bp, uc_mac_config);
+        dma_addr_t config_cmd_map = bnx2x_sp_mapping(bp, uc_mac_config);
+        if (netdev_uc_count(dev) > bnx2x_max_uc_list(bp))
+                return -EINVAL;
+        netdev_for_each_uc_addr(ha, dev) {
+                /* copy mac */
+                config_cmd->config_table[i].msb_mac_addr =
+                        swab16(*(u16 *)&bnx2x_uc_addr(ha)[0]);
+                config_cmd->config_table[i].middle_mac_addr =
+                        swab16(*(u16 *)&bnx2x_uc_addr(ha)[2]);
+                config_cmd->config_table[i].lsb_mac_addr =
+                        swab16(*(u16 *)&bnx2x_uc_addr(ha)[4]);
+                config_cmd->config_table[i].vlan_id = 0;
+                config_cmd->config_table[i].pf_id = BP_FUNC(bp);
+                config_cmd->config_table[i].clients_bit_vector =
+                        cpu_to_le32(1 << BP_L_ID(bp));
+                SET_FLAG(config_cmd->config_table[i].flags,
+                        MAC_CONFIGURATION_ENTRY_ACTION_TYPE,
+                        T_ETH_MAC_COMMAND_SET);
+                DP(NETIF_MSG_IFUP,
+                   "setting UCAST[%d] (%04x:%04x:%04x)\n", i,
+                   config_cmd->config_table[i].msb_mac_addr,
+                   config_cmd->config_table[i].middle_mac_addr,
+                   config_cmd->config_table[i].lsb_mac_addr);
+                i++;
+                /* Set uc MAC in NIG */
+                bnx2x_set_mac_in_nig(bp, 1, bnx2x_uc_addr(ha),
+                                     LLH_CAM_ETH_LINE + i);
+        }
+        old = config_cmd->hdr.length;
+        if (old > i) {
+                for (; i < old; i++) {
+                        if (CAM_IS_INVALID(config_cmd->
+                                           config_table[i])) {
+                                /* already invalidated */
+                                break;
+                        }
+                        /* invalidate */
+                        SET_FLAG(config_cmd->config_table[i].flags,
+                                MAC_CONFIGURATION_ENTRY_ACTION_TYPE,
+                                T_ETH_MAC_COMMAND_INVALIDATE);
+                }
+        }
+        wmb();
+        config_cmd->hdr.length = i;
+        config_cmd->hdr.offset = offset;
+        config_cmd->hdr.client_id = 0xff;
+        /* Mark that this ramrod doesn't use bp->set_mac_pending for
+         * synchronization.
+         */
+        config_cmd->hdr.echo = 0;
+        mb();
+        return bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
+                   U64_HI(config_cmd_map), U64_LO(config_cmd_map), 1);
+}
+void bnx2x_invalidate_uc_list(struct bnx2x *bp)
+{
+        int i;
+        struct mac_configuration_cmd *config_cmd = bnx2x_sp(bp, uc_mac_config);
+        dma_addr_t config_cmd_map = bnx2x_sp_mapping(bp, uc_mac_config);
+        int ramrod_flags = WAIT_RAMROD_COMMON;
+        u8 offset = bnx2x_uc_list_cam_offset(bp);
+        u8 max_list_size = bnx2x_max_uc_list(bp);
+        for (i = 0; i < max_list_size; i++) {
+                SET_FLAG(config_cmd->config_table[i].flags,
+                        MAC_CONFIGURATION_ENTRY_ACTION_TYPE,
+                        T_ETH_MAC_COMMAND_INVALIDATE);
+                bnx2x_set_mac_in_nig(bp, 0, NULL, LLH_CAM_ETH_LINE + 1 + i);
+        }
+        wmb();
+        config_cmd->hdr.length = max_list_size;
+        config_cmd->hdr.offset = offset;
+        config_cmd->hdr.client_id = 0xff;
+        /* We'll wait for a completion this time... */
+        config_cmd->hdr.echo = 1;
+        bp->set_mac_pending = 1;
+        mb();
+        bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
+                      U64_HI(config_cmd_map), U64_LO(config_cmd_map), 1);
+        /* Wait for a completion */
+        bnx2x_wait_ramrod(bp, 0, 0, &bp->set_mac_pending,
+                                ramrod_flags);
+}
+static inline int bnx2x_set_mc_list(struct bnx2x *bp)
+{
+        /* some multicasts */
+        if (CHIP_IS_E1(bp)) {
+                return bnx2x_set_e1_mc_list(bp);
+        } else { /* E1H and newer */
+                return bnx2x_set_e1h_mc_list(bp);
+        }
+}
 /* called with netif_tx_lock from dev_mcast.c */
 void bnx2x_set_rx_mode(struct net_device *dev)
 {
        struct bnx2x *bp = netdev_priv(dev);
        u32 rx_mode = BNX2X_RX_MODE_NORMAL;
-        int port = BP_PORT(bp);
        if (bp->state != BNX2X_STATE_OPEN) {
                DP(NETIF_MSG_IFUP, "state is %x, returning\n", bp->state);
@@ -8829,47 +9205,16 @@ void bnx2x_set_rx_mode(struct net_device *dev)
        if (dev->flags & IFF_PROMISC)
                rx_mode = BNX2X_RX_MODE_PROMISC;
-        else if ((dev->flags & IFF_ALLMULTI) ||
+        else if (dev->flags & IFF_ALLMULTI)
-                 ((netdev_mc_count(dev) > BNX2X_MAX_MULTICAST) &&
-                  CHIP_IS_E1(bp)))
                rx_mode = BNX2X_RX_MODE_ALLMULTI;
-        else { /* some multicasts */
+        else {
-                if (CHIP_IS_E1(bp)) {
+                /* some multicasts */
-                        /*
+                if (bnx2x_set_mc_list(bp))
-                         * set mc list, do not wait as wait implies sleep
+                        rx_mode = BNX2X_RX_MODE_ALLMULTI;
-                         * and set_rx_mode can be invoked from non-sleepable
-                         * context
-                         */
-                        u8 offset = (CHIP_REV_IS_SLOW(bp) ?
-                                     BNX2X_MAX_EMUL_MULTI*(1 + port) :
-                                     BNX2X_MAX_MULTICAST*(1 + port));
-                        bnx2x_set_e1_mc_list(bp, offset);
-                } else { /* E1H */
-                        /* Accept one or more multicasts */
-                        struct netdev_hw_addr *ha;
-                        u32 mc_filter[MC_HASH_SIZE];
-                        u32 crc, bit, regidx;
-                        int i;
-                        memset(mc_filter, 0, 4 * MC_HASH_SIZE);
-                        netdev_for_each_mc_addr(ha, dev) {
-                                DP(NETIF_MSG_IFUP, "Adding mcast MAC: %pM\n",
-                                   bnx2x_mc_addr(ha));
-                                crc = crc32c_le(0, bnx2x_mc_addr(ha),
-                                                ETH_ALEN);
-                                bit = (crc >> 24) & 0xff;
-                                regidx = bit >> 5;
-                                bit &= 0x1f;
-                                mc_filter[regidx] |= (1 << bit);
-                        }
-                        for (i = 0; i < MC_HASH_SIZE; i++)
+                /* some unicasts */
-                                REG_WR(bp, MC_HASH_OFFSET(bp, i),
+                if (bnx2x_set_uc_list(bp))
-                                       mc_filter[i]);
+                        rx_mode = BNX2X_RX_MODE_PROMISC;
-                }
        }
        bp->rx_mode = rx_mode;
@@ -8950,7 +9295,7 @@ static const struct net_device_ops bnx2x_netdev_ops = {
        .ndo_stop               = bnx2x_close,
        .ndo_start_xmit         = bnx2x_start_xmit,
        .ndo_select_queue       = bnx2x_select_queue,
-        .ndo_set_multicast_list = bnx2x_set_rx_mode,
+        .ndo_set_rx_mode        = bnx2x_set_rx_mode,
        .ndo_set_mac_address    = bnx2x_change_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
        .ndo_do_ioctl           = bnx2x_ioctl,
@@ -9776,15 +10121,21 @@ static void bnx2x_cnic_sp_post(struct bnx2x *bp, int count)
                                        HW_CID(bp, BNX2X_ISCSI_ETH_CID));
                }
-                /* There may be not more than 8 L2 and COMMON SPEs and not more
+                /* There may be not more than 8 L2 and not more than 8 L5 SPEs
-                 * than 8 L5 SPEs in the air.
+                 * We also check that the number of outstanding
+                 * COMMON ramrods is not more than the EQ and SPQ can
+                 * accommodate.
                 */
-                if ((type == NONE_CONNECTION_TYPE) ||
+                if (type == ETH_CONNECTION_TYPE) {
-                    (type == ETH_CONNECTION_TYPE)) {
+                        if (!atomic_read(&bp->cq_spq_left))
-                        if (!atomic_read(&bp->spq_left))
+                                break;
+                        else
+                                atomic_dec(&bp->cq_spq_left);
+                } else if (type == NONE_CONNECTION_TYPE) {
+                        if (!atomic_read(&bp->eq_spq_left))
                                break;
                        else
-                                atomic_dec(&bp->spq_left);
+                                atomic_dec(&bp->eq_spq_left);
                } else if ((type == ISCSI_CONNECTION_TYPE) ||
                           (type == FCOE_CONNECTION_TYPE)) {
                        if (bp->cnic_spq_pending >=
@@ -9862,7 +10213,8 @@ static int bnx2x_cnic_ctl_send(struct bnx2x *bp, struct cnic_ctl_info *ctl)
        int rc = 0;
        mutex_lock(&bp->cnic_mutex);
-        c_ops = bp->cnic_ops;
+        c_ops = rcu_dereference_protected(bp->cnic_ops,
+                                          lockdep_is_held(&bp->cnic_mutex));
        if (c_ops)
                rc = c_ops->cnic_ctl(bp->cnic_data, ctl);
        mutex_unlock(&bp->cnic_mutex);
@@ -9976,7 +10328,7 @@ static int bnx2x_drv_ctl(struct net_device *dev, struct drv_ctl_info *ctl)
                int count = ctl->data.credit.credit_count;
                smp_mb__before_atomic_inc();
-                atomic_add(count, &bp->spq_left);
+                atomic_add(count, &bp->cq_spq_left);
                smp_mb__after_atomic_inc();
                break;
        }
@@ -10072,6 +10424,13 @@ struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *dev)
        struct bnx2x *bp = netdev_priv(dev);
        struct cnic_eth_dev *cp = &bp->cnic_eth_dev;
+        /* If both iSCSI and FCoE are disabled - return NULL in
+         * order to indicate CNIC that it should not try to work
+         * with this device.
+         */
+        if (NO_ISCSI(bp) && NO_FCOE(bp))
+                return NULL;
        cp->drv_owner = THIS_MODULE;
        cp->chip_id = CHIP_ID(bp);
        cp->pdev = bp->pdev;
@@ -10092,6 +10451,15 @@ struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *dev)
                BP_E1HVN(bp) * NONE_ETH_CONTEXT_USE;
        cp->iscsi_l2_cid = BNX2X_ISCSI_ETH_CID;
+        if (NO_ISCSI_OOO(bp))
+                cp->drv_state |= CNIC_DRV_STATE_NO_ISCSI_OOO;
+        if (NO_ISCSI(bp))
+                cp->drv_state |= CNIC_DRV_STATE_NO_ISCSI;
+        if (NO_FCOE(bp))
+                cp->drv_state |= CNIC_DRV_STATE_NO_FCOE;
        DP(BNX2X_MSG_SP, "page_size %d, tbl_offset %d, tbl_lines %d, "
                         "starting cid %d\n",
           cp->ctx_blk_size,
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h
index c939683e3d61..1c89f19a4425 100644
--- a/drivers/net/bnx2x/bnx2x_reg.h
+++ b/drivers/net/bnx2x/bnx2x_reg.h
@@ -6083,6 +6083,7 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_PMA_REG_8727_PCS_OPT_CTRL          0xc808
 #define MDIO_PMA_REG_8727_GPIO_CTRL             0xc80e
 #define MDIO_PMA_REG_8727_PCS_GP                0xc842
+#define MDIO_PMA_REG_8727_OPT_CFG_REG           0xc8e4
 #define MDIO_AN_REG_8727_MISC_CTRL              0x8309
@@ -6194,7 +6195,11 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_COPPER        0x0000
 #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_FIBER         0x0100
 #define MDIO_CTL_REG_84823_MEDIA_FIBER_1G                       0x1000
+#define MDIO_CTL_REG_84823_USER_CTRL_REG                0x4005
+#define MDIO_CTL_REG_84823_USER_CTRL_CMS                0x0080
+#define MDIO_PMA_REG_84823_CTL_LED_CTL_1                0xa8e3
+#define MDIO_PMA_REG_84823_LED3_STRETCH_EN              0x0080
 #define IGU_FUNC_BASE                   0x0400
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 171782e2bb39..1024ae158227 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2470,6 +2470,10 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac
        if (!(dev->flags & IFF_MASTER))
                goto out;
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out;
        if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
                goto out;
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index f4e638c65129..5c6fba802f2b 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -326,6 +326,10 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
                goto out;
        }
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out;
        if (!pskb_may_pull(skb, arp_hdr_len(bond_dev)))
                goto out;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b1025b85acf1..77e3c6a7176a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1372,8 +1372,8 @@ static int bond_compute_features(struct bonding *bond)
 {
        struct slave *slave;
        struct net_device *bond_dev = bond->dev;
-        unsigned long features = bond_dev->features;
+        u32 features = bond_dev->features;
-        unsigned long vlan_features = 0;
+        u32 vlan_features = 0;
        unsigned short max_hard_header_len = max((u16)ETH_HLEN,
                                                bond_dev->hard_header_len);
        int i;
@@ -1400,8 +1400,8 @@ static int bond_compute_features(struct bonding *bond)
 done:
        features |= (bond_dev->features & BOND_VLAN_FEATURES);
-        bond_dev->features = netdev_fix_features(features, NULL);
+        bond_dev->features = netdev_fix_features(bond_dev, features);
-        bond_dev->vlan_features = netdev_fix_features(vlan_features, NULL);
+        bond_dev->vlan_features = netdev_fix_features(bond_dev, vlan_features);
        bond_dev->hard_header_len = max_hard_header_len;
        return 0;
@@ -1594,9 +1594,9 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                }
        }
-        res = netdev_set_master(slave_dev, bond_dev);
+        res = netdev_set_bond_master(slave_dev, bond_dev);
        if (res) {
-                pr_debug("Error %d calling netdev_set_master\n", res);
+                pr_debug("Error %d calling netdev_set_bond_master\n", res);
                goto err_restore_mac;
        }
        /* open the slave since the application closed it */
@@ -1812,7 +1812,7 @@ err_close:
        dev_close(slave_dev);
 err_unset_master:
-        netdev_set_master(slave_dev, NULL);
+        netdev_set_bond_master(slave_dev, NULL);
 err_restore_mac:
        if (!bond->params.fail_over_mac) {
@@ -1992,7 +1992,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                netif_addr_unlock_bh(bond_dev);
        }
-        netdev_set_master(slave_dev, NULL);
+        netdev_set_bond_master(slave_dev, NULL);
 #ifdef CONFIG_NET_POLL_CONTROLLER
        read_lock_bh(&bond->lock);
@@ -2114,7 +2114,7 @@ static int bond_release_all(struct net_device *bond_dev)
                        netif_addr_unlock_bh(bond_dev);
                }
-                netdev_set_master(slave_dev, NULL);
+                netdev_set_bond_master(slave_dev, NULL);
                /* close slave before restoring its mac address */
                dev_close(slave_dev);
@@ -2733,6 +2733,10 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
        if (!slave || !slave_do_arp_validate(bond, slave))
                goto out_unlock;
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out_unlock;
        if (!pskb_may_pull(skb, arp_hdr_len(dev)))
                goto out_unlock;
@@ -4653,6 +4657,8 @@ static const struct net_device_ops bond_netdev_ops = {
        .ndo_netpoll_cleanup    = bond_netpoll_cleanup,
        .ndo_poll_controller    = bond_poll_controller,
 #endif
+        .ndo_add_slave          = bond_enslave,
+        .ndo_del_slave          = bond_release,
 };
 static void bond_destructor(struct net_device *bond_dev)
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 8fd0174c5380..72bb0f6cc9bf 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1198,7 +1198,7 @@ static ssize_t bonding_store_carrier(struct device *d,
                        bond->dev->name, new_value);
        }
 out:
-        return count;
+        return ret;
 }
 static DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR,
                   bonding_show_carrier, bonding_store_carrier);
@@ -1595,7 +1595,7 @@ static ssize_t bonding_store_slaves_active(struct device *d,
                }
        }
 out:
-        return count;
+        return ret;
 }
 static DEVICE_ATTR(all_slaves_active, S_IRUGO | S_IWUSR,
                   bonding_show_slaves_active, bonding_store_slaves_active);
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index d5a9db60ade9..1d699e3df547 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -23,7 +23,7 @@ config CAN_SLCAN
          As only the sending and receiving of CAN frames is implemented, this
          driver should work with the (serial/USB) CAN hardware from:
-          www.canusb.com / www.can232.com / www.mictronic.com / www.canhack.de
+          www.canusb.com / www.can232.com / www.mictronics.de / www.canhack.de
          Userspace tools to attach the SLCAN line discipline (slcan_attach,
          slcand) can be found in the can-utils at the SocketCAN SVN, see
@@ -115,8 +115,12 @@ source "drivers/net/can/mscan/Kconfig"
 source "drivers/net/can/sja1000/Kconfig"
+source "drivers/net/can/c_can/Kconfig"
 source "drivers/net/can/usb/Kconfig"
+source "drivers/net/can/softing/Kconfig"
 config CAN_DEBUG_DEVICES
        bool "CAN devices debugging messages"
        depends on CAN
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
index 07ca159ba3f9..24ebfe8d758a 100644
--- a/drivers/net/can/Makefile
+++ b/drivers/net/can/Makefile
@@ -9,9 +9,11 @@ obj-$(CONFIG_CAN_DEV)		+= can-dev.o
 can-dev-y                       := dev.o
 obj-y                           += usb/
+obj-y                           += softing/
 obj-$(CONFIG_CAN_SJA1000)       += sja1000/
 obj-$(CONFIG_CAN_MSCAN)         += mscan/
+obj-$(CONFIG_CAN_C_CAN)         += c_can/
 obj-$(CONFIG_CAN_AT91)          += at91_can.o
 obj-$(CONFIG_CAN_TI_HECC)       += ti_hecc.o
 obj-$(CONFIG_CAN_MCP251X)       += mcp251x.o
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 7ef83d06f7ed..57d2ffbbb433 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -2,7 +2,7 @@
 * at91_can.c - CAN network driver for AT91 SoC CAN controller
 *
 * (C) 2007 by Hans J. Koch <hjk@hansjkoch.de>
- * (C) 2008, 2009, 2010 by Marc Kleine-Budde <kernel@pengutronix.de>
+ * (C) 2008, 2009, 2010, 2011 by Marc Kleine-Budde <kernel@pengutronix.de>
 *
 * This software may be distributed under the terms of the GNU General
 * Public License ("GPL") version 2 as distributed in the 'COPYING'
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
+#include <linux/rtnetlink.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
@@ -40,22 +41,23 @@
 #include <mach/board.h>
-#define AT91_NAPI_WEIGHT        12
+#define AT91_NAPI_WEIGHT        11
 /*
 * RX/TX Mailbox split
 * don't dare to touch
 */
-#define AT91_MB_RX_NUM          12
+#define AT91_MB_RX_NUM          11
 #define AT91_MB_TX_SHIFT        2
-#define AT91_MB_RX_FIRST        0
+#define AT91_MB_RX_FIRST        1
 #define AT91_MB_RX_LAST         (AT91_MB_RX_FIRST + AT91_MB_RX_NUM - 1)
 #define AT91_MB_RX_MASK(i)      ((1 << (i)) - 1)
 #define AT91_MB_RX_SPLIT        8
 #define AT91_MB_RX_LOW_LAST     (AT91_MB_RX_SPLIT - 1)
-#define AT91_MB_RX_LOW_MASK     (AT91_MB_RX_MASK(AT91_MB_RX_SPLIT))
+#define AT91_MB_RX_LOW_MASK     (AT91_MB_RX_MASK(AT91_MB_RX_SPLIT) & \
+                                 ~AT91_MB_RX_MASK(AT91_MB_RX_FIRST))
 #define AT91_MB_TX_NUM          (1 << AT91_MB_TX_SHIFT)
 #define AT91_MB_TX_FIRST        (AT91_MB_RX_LAST + 1)
@@ -168,6 +170,8 @@ struct at91_priv {
        struct clk              *clk;
        struct at91_can_data    *pdata;
+        canid_t                 mb0_id;
 };
 static struct can_bittiming_const at91_bittiming_const = {
@@ -220,6 +224,18 @@ static inline void set_mb_mode(const struct at91_priv *priv, unsigned int mb,
        set_mb_mode_prio(priv, mb, mode, 0);
 }
+static inline u32 at91_can_id_to_reg_mid(canid_t can_id)
+{
+        u32 reg_mid;
+        if (can_id & CAN_EFF_FLAG)
+                reg_mid = (can_id & CAN_EFF_MASK) | AT91_MID_MIDE;
+        else
+                reg_mid = (can_id & CAN_SFF_MASK) << 18;
+        return reg_mid;
+}
 /*
 * Swtich transceiver on or off
 */
@@ -233,12 +249,22 @@ static void at91_setup_mailboxes(struct net_device *dev)
 {
        struct at91_priv *priv = netdev_priv(dev);
        unsigned int i;
+        u32 reg_mid;
        /*
-         * The first 12 mailboxes are used as a reception FIFO. The
+         * Due to a chip bug (errata 50.2.6.3 & 50.3.5.3) the first
-         * last mailbox is configured with overwrite option. The
+         * mailbox is disabled. The next 11 mailboxes are used as a
-         * overwrite flag indicates a FIFO overflow.
+         * reception FIFO. The last mailbox is configured with
+         * overwrite option. The overwrite flag indicates a FIFO
+         * overflow.
         */
+        reg_mid = at91_can_id_to_reg_mid(priv->mb0_id);
+        for (i = 0; i < AT91_MB_RX_FIRST; i++) {
+                set_mb_mode(priv, i, AT91_MB_MODE_DISABLED);
+                at91_write(priv, AT91_MID(i), reg_mid);
+                at91_write(priv, AT91_MCR(i), 0x0);     /* clear dlc */
+        }
        for (i = AT91_MB_RX_FIRST; i < AT91_MB_RX_LAST; i++)
                set_mb_mode(priv, i, AT91_MB_MODE_RX);
        set_mb_mode(priv, AT91_MB_RX_LAST, AT91_MB_MODE_RX_OVRWR);
@@ -254,7 +280,8 @@ static void at91_setup_mailboxes(struct net_device *dev)
                set_mb_mode_prio(priv, i, AT91_MB_MODE_TX, 0);
        /* Reset tx and rx helper pointers */
-        priv->tx_next = priv->tx_echo = priv->rx_next = 0;
+        priv->tx_next = priv->tx_echo = 0;
+        priv->rx_next = AT91_MB_RX_FIRST;
 }
 static int at91_set_bittiming(struct net_device *dev)
@@ -372,12 +399,7 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)
                netdev_err(dev, "BUG! TX buffer full when queue awake!\n");
                return NETDEV_TX_BUSY;
        }
+        reg_mid = at91_can_id_to_reg_mid(cf->can_id);
-        if (cf->can_id & CAN_EFF_FLAG)
-                reg_mid = (cf->can_id & CAN_EFF_MASK) | AT91_MID_MIDE;
-        else
-                reg_mid = (cf->can_id & CAN_SFF_MASK) << 18;
        reg_mcr = ((cf->can_id & CAN_RTR_FLAG) ? AT91_MCR_MRTR : 0) |
                (cf->can_dlc << 16) | AT91_MCR_MTCR;
@@ -539,27 +561,31 @@ static void at91_read_msg(struct net_device *dev, unsigned int mb)
 *
 * Theory of Operation:
 *
- * 12 of the 16 mailboxes on the chip are reserved for RX. we split
+ * 11 of the 16 mailboxes on the chip are reserved for RX. we split
- * them into 2 groups. The lower group holds 8 and upper 4 mailboxes.
+ * them into 2 groups. The lower group holds 7 and upper 4 mailboxes.
 *
 * Like it or not, but the chip always saves a received CAN message
 * into the first free mailbox it finds (starting with the
 * lowest). This makes it very difficult to read the messages in the
 * right order from the chip. This is how we work around that problem:
 *
- * The first message goes into mb nr. 0 and issues an interrupt. All
+ * The first message goes into mb nr. 1 and issues an interrupt. All
 * rx ints are disabled in the interrupt handler and a napi poll is
 * scheduled. We read the mailbox, but do _not_ reenable the mb (to
 * receive another message).
 *
 *    lower mbxs      upper
- *   ______^______    __^__
+ *     ____^______    __^__
- *  /             \  /     \
+ *    /           \  /     \
 * +-+-+-+-+-+-+-+-++-+-+-+-+
- * |x|x|x|x|x|x|x|x|| | | | |
+ * | |x|x|x|x|x|x|x|| | | | |
 * +-+-+-+-+-+-+-+-++-+-+-+-+
 *  0 0 0 0 0 0  0 0 0 0 1 1  \ mail
 *  0 1 2 3 4 5  6 7 8 9 0 1  / box
+ *  ^
+ *  |
+ *   \
+ *     unused, due to chip bug
 *
 * The variable priv->rx_next points to the next mailbox to read a
 * message from. As long we're in the lower mailboxes we just read the
@@ -590,10 +616,10 @@ static int at91_poll_rx(struct net_device *dev, int quota)
                        "order of incoming frames cannot be guaranteed\n");
 again:
-        for (mb = find_next_bit(addr, AT91_MB_RX_NUM, priv->rx_next);
+        for (mb = find_next_bit(addr, AT91_MB_RX_LAST + 1, priv->rx_next);
-             mb < AT91_MB_RX_NUM && quota > 0;
+             mb < AT91_MB_RX_LAST + 1 && quota > 0;
             reg_sr = at91_read(priv, AT91_SR),
-             mb = find_next_bit(addr, AT91_MB_RX_NUM, ++priv->rx_next)) {
+             mb = find_next_bit(addr, AT91_MB_RX_LAST + 1, ++priv->rx_next)) {
                at91_read_msg(dev, mb);
                /* reactivate mailboxes */
@@ -610,8 +636,8 @@ static int at91_poll_rx(struct net_device *dev, int quota)
        /* upper group completed, look again in lower */
        if (priv->rx_next > AT91_MB_RX_LOW_LAST &&
-            quota > 0 && mb >= AT91_MB_RX_NUM) {
+            quota > 0 && mb > AT91_MB_RX_LAST) {
-                priv->rx_next = 0;
+                priv->rx_next = AT91_MB_RX_FIRST;
                goto again;
        }
@@ -1037,6 +1063,64 @@ static const struct net_device_ops at91_netdev_ops = {
        .ndo_start_xmit = at91_start_xmit,
 };
+static ssize_t at91_sysfs_show_mb0_id(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct at91_priv *priv = netdev_priv(to_net_dev(dev));
+        if (priv->mb0_id & CAN_EFF_FLAG)
+                return snprintf(buf, PAGE_SIZE, "0x%08x\n", priv->mb0_id);
+        else
+                return snprintf(buf, PAGE_SIZE, "0x%03x\n", priv->mb0_id);
+}
+static ssize_t at91_sysfs_set_mb0_id(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct at91_priv *priv = netdev_priv(ndev);
+        unsigned long can_id;
+        ssize_t ret;
+        int err;
+        rtnl_lock();
+        if (ndev->flags & IFF_UP) {
+                ret = -EBUSY;
+                goto out;
+        }
+        err = strict_strtoul(buf, 0, &can_id);
+        if (err) {
+                ret = err;
+                goto out;
+        }
+        if (can_id & CAN_EFF_FLAG)
+                can_id &= CAN_EFF_MASK | CAN_EFF_FLAG;
+        else
+                can_id &= CAN_SFF_MASK;
+        priv->mb0_id = can_id;
+        ret = count;
+ out:
+        rtnl_unlock();
+        return ret;
+}
+static DEVICE_ATTR(mb0_id, S_IWUSR | S_IRUGO,
+        at91_sysfs_show_mb0_id, at91_sysfs_set_mb0_id);
+static struct attribute *at91_sysfs_attrs[] = {
+        &dev_attr_mb0_id.attr,
+        NULL,
+};
+static struct attribute_group at91_sysfs_attr_group = {
+        .attrs = at91_sysfs_attrs,
+};
 static int __devinit at91_can_probe(struct platform_device *pdev)
 {
        struct net_device *dev;
@@ -1082,6 +1166,7 @@ static int __devinit at91_can_probe(struct platform_device *pdev)
        dev->netdev_ops = &at91_netdev_ops;
        dev->irq = irq;
        dev->flags |= IFF_ECHO;
+        dev->sysfs_groups[0] = &at91_sysfs_attr_group;
        priv = netdev_priv(dev);
        priv->can.clock.freq = clk_get_rate(clk);
@@ -1093,6 +1178,7 @@ static int __devinit at91_can_probe(struct platform_device *pdev)
        priv->dev = dev;
        priv->clk = clk;
        priv->pdata = pdev->dev.platform_data;
+        priv->mb0_id = 0x7ff;
        netif_napi_add(dev, &priv->napi, at91_poll, AT91_NAPI_WEIGHT);
diff --git a/drivers/net/can/c_can/Kconfig b/drivers/net/can/c_can/Kconfig
new file mode 100644
index 000000000000..ffb9773d102d
--- /dev/null
+++ b/drivers/net/can/c_can/Kconfig
@@ -0,0 +1,15 @@
+menuconfig CAN_C_CAN
+        tristate "Bosch C_CAN devices"
+        depends on CAN_DEV && HAS_IOMEM
+if CAN_C_CAN
+config CAN_C_CAN_PLATFORM
+        tristate "Generic Platform Bus based C_CAN driver"
+        ---help---
+          This driver adds support for the C_CAN chips connected to
+          the "platform bus" (Linux abstraction for directly to the
+          processor attached devices) which can be found on various
+          boards from ST Microelectronics (http://www.st.com)
+          like the SPEAr1310 and SPEAr320 evaluation boards.
+endif
diff --git a/drivers/net/can/c_can/Makefile b/drivers/net/can/c_can/Makefile
new file mode 100644
index 000000000000..9273f6d5c4b7
--- /dev/null
+++ b/drivers/net/can/c_can/Makefile
@@ -0,0 +1,8 @@
+#
+#  Makefile for the Bosch C_CAN controller drivers.
+#
+obj-$(CONFIG_CAN_C_CAN) += c_can.o
+obj-$(CONFIG_CAN_C_CAN_PLATFORM) += c_can_platform.o
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
new file mode 100644
index 000000000000..14050786218a
--- /dev/null
+++ b/drivers/net/can/c_can/c_can.c
@@ -0,0 +1,1158 @@
+/*
+ * CAN bus driver for Bosch C_CAN controller
+ *
+ * Copyright (C) 2010 ST Microelectronics
+ * Bhupesh Sharma <bhupesh.sharma@st.com>
+ *
+ * Borrowed heavily from the C_CAN driver originally written by:
+ * Copyright (C) 2007
+ * - Sascha Hauer, Marc Kleine-Budde, Pengutronix <s.hauer@pengutronix.de>
+ * - Simon Kallweit, intefo AG <simon.kallweit@intefo.ch>
+ *
+ * TX and RX NAPI implementation has been borrowed from at91 CAN driver
+ * written by:
+ * Copyright
+ * (C) 2007 by Hans J. Koch <hjk@hansjkoch.de>
+ * (C) 2008, 2009 by Marc Kleine-Budde <kernel@pengutronix.de>
+ *
+ * Bosch C_CAN controller is compliant to CAN protocol version 2.0 part A and B.
+ * Bosch C_CAN user manual can be obtained from:
+ * http://www.semiconductors.bosch.de/media/en/pdf/ipmodules_1/c_can/
+ * users_manual_c_can.pdf
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
+#include <linux/list.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/can.h>
+#include <linux/can/dev.h>
+#include <linux/can/error.h>
+#include "c_can.h"
+/* control register */
+#define CONTROL_TEST            BIT(7)
+#define CONTROL_CCE             BIT(6)
+#define CONTROL_DISABLE_AR      BIT(5)
+#define CONTROL_ENABLE_AR       (0 << 5)
+#define CONTROL_EIE             BIT(3)
+#define CONTROL_SIE             BIT(2)
+#define CONTROL_IE              BIT(1)
+#define CONTROL_INIT            BIT(0)
+/* test register */
+#define TEST_RX                 BIT(7)
+#define TEST_TX1                BIT(6)
+#define TEST_TX2                BIT(5)
+#define TEST_LBACK              BIT(4)
+#define TEST_SILENT             BIT(3)
+#define TEST_BASIC              BIT(2)
+/* status register */
+#define STATUS_BOFF             BIT(7)
+#define STATUS_EWARN            BIT(6)
+#define STATUS_EPASS            BIT(5)
+#define STATUS_RXOK             BIT(4)
+#define STATUS_TXOK             BIT(3)
+/* error counter register */
+#define ERR_CNT_TEC_MASK        0xff
+#define ERR_CNT_TEC_SHIFT       0
+#define ERR_CNT_REC_SHIFT       8
+#define ERR_CNT_REC_MASK        (0x7f << ERR_CNT_REC_SHIFT)
+#define ERR_CNT_RP_SHIFT        15
+#define ERR_CNT_RP_MASK         (0x1 << ERR_CNT_RP_SHIFT)
+/* bit-timing register */
+#define BTR_BRP_MASK            0x3f
+#define BTR_BRP_SHIFT           0
+#define BTR_SJW_SHIFT           6
+#define BTR_SJW_MASK            (0x3 << BTR_SJW_SHIFT)
+#define BTR_TSEG1_SHIFT         8
+#define BTR_TSEG1_MASK          (0xf << BTR_TSEG1_SHIFT)
+#define BTR_TSEG2_SHIFT         12
+#define BTR_TSEG2_MASK          (0x7 << BTR_TSEG2_SHIFT)
+/* brp extension register */
+#define BRP_EXT_BRPE_MASK       0x0f
+#define BRP_EXT_BRPE_SHIFT      0
+/* IFx command request */
+#define IF_COMR_BUSY            BIT(15)
+/* IFx command mask */
+#define IF_COMM_WR              BIT(7)
+#define IF_COMM_MASK            BIT(6)
+#define IF_COMM_ARB             BIT(5)
+#define IF_COMM_CONTROL         BIT(4)
+#define IF_COMM_CLR_INT_PND     BIT(3)
+#define IF_COMM_TXRQST          BIT(2)
+#define IF_COMM_DATAA           BIT(1)
+#define IF_COMM_DATAB           BIT(0)
+#define IF_COMM_ALL             (IF_COMM_MASK | IF_COMM_ARB | \
+                                IF_COMM_CONTROL | IF_COMM_TXRQST | \
+                                IF_COMM_DATAA | IF_COMM_DATAB)
+/* IFx arbitration */
+#define IF_ARB_MSGVAL           BIT(15)
+#define IF_ARB_MSGXTD           BIT(14)
+#define IF_ARB_TRANSMIT         BIT(13)
+/* IFx message control */
+#define IF_MCONT_NEWDAT         BIT(15)
+#define IF_MCONT_MSGLST         BIT(14)
+#define IF_MCONT_CLR_MSGLST     (0 << 14)
+#define IF_MCONT_INTPND         BIT(13)
+#define IF_MCONT_UMASK          BIT(12)
+#define IF_MCONT_TXIE           BIT(11)
+#define IF_MCONT_RXIE           BIT(10)
+#define IF_MCONT_RMTEN          BIT(9)
+#define IF_MCONT_TXRQST         BIT(8)
+#define IF_MCONT_EOB            BIT(7)
+#define IF_MCONT_DLC_MASK       0xf
+/*
+ * IFx register masks:
+ * allow easy operation on 16-bit registers when the
+ * argument is 32-bit instead
+ */
+#define IFX_WRITE_LOW_16BIT(x)  ((x) & 0xFFFF)
+#define IFX_WRITE_HIGH_16BIT(x) (((x) & 0xFFFF0000) >> 16)
+/* message object split */
+#define C_CAN_NO_OF_OBJECTS     32
+#define C_CAN_MSG_OBJ_RX_NUM    16
+#define C_CAN_MSG_OBJ_TX_NUM    16
+#define C_CAN_MSG_OBJ_RX_FIRST  1
+#define C_CAN_MSG_OBJ_RX_LAST   (C_CAN_MSG_OBJ_RX_FIRST + \
+                                C_CAN_MSG_OBJ_RX_NUM - 1)
+#define C_CAN_MSG_OBJ_TX_FIRST  (C_CAN_MSG_OBJ_RX_LAST + 1)
+#define C_CAN_MSG_OBJ_TX_LAST   (C_CAN_MSG_OBJ_TX_FIRST + \
+                                C_CAN_MSG_OBJ_TX_NUM - 1)
+#define C_CAN_MSG_OBJ_RX_SPLIT  9
+#define C_CAN_MSG_RX_LOW_LAST   (C_CAN_MSG_OBJ_RX_SPLIT - 1)
+#define C_CAN_NEXT_MSG_OBJ_MASK (C_CAN_MSG_OBJ_TX_NUM - 1)
+#define RECEIVE_OBJECT_BITS     0x0000ffff
+/* status interrupt */
+#define STATUS_INTERRUPT        0x8000
+/* global interrupt masks */
+#define ENABLE_ALL_INTERRUPTS   1
+#define DISABLE_ALL_INTERRUPTS  0
+/* minimum timeout for checking BUSY status */
+#define MIN_TIMEOUT_VALUE       6
+/* napi related */
+#define C_CAN_NAPI_WEIGHT       C_CAN_MSG_OBJ_RX_NUM
+/* c_can lec values */
+enum c_can_lec_type {
+        LEC_NO_ERROR = 0,
+        LEC_STUFF_ERROR,
+        LEC_FORM_ERROR,
+        LEC_ACK_ERROR,
+        LEC_BIT1_ERROR,
+        LEC_BIT0_ERROR,
+        LEC_CRC_ERROR,
+        LEC_UNUSED,
+};
+/*
+ * c_can error types:
+ * Bus errors (BUS_OFF, ERROR_WARNING, ERROR_PASSIVE) are supported
+ */
+enum c_can_bus_error_types {
+        C_CAN_NO_ERROR = 0,
+        C_CAN_BUS_OFF,
+        C_CAN_ERROR_WARNING,
+        C_CAN_ERROR_PASSIVE,
+};
+static struct can_bittiming_const c_can_bittiming_const = {
+        .name = KBUILD_MODNAME,
+        .tseg1_min = 2,         /* Time segment 1 = prop_seg + phase_seg1 */
+        .tseg1_max = 16,
+        .tseg2_min = 1,         /* Time segment 2 = phase_seg2 */
+        .tseg2_max = 8,
+        .sjw_max = 4,
+        .brp_min = 1,
+        .brp_max = 1024,        /* 6-bit BRP field + 4-bit BRPE field*/
+        .brp_inc = 1,
+};
+static inline int get_tx_next_msg_obj(const struct c_can_priv *priv)
+{
+        return (priv->tx_next & C_CAN_NEXT_MSG_OBJ_MASK) +
+                        C_CAN_MSG_OBJ_TX_FIRST;
+}
+static inline int get_tx_echo_msg_obj(const struct c_can_priv *priv)
+{
+        return (priv->tx_echo & C_CAN_NEXT_MSG_OBJ_MASK) +
+                        C_CAN_MSG_OBJ_TX_FIRST;
+}
+static u32 c_can_read_reg32(struct c_can_priv *priv, void *reg)
+{
+        u32 val = priv->read_reg(priv, reg);
+        val |= ((u32) priv->read_reg(priv, reg + 2)) << 16;
+        return val;
+}
+static void c_can_enable_all_interrupts(struct c_can_priv *priv,
+                                                int enable)
+{
+        unsigned int cntrl_save = priv->read_reg(priv,
+                                                &priv->regs->control);
+        if (enable)
+                cntrl_save |= (CONTROL_SIE | CONTROL_EIE | CONTROL_IE);
+        else
+                cntrl_save &= ~(CONTROL_EIE | CONTROL_IE | CONTROL_SIE);
+        priv->write_reg(priv, &priv->regs->control, cntrl_save);
+}
+static inline int c_can_msg_obj_is_busy(struct c_can_priv *priv, int iface)
+{
+        int count = MIN_TIMEOUT_VALUE;
+        while (count && priv->read_reg(priv,
+                                &priv->regs->ifregs[iface].com_req) &
+                                IF_COMR_BUSY) {
+                count--;
+                udelay(1);
+        }
+        if (!count)
+                return 1;
+        return 0;
+}
+static inline void c_can_object_get(struct net_device *dev,
+                                        int iface, int objno, int mask)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        /*
+         * As per specs, after writting the message object number in the
+         * IF command request register the transfer b/w interface
+         * register and message RAM must be complete in 6 CAN-CLK
+         * period.
+         */
+        priv->write_reg(priv, &priv->regs->ifregs[iface].com_mask,
+                        IFX_WRITE_LOW_16BIT(mask));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].com_req,
+                        IFX_WRITE_LOW_16BIT(objno));
+        if (c_can_msg_obj_is_busy(priv, iface))
+                netdev_err(dev, "timed out in object get\n");
+}
+static inline void c_can_object_put(struct net_device *dev,
+                                        int iface, int objno, int mask)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        /*
+         * As per specs, after writting the message object number in the
+         * IF command request register the transfer b/w interface
+         * register and message RAM must be complete in 6 CAN-CLK
+         * period.
+         */
+        priv->write_reg(priv, &priv->regs->ifregs[iface].com_mask,
+                        (IF_COMM_WR | IFX_WRITE_LOW_16BIT(mask)));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].com_req,
+                        IFX_WRITE_LOW_16BIT(objno));
+        if (c_can_msg_obj_is_busy(priv, iface))
+                netdev_err(dev, "timed out in object put\n");
+}
+static void c_can_write_msg_object(struct net_device *dev,
+                        int iface, struct can_frame *frame, int objno)
+{
+        int i;
+        u16 flags = 0;
+        unsigned int id;
+        struct c_can_priv *priv = netdev_priv(dev);
+        if (!(frame->can_id & CAN_RTR_FLAG))
+                flags |= IF_ARB_TRANSMIT;
+        if (frame->can_id & CAN_EFF_FLAG) {
+                id = frame->can_id & CAN_EFF_MASK;
+                flags |= IF_ARB_MSGXTD;
+        } else
+                id = ((frame->can_id & CAN_SFF_MASK) << 18);
+        flags |= IF_ARB_MSGVAL;
+        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1,
+                                IFX_WRITE_LOW_16BIT(id));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2, flags |
+                                IFX_WRITE_HIGH_16BIT(id));
+        for (i = 0; i < frame->can_dlc; i += 2) {
+                priv->write_reg(priv, &priv->regs->ifregs[iface].data[i / 2],
+                                frame->data[i] | (frame->data[i + 1] << 8));
+        }
+        /* enable interrupt for this message object */
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                        IF_MCONT_TXIE | IF_MCONT_TXRQST | IF_MCONT_EOB |
+                        frame->can_dlc);
+        c_can_object_put(dev, iface, objno, IF_COMM_ALL);
+}
+static inline void c_can_mark_rx_msg_obj(struct net_device *dev,
+                                                int iface, int ctrl_mask,
+                                                int obj)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                        ctrl_mask & ~(IF_MCONT_MSGLST | IF_MCONT_INTPND));
+        c_can_object_put(dev, iface, obj, IF_COMM_CONTROL);
+}
+static inline void c_can_activate_all_lower_rx_msg_obj(struct net_device *dev,
+                                                int iface,
+                                                int ctrl_mask)
+{
+        int i;
+        struct c_can_priv *priv = netdev_priv(dev);
+        for (i = C_CAN_MSG_OBJ_RX_FIRST; i <= C_CAN_MSG_RX_LOW_LAST; i++) {
+                priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                                ctrl_mask & ~(IF_MCONT_MSGLST |
+                                        IF_MCONT_INTPND | IF_MCONT_NEWDAT));
+                c_can_object_put(dev, iface, i, IF_COMM_CONTROL);
+        }
+}
+static inline void c_can_activate_rx_msg_obj(struct net_device *dev,
+                                                int iface, int ctrl_mask,
+                                                int obj)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                        ctrl_mask & ~(IF_MCONT_MSGLST |
+                                IF_MCONT_INTPND | IF_MCONT_NEWDAT));
+        c_can_object_put(dev, iface, obj, IF_COMM_CONTROL);
+}
+static void c_can_handle_lost_msg_obj(struct net_device *dev,
+                                        int iface, int objno)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        struct sk_buff *skb;
+        struct can_frame *frame;
+        netdev_err(dev, "msg lost in buffer %d\n", objno);
+        c_can_object_get(dev, iface, objno, IF_COMM_ALL & ~IF_COMM_TXRQST);
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                        IF_MCONT_CLR_MSGLST);
+        c_can_object_put(dev, 0, objno, IF_COMM_CONTROL);
+        /* create an error msg */
+        skb = alloc_can_err_skb(dev, &frame);
+        if (unlikely(!skb))
+                return;
+        frame->can_id |= CAN_ERR_CRTL;
+        frame->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+        stats->rx_errors++;
+        stats->rx_over_errors++;
+        netif_receive_skb(skb);
+}
+static int c_can_read_msg_object(struct net_device *dev, int iface, int ctrl)
+{
+        u16 flags, data;
+        int i;
+        unsigned int val;
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        struct sk_buff *skb;
+        struct can_frame *frame;
+        skb = alloc_can_skb(dev, &frame);
+        if (!skb) {
+                stats->rx_dropped++;
+                return -ENOMEM;
+        }
+        frame->can_dlc = get_can_dlc(ctrl & 0x0F);
+        flags = priv->read_reg(priv, &priv->regs->ifregs[iface].arb2);
+        val = priv->read_reg(priv, &priv->regs->ifregs[iface].arb1) |
+                (flags << 16);
+        if (flags & IF_ARB_MSGXTD)
+                frame->can_id = (val & CAN_EFF_MASK) | CAN_EFF_FLAG;
+        else
+                frame->can_id = (val >> 18) & CAN_SFF_MASK;
+        if (flags & IF_ARB_TRANSMIT)
+                frame->can_id |= CAN_RTR_FLAG;
+        else {
+                for (i = 0; i < frame->can_dlc; i += 2) {
+                        data = priv->read_reg(priv,
+                                &priv->regs->ifregs[iface].data[i / 2]);
+                        frame->data[i] = data;
+                        frame->data[i + 1] = data >> 8;
+                }
+        }
+        netif_receive_skb(skb);
+        stats->rx_packets++;
+        stats->rx_bytes += frame->can_dlc;
+        return 0;
+}
+static void c_can_setup_receive_object(struct net_device *dev, int iface,
+                                        int objno, unsigned int mask,
+                                        unsigned int id, unsigned int mcont)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        priv->write_reg(priv, &priv->regs->ifregs[iface].mask1,
+                        IFX_WRITE_LOW_16BIT(mask));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].mask2,
+                        IFX_WRITE_HIGH_16BIT(mask));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1,
+                        IFX_WRITE_LOW_16BIT(id));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2,
+                        (IF_ARB_MSGVAL | IFX_WRITE_HIGH_16BIT(id)));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl, mcont);
+        c_can_object_put(dev, iface, objno, IF_COMM_ALL & ~IF_COMM_TXRQST);
+        netdev_dbg(dev, "obj no:%d, msgval:0x%08x\n", objno,
+                        c_can_read_reg32(priv, &priv->regs->msgval1));
+}
+static void c_can_inval_msg_object(struct net_device *dev, int iface, int objno)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1, 0);
+        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2, 0);
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl, 0);
+        c_can_object_put(dev, iface, objno, IF_COMM_ARB | IF_COMM_CONTROL);
+        netdev_dbg(dev, "obj no:%d, msgval:0x%08x\n", objno,
+                        c_can_read_reg32(priv, &priv->regs->msgval1));
+}
+static inline int c_can_is_next_tx_obj_busy(struct c_can_priv *priv, int objno)
+{
+        int val = c_can_read_reg32(priv, &priv->regs->txrqst1);
+        /*
+         * as transmission request register's bit n-1 corresponds to
+         * message object n, we need to handle the same properly.
+         */
+        if (val & (1 << (objno - 1)))
+                return 1;
+        return 0;
+}
+static netdev_tx_t c_can_start_xmit(struct sk_buff *skb,
+                                        struct net_device *dev)
+{
+        u32 msg_obj_no;
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct can_frame *frame = (struct can_frame *)skb->data;
+        if (can_dropped_invalid_skb(dev, skb))
+                return NETDEV_TX_OK;
+        msg_obj_no = get_tx_next_msg_obj(priv);
+        /* prepare message object for transmission */
+        c_can_write_msg_object(dev, 0, frame, msg_obj_no);
+        can_put_echo_skb(skb, dev, msg_obj_no - C_CAN_MSG_OBJ_TX_FIRST);
+        /*
+         * we have to stop the queue in case of a wrap around or
+         * if the next TX message object is still in use
+         */
+        priv->tx_next++;
+        if (c_can_is_next_tx_obj_busy(priv, get_tx_next_msg_obj(priv)) ||
+                        (priv->tx_next & C_CAN_NEXT_MSG_OBJ_MASK) == 0)
+                netif_stop_queue(dev);
+        return NETDEV_TX_OK;
+}
+static int c_can_set_bittiming(struct net_device *dev)
+{
+        unsigned int reg_btr, reg_brpe, ctrl_save;
+        u8 brp, brpe, sjw, tseg1, tseg2;
+        u32 ten_bit_brp;
+        struct c_can_priv *priv = netdev_priv(dev);
+        const struct can_bittiming *bt = &priv->can.bittiming;
+        /* c_can provides a 6-bit brp and 4-bit brpe fields */
+        ten_bit_brp = bt->brp - 1;
+        brp = ten_bit_brp & BTR_BRP_MASK;
+        brpe = ten_bit_brp >> 6;
+        sjw = bt->sjw - 1;
+        tseg1 = bt->prop_seg + bt->phase_seg1 - 1;
+        tseg2 = bt->phase_seg2 - 1;
+        reg_btr = brp | (sjw << BTR_SJW_SHIFT) | (tseg1 << BTR_TSEG1_SHIFT) |
+                        (tseg2 << BTR_TSEG2_SHIFT);
+        reg_brpe = brpe & BRP_EXT_BRPE_MASK;
+        netdev_info(dev,
+                "setting BTR=%04x BRPE=%04x\n", reg_btr, reg_brpe);
+        ctrl_save = priv->read_reg(priv, &priv->regs->control);
+        priv->write_reg(priv, &priv->regs->control,
+                        ctrl_save | CONTROL_CCE | CONTROL_INIT);
+        priv->write_reg(priv, &priv->regs->btr, reg_btr);
+        priv->write_reg(priv, &priv->regs->brp_ext, reg_brpe);
+        priv->write_reg(priv, &priv->regs->control, ctrl_save);
+        return 0;
+}
+/*
+ * Configure C_CAN message objects for Tx and Rx purposes:
+ * C_CAN provides a total of 32 message objects that can be configured
+ * either for Tx or Rx purposes. Here the first 16 message objects are used as
+ * a reception FIFO. The end of reception FIFO is signified by the EoB bit
+ * being SET. The remaining 16 message objects are kept aside for Tx purposes.
+ * See user guide document for further details on configuring message
+ * objects.
+ */
+static void c_can_configure_msg_objects(struct net_device *dev)
+{
+        int i;
+        /* first invalidate all message objects */
+        for (i = C_CAN_MSG_OBJ_RX_FIRST; i <= C_CAN_NO_OF_OBJECTS; i++)
+                c_can_inval_msg_object(dev, 0, i);
+        /* setup receive message objects */
+        for (i = C_CAN_MSG_OBJ_RX_FIRST; i < C_CAN_MSG_OBJ_RX_LAST; i++)
+                c_can_setup_receive_object(dev, 0, i, 0, 0,
+                        (IF_MCONT_RXIE | IF_MCONT_UMASK) & ~IF_MCONT_EOB);
+        c_can_setup_receive_object(dev, 0, C_CAN_MSG_OBJ_RX_LAST, 0, 0,
+                        IF_MCONT_EOB | IF_MCONT_RXIE | IF_MCONT_UMASK);
+}
+/*
+ * Configure C_CAN chip:
+ * - enable/disable auto-retransmission
+ * - set operating mode
+ * - configure message objects
+ */
+static void c_can_chip_config(struct net_device *dev)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        if (priv->can.ctrlmode & CAN_CTRLMODE_ONE_SHOT)
+                /* disable automatic retransmission */
+                priv->write_reg(priv, &priv->regs->control,
+                                CONTROL_DISABLE_AR);
+        else
+                /* enable automatic retransmission */
+                priv->write_reg(priv, &priv->regs->control,
+                                CONTROL_ENABLE_AR);
+        if (priv->can.ctrlmode & (CAN_CTRLMODE_LISTENONLY &
+                                        CAN_CTRLMODE_LOOPBACK)) {
+                /* loopback + silent mode : useful for hot self-test */
+                priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
+                                CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
+                priv->write_reg(priv, &priv->regs->test,
+                                TEST_LBACK | TEST_SILENT);
+        } else if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK) {
+                /* loopback mode : useful for self-test function */
+                priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
+                                CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
+                priv->write_reg(priv, &priv->regs->test, TEST_LBACK);
+        } else if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) {
+                /* silent mode : bus-monitoring mode */
+                priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
+                                CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
+                priv->write_reg(priv, &priv->regs->test, TEST_SILENT);
+        } else
+                /* normal mode*/
+                priv->write_reg(priv, &priv->regs->control,
+                                CONTROL_EIE | CONTROL_SIE | CONTROL_IE);
+        /* configure message objects */
+        c_can_configure_msg_objects(dev);
+        /* set a `lec` value so that we can check for updates later */
+        priv->write_reg(priv, &priv->regs->status, LEC_UNUSED);
+        /* set bittiming params */
+        c_can_set_bittiming(dev);
+}
+static void c_can_start(struct net_device *dev)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        /* enable status change, error and module interrupts */
+        c_can_enable_all_interrupts(priv, ENABLE_ALL_INTERRUPTS);
+        /* basic c_can configuration */
+        c_can_chip_config(dev);
+        priv->can.state = CAN_STATE_ERROR_ACTIVE;
+        /* reset tx helper pointers */
+        priv->tx_next = priv->tx_echo = 0;
+}
+static void c_can_stop(struct net_device *dev)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        /* disable all interrupts */
+        c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS);
+        /* set the state as STOPPED */
+        priv->can.state = CAN_STATE_STOPPED;
+}
+static int c_can_set_mode(struct net_device *dev, enum can_mode mode)
+{
+        switch (mode) {
+        case CAN_MODE_START:
+                c_can_start(dev);
+                netif_wake_queue(dev);
+                break;
+        default:
+                return -EOPNOTSUPP;
+        }
+        return 0;
+}
+static int c_can_get_berr_counter(const struct net_device *dev,
+                                        struct can_berr_counter *bec)
+{
+        unsigned int reg_err_counter;
+        struct c_can_priv *priv = netdev_priv(dev);
+        reg_err_counter = priv->read_reg(priv, &priv->regs->err_cnt);
+        bec->rxerr = (reg_err_counter & ERR_CNT_REC_MASK) >>
+                                ERR_CNT_REC_SHIFT;
+        bec->txerr = reg_err_counter & ERR_CNT_TEC_MASK;
+        return 0;
+}
+/*
+ * theory of operation:
+ *
+ * priv->tx_echo holds the number of the oldest can_frame put for
+ * transmission into the hardware, but not yet ACKed by the CAN tx
+ * complete IRQ.
+ *
+ * We iterate from priv->tx_echo to priv->tx_next and check if the
+ * packet has been transmitted, echo it back to the CAN framework.
+ * If we discover a not yet transmitted package, stop looking for more.
+ */
+static void c_can_do_tx(struct net_device *dev)
+{
+        u32 val;
+        u32 msg_obj_no;
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        for (/* nix */; (priv->tx_next - priv->tx_echo) > 0; priv->tx_echo++) {
+                msg_obj_no = get_tx_echo_msg_obj(priv);
+                c_can_inval_msg_object(dev, 0, msg_obj_no);
+                val = c_can_read_reg32(priv, &priv->regs->txrqst1);
+                if (!(val & (1 << msg_obj_no))) {
+                        can_get_echo_skb(dev,
+                                        msg_obj_no - C_CAN_MSG_OBJ_TX_FIRST);
+                        stats->tx_bytes += priv->read_reg(priv,
+                                        &priv->regs->ifregs[0].msg_cntrl)
+                                        & IF_MCONT_DLC_MASK;
+                        stats->tx_packets++;
+                }
+        }
+        /* restart queue if wrap-up or if queue stalled on last pkt */
+        if (((priv->tx_next & C_CAN_NEXT_MSG_OBJ_MASK) != 0) ||
+                        ((priv->tx_echo & C_CAN_NEXT_MSG_OBJ_MASK) == 0))
+                netif_wake_queue(dev);
+}
+/*
+ * theory of operation:
+ *
+ * c_can core saves a received CAN message into the first free message
+ * object it finds free (starting with the lowest). Bits NEWDAT and
+ * INTPND are set for this message object indicating that a new message
+ * has arrived. To work-around this issue, we keep two groups of message
+ * objects whose partitioning is defined by C_CAN_MSG_OBJ_RX_SPLIT.
+ *
+ * To ensure in-order frame reception we use the following
+ * approach while re-activating a message object to receive further
+ * frames:
+ * - if the current message object number is lower than
+ *   C_CAN_MSG_RX_LOW_LAST, do not clear the NEWDAT bit while clearing
+ *   the INTPND bit.
+ * - if the current message object number is equal to
+ *   C_CAN_MSG_RX_LOW_LAST then clear the NEWDAT bit of all lower
+ *   receive message objects.
+ * - if the current message object number is greater than
+ *   C_CAN_MSG_RX_LOW_LAST then clear the NEWDAT bit of
+ *   only this message object.
+ */
+static int c_can_do_rx_poll(struct net_device *dev, int quota)
+{
+        u32 num_rx_pkts = 0;
+        unsigned int msg_obj, msg_ctrl_save;
+        struct c_can_priv *priv = netdev_priv(dev);
+        u32 val = c_can_read_reg32(priv, &priv->regs->intpnd1);
+        for (msg_obj = C_CAN_MSG_OBJ_RX_FIRST;
+                        msg_obj <= C_CAN_MSG_OBJ_RX_LAST && quota > 0;
+                        val = c_can_read_reg32(priv, &priv->regs->intpnd1),
+                        msg_obj++) {
+                /*
+                 * as interrupt pending register's bit n-1 corresponds to
+                 * message object n, we need to handle the same properly.
+                 */
+                if (val & (1 << (msg_obj - 1))) {
+                        c_can_object_get(dev, 0, msg_obj, IF_COMM_ALL &
+                                        ~IF_COMM_TXRQST);
+                        msg_ctrl_save = priv->read_reg(priv,
+                                        &priv->regs->ifregs[0].msg_cntrl);
+                        if (msg_ctrl_save & IF_MCONT_EOB)
+                                return num_rx_pkts;
+                        if (msg_ctrl_save & IF_MCONT_MSGLST) {
+                                c_can_handle_lost_msg_obj(dev, 0, msg_obj);
+                                num_rx_pkts++;
+                                quota--;
+                                continue;
+                        }
+                        if (!(msg_ctrl_save & IF_MCONT_NEWDAT))
+                                continue;
+                        /* read the data from the message object */
+                        c_can_read_msg_object(dev, 0, msg_ctrl_save);
+                        if (msg_obj < C_CAN_MSG_RX_LOW_LAST)
+                                c_can_mark_rx_msg_obj(dev, 0,
+                                                msg_ctrl_save, msg_obj);
+                        else if (msg_obj > C_CAN_MSG_RX_LOW_LAST)
+                                /* activate this msg obj */
+                                c_can_activate_rx_msg_obj(dev, 0,
+                                                msg_ctrl_save, msg_obj);
+                        else if (msg_obj == C_CAN_MSG_RX_LOW_LAST)
+                                /* activate all lower message objects */
+                                c_can_activate_all_lower_rx_msg_obj(dev,
+                                                0, msg_ctrl_save);
+                        num_rx_pkts++;
+                        quota--;
+                }
+        }
+        return num_rx_pkts;
+}
+static inline int c_can_has_and_handle_berr(struct c_can_priv *priv)
+{
+        return (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) &&
+                (priv->current_status & LEC_UNUSED);
+}
+static int c_can_handle_state_change(struct net_device *dev,
+                                enum c_can_bus_error_types error_type)
+{
+        unsigned int reg_err_counter;
+        unsigned int rx_err_passive;
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+        struct can_berr_counter bec;
+        /* propogate the error condition to the CAN stack */
+        skb = alloc_can_err_skb(dev, &cf);
+        if (unlikely(!skb))
+                return 0;
+        c_can_get_berr_counter(dev, &bec);
+        reg_err_counter = priv->read_reg(priv, &priv->regs->err_cnt);
+        rx_err_passive = (reg_err_counter & ERR_CNT_RP_MASK) >>
+                                ERR_CNT_RP_SHIFT;
+        switch (error_type) {
+        case C_CAN_ERROR_WARNING:
+                /* error warning state */
+                priv->can.can_stats.error_warning++;
+                priv->can.state = CAN_STATE_ERROR_WARNING;
+                cf->can_id |= CAN_ERR_CRTL;
+                cf->data[1] = (bec.txerr > bec.rxerr) ?
+                        CAN_ERR_CRTL_TX_WARNING :
+                        CAN_ERR_CRTL_RX_WARNING;
+                cf->data[6] = bec.txerr;
+                cf->data[7] = bec.rxerr;
+                break;
+        case C_CAN_ERROR_PASSIVE:
+                /* error passive state */
+                priv->can.can_stats.error_passive++;
+                priv->can.state = CAN_STATE_ERROR_PASSIVE;
+                cf->can_id |= CAN_ERR_CRTL;
+                if (rx_err_passive)
+                        cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
+                if (bec.txerr > 127)
+                        cf->data[1] |= CAN_ERR_CRTL_TX_PASSIVE;
+                cf->data[6] = bec.txerr;
+                cf->data[7] = bec.rxerr;
+                break;
+        case C_CAN_BUS_OFF:
+                /* bus-off state */
+                priv->can.state = CAN_STATE_BUS_OFF;
+                cf->can_id |= CAN_ERR_BUSOFF;
+                /*
+                 * disable all interrupts in bus-off mode to ensure that
+                 * the CPU is not hogged down
+                 */
+                c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS);
+                can_bus_off(dev);
+                break;
+        default:
+                break;
+        }
+        netif_receive_skb(skb);
+        stats->rx_packets++;
+        stats->rx_bytes += cf->can_dlc;
+        return 1;
+}
+static int c_can_handle_bus_err(struct net_device *dev,
+                                enum c_can_lec_type lec_type)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+        /*
+         * early exit if no lec update or no error.
+         * no lec update means that no CAN bus event has been detected
+         * since CPU wrote 0x7 value to status reg.
+         */
+        if (lec_type == LEC_UNUSED || lec_type == LEC_NO_ERROR)
+                return 0;
+        /* propogate the error condition to the CAN stack */
+        skb = alloc_can_err_skb(dev, &cf);
+        if (unlikely(!skb))
+                return 0;
+        /*
+         * check for 'last error code' which tells us the
+         * type of the last error to occur on the CAN bus
+         */
+        /* common for all type of bus errors */
+        priv->can.can_stats.bus_error++;
+        stats->rx_errors++;
+        cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
+        cf->data[2] |= CAN_ERR_PROT_UNSPEC;
+        switch (lec_type) {
+        case LEC_STUFF_ERROR:
+                netdev_dbg(dev, "stuff error\n");
+                cf->data[2] |= CAN_ERR_PROT_STUFF;
+                break;
+        case LEC_FORM_ERROR:
+                netdev_dbg(dev, "form error\n");
+                cf->data[2] |= CAN_ERR_PROT_FORM;
+                break;
+        case LEC_ACK_ERROR:
+                netdev_dbg(dev, "ack error\n");
+                cf->data[2] |= (CAN_ERR_PROT_LOC_ACK |
+                                CAN_ERR_PROT_LOC_ACK_DEL);
+                break;
+        case LEC_BIT1_ERROR:
+                netdev_dbg(dev, "bit1 error\n");
+                cf->data[2] |= CAN_ERR_PROT_BIT1;
+                break;
+        case LEC_BIT0_ERROR:
+                netdev_dbg(dev, "bit0 error\n");
+                cf->data[2] |= CAN_ERR_PROT_BIT0;
+                break;
+        case LEC_CRC_ERROR:
+                netdev_dbg(dev, "CRC error\n");
+                cf->data[2] |= (CAN_ERR_PROT_LOC_CRC_SEQ |
+                                CAN_ERR_PROT_LOC_CRC_DEL);
+                break;
+        default:
+                break;
+        }
+        /* set a `lec` value so that we can check for updates later */
+        priv->write_reg(priv, &priv->regs->status, LEC_UNUSED);
+        netif_receive_skb(skb);
+        stats->rx_packets++;
+        stats->rx_bytes += cf->can_dlc;
+        return 1;
+}
+static int c_can_poll(struct napi_struct *napi, int quota)
+{
+        u16 irqstatus;
+        int lec_type = 0;
+        int work_done = 0;
+        struct net_device *dev = napi->dev;
+        struct c_can_priv *priv = netdev_priv(dev);
+        irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
+        if (!irqstatus)
+                goto end;
+        /* status events have the highest priority */
+        if (irqstatus == STATUS_INTERRUPT) {
+                priv->current_status = priv->read_reg(priv,
+                                        &priv->regs->status);
+                /* handle Tx/Rx events */
+                if (priv->current_status & STATUS_TXOK)
+                        priv->write_reg(priv, &priv->regs->status,
+                                        priv->current_status & ~STATUS_TXOK);
+                if (priv->current_status & STATUS_RXOK)
+                        priv->write_reg(priv, &priv->regs->status,
+                                        priv->current_status & ~STATUS_RXOK);
+                /* handle state changes */
+                if ((priv->current_status & STATUS_EWARN) &&
+                                (!(priv->last_status & STATUS_EWARN))) {
+                        netdev_dbg(dev, "entered error warning state\n");
+                        work_done += c_can_handle_state_change(dev,
+                                                C_CAN_ERROR_WARNING);
+                }
+                if ((priv->current_status & STATUS_EPASS) &&
+                                (!(priv->last_status & STATUS_EPASS))) {
+                        netdev_dbg(dev, "entered error passive state\n");
+                        work_done += c_can_handle_state_change(dev,
+                                                C_CAN_ERROR_PASSIVE);
+                }
+                if ((priv->current_status & STATUS_BOFF) &&
+                                (!(priv->last_status & STATUS_BOFF))) {
+                        netdev_dbg(dev, "entered bus off state\n");
+                        work_done += c_can_handle_state_change(dev,
+                                                C_CAN_BUS_OFF);
+                }
+                /* handle bus recovery events */
+                if ((!(priv->current_status & STATUS_BOFF)) &&
+                                (priv->last_status & STATUS_BOFF)) {
+                        netdev_dbg(dev, "left bus off state\n");
+                        priv->can.state = CAN_STATE_ERROR_ACTIVE;
+                }
+                if ((!(priv->current_status & STATUS_EPASS)) &&
+                                (priv->last_status & STATUS_EPASS)) {
+                        netdev_dbg(dev, "left error passive state\n");
+                        priv->can.state = CAN_STATE_ERROR_ACTIVE;
+                }
+                priv->last_status = priv->current_status;
+                /* handle lec errors on the bus */
+                lec_type = c_can_has_and_handle_berr(priv);
+                if (lec_type)
+                        work_done += c_can_handle_bus_err(dev, lec_type);
+        } else if ((irqstatus >= C_CAN_MSG_OBJ_RX_FIRST) &&
+                        (irqstatus <= C_CAN_MSG_OBJ_RX_LAST)) {
+                /* handle events corresponding to receive message objects */
+                work_done += c_can_do_rx_poll(dev, (quota - work_done));
+        } else if ((irqstatus >= C_CAN_MSG_OBJ_TX_FIRST) &&
+                        (irqstatus <= C_CAN_MSG_OBJ_TX_LAST)) {
+                /* handle events corresponding to transmit message objects */
+                c_can_do_tx(dev);
+        }
+end:
+        if (work_done < quota) {
+                napi_complete(napi);
+                /* enable all IRQs */
+                c_can_enable_all_interrupts(priv, ENABLE_ALL_INTERRUPTS);
+        }
+        return work_done;
+}
+static irqreturn_t c_can_isr(int irq, void *dev_id)
+{
+        u16 irqstatus;
+        struct net_device *dev = (struct net_device *)dev_id;
+        struct c_can_priv *priv = netdev_priv(dev);
+        irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
+        if (!irqstatus)
+                return IRQ_NONE;
+        /* disable all interrupts and schedule the NAPI */
+        c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS);
+        napi_schedule(&priv->napi);
+        return IRQ_HANDLED;
+}
+static int c_can_open(struct net_device *dev)
+{
+        int err;
+        struct c_can_priv *priv = netdev_priv(dev);
+        /* open the can device */
+        err = open_candev(dev);
+        if (err) {
+                netdev_err(dev, "failed to open can device\n");
+                return err;
+        }
+        /* register interrupt handler */
+        err = request_irq(dev->irq, &c_can_isr, IRQF_SHARED, dev->name,
+                                dev);
+        if (err < 0) {
+                netdev_err(dev, "failed to request interrupt\n");
+                goto exit_irq_fail;
+        }
+        /* start the c_can controller */
+        c_can_start(dev);
+        napi_enable(&priv->napi);
+        netif_start_queue(dev);
+        return 0;
+exit_irq_fail:
+        close_candev(dev);
+        return err;
+}
+static int c_can_close(struct net_device *dev)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        netif_stop_queue(dev);
+        napi_disable(&priv->napi);
+        c_can_stop(dev);
+        free_irq(dev->irq, dev);
+        close_candev(dev);
+        return 0;
+}
+struct net_device *alloc_c_can_dev(void)
+{
+        struct net_device *dev;
+        struct c_can_priv *priv;
+        dev = alloc_candev(sizeof(struct c_can_priv), C_CAN_MSG_OBJ_TX_NUM);
+        if (!dev)
+                return NULL;
+        priv = netdev_priv(dev);
+        netif_napi_add(dev, &priv->napi, c_can_poll, C_CAN_NAPI_WEIGHT);
+        priv->dev = dev;
+        priv->can.bittiming_const = &c_can_bittiming_const;
+        priv->can.do_set_mode = c_can_set_mode;
+        priv->can.do_get_berr_counter = c_can_get_berr_counter;
+        priv->can.ctrlmode_supported = CAN_CTRLMODE_ONE_SHOT |
+                                        CAN_CTRLMODE_LOOPBACK |
+                                        CAN_CTRLMODE_LISTENONLY |
+                                        CAN_CTRLMODE_BERR_REPORTING;
+        return dev;
+}
+EXPORT_SYMBOL_GPL(alloc_c_can_dev);
+void free_c_can_dev(struct net_device *dev)
+{
+        free_candev(dev);
+}
+EXPORT_SYMBOL_GPL(free_c_can_dev);
+static const struct net_device_ops c_can_netdev_ops = {
+        .ndo_open = c_can_open,
+        .ndo_stop = c_can_close,
+        .ndo_start_xmit = c_can_start_xmit,
+};
+int register_c_can_dev(struct net_device *dev)
+{
+        dev->flags |= IFF_ECHO; /* we support local echo */
+        dev->netdev_ops = &c_can_netdev_ops;
+        return register_candev(dev);
+}
+EXPORT_SYMBOL_GPL(register_c_can_dev);
+void unregister_c_can_dev(struct net_device *dev)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        /* disable all interrupts */
+        c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS);
+        unregister_candev(dev);
+}
+EXPORT_SYMBOL_GPL(unregister_c_can_dev);
+MODULE_AUTHOR("Bhupesh Sharma <bhupesh.sharma@st.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("CAN bus driver for Bosch C_CAN controller");
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
new file mode 100644
index 000000000000..9b7fbef3d09a
--- /dev/null
+++ b/drivers/net/can/c_can/c_can.h
@@ -0,0 +1,86 @@
+/*
+ * CAN bus driver for Bosch C_CAN controller
+ *
+ * Copyright (C) 2010 ST Microelectronics
+ * Bhupesh Sharma <bhupesh.sharma@st.com>
+ *
+ * Borrowed heavily from the C_CAN driver originally written by:
+ * Copyright (C) 2007
+ * - Sascha Hauer, Marc Kleine-Budde, Pengutronix <s.hauer@pengutronix.de>
+ * - Simon Kallweit, intefo AG <simon.kallweit@intefo.ch>
+ *
+ * Bosch C_CAN controller is compliant to CAN protocol version 2.0 part A and B.
+ * Bosch C_CAN user manual can be obtained from:
+ * http://www.semiconductors.bosch.de/media/en/pdf/ipmodules_1/c_can/
+ * users_manual_c_can.pdf
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#ifndef C_CAN_H
+#define C_CAN_H
+/* c_can IF registers */
+struct c_can_if_regs {
+        u16 com_req;
+        u16 com_mask;
+        u16 mask1;
+        u16 mask2;
+        u16 arb1;
+        u16 arb2;
+        u16 msg_cntrl;
+        u16 data[4];
+        u16 _reserved[13];
+};
+/* c_can hardware registers */
+struct c_can_regs {
+        u16 control;
+        u16 status;
+        u16 err_cnt;
+        u16 btr;
+        u16 interrupt;
+        u16 test;
+        u16 brp_ext;
+        u16 _reserved1;
+        struct c_can_if_regs ifregs[2]; /* [0] = IF1 and [1] = IF2 */
+        u16 _reserved2[8];
+        u16 txrqst1;
+        u16 txrqst2;
+        u16 _reserved3[6];
+        u16 newdat1;
+        u16 newdat2;
+        u16 _reserved4[6];
+        u16 intpnd1;
+        u16 intpnd2;
+        u16 _reserved5[6];
+        u16 msgval1;
+        u16 msgval2;
+        u16 _reserved6[6];
+};
+/* c_can private data structure */
+struct c_can_priv {
+        struct can_priv can;    /* must be the first member */
+        struct napi_struct napi;
+        struct net_device *dev;
+        int tx_object;
+        int current_status;
+        int last_status;
+        u16 (*read_reg) (struct c_can_priv *priv, void *reg);
+        void (*write_reg) (struct c_can_priv *priv, void *reg, u16 val);
+        struct c_can_regs __iomem *regs;
+        unsigned long irq_flags; /* for request_irq() */
+        unsigned int tx_next;
+        unsigned int tx_echo;
+        void *priv;             /* for board-specific data */
+};
+struct net_device *alloc_c_can_dev(void);
+void free_c_can_dev(struct net_device *dev);
+int register_c_can_dev(struct net_device *dev);
+void unregister_c_can_dev(struct net_device *dev);
+#endif /* C_CAN_H */
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
new file mode 100644
index 000000000000..e629b961ae2d
--- /dev/null
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -0,0 +1,215 @@
+/*
+ * Platform CAN bus driver for Bosch C_CAN controller
+ *
+ * Copyright (C) 2010 ST Microelectronics
+ * Bhupesh Sharma <bhupesh.sharma@st.com>
+ *
+ * Borrowed heavily from the C_CAN driver originally written by:
+ * Copyright (C) 2007
+ * - Sascha Hauer, Marc Kleine-Budde, Pengutronix <s.hauer@pengutronix.de>
+ * - Simon Kallweit, intefo AG <simon.kallweit@intefo.ch>
+ *
+ * Bosch C_CAN controller is compliant to CAN protocol version 2.0 part A and B.
+ * Bosch C_CAN user manual can be obtained from:
+ * http://www.semiconductors.bosch.de/media/en/pdf/ipmodules_1/c_can/
+ * users_manual_c_can.pdf
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
+#include <linux/list.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/can/dev.h>
+#include "c_can.h"
+/*
+ * 16-bit c_can registers can be arranged differently in the memory
+ * architecture of different implementations. For example: 16-bit
+ * registers can be aligned to a 16-bit boundary or 32-bit boundary etc.
+ * Handle the same by providing a common read/write interface.
+ */
+static u16 c_can_plat_read_reg_aligned_to_16bit(struct c_can_priv *priv,
+                                                void *reg)
+{
+        return readw(reg);
+}
+static void c_can_plat_write_reg_aligned_to_16bit(struct c_can_priv *priv,
+                                                void *reg, u16 val)
+{
+        writew(val, reg);
+}
+static u16 c_can_plat_read_reg_aligned_to_32bit(struct c_can_priv *priv,
+                                                void *reg)
+{
+        return readw(reg + (long)reg - (long)priv->regs);
+}
+static void c_can_plat_write_reg_aligned_to_32bit(struct c_can_priv *priv,
+                                                void *reg, u16 val)
+{
+        writew(val, reg + (long)reg - (long)priv->regs);
+}
+static int __devinit c_can_plat_probe(struct platform_device *pdev)
+{
+        int ret;
+        void __iomem *addr;
+        struct net_device *dev;
+        struct c_can_priv *priv;
+        struct resource *mem, *irq;
+#ifdef CONFIG_HAVE_CLK
+        struct clk *clk;
+        /* get the appropriate clk */
+        clk = clk_get(&pdev->dev, NULL);
+        if (IS_ERR(clk)) {
+                dev_err(&pdev->dev, "no clock defined\n");
+                ret = -ENODEV;
+                goto exit;
+        }
+#endif
+        /* get the platform data */
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!mem || (irq <= 0)) {
+                ret = -ENODEV;
+                goto exit_free_clk;
+        }
+        if (!request_mem_region(mem->start, resource_size(mem),
+                                KBUILD_MODNAME)) {
+                dev_err(&pdev->dev, "resource unavailable\n");
+                ret = -ENODEV;
+                goto exit_free_clk;
+        }
+        addr = ioremap(mem->start, resource_size(mem));
+        if (!addr) {
+                dev_err(&pdev->dev, "failed to map can port\n");
+                ret = -ENOMEM;
+                goto exit_release_mem;
+        }
+        /* allocate the c_can device */
+        dev = alloc_c_can_dev();
+        if (!dev) {
+                ret = -ENOMEM;
+                goto exit_iounmap;
+        }
+        priv = netdev_priv(dev);
+        dev->irq = irq->start;
+        priv->regs = addr;
+#ifdef CONFIG_HAVE_CLK
+        priv->can.clock.freq = clk_get_rate(clk);
+        priv->priv = clk;
+#endif
+        switch (mem->flags & IORESOURCE_MEM_TYPE_MASK) {
+        case IORESOURCE_MEM_32BIT:
+                priv->read_reg = c_can_plat_read_reg_aligned_to_32bit;
+                priv->write_reg = c_can_plat_write_reg_aligned_to_32bit;
+                break;
+        case IORESOURCE_MEM_16BIT:
+        default:
+                priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
+                priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
+                break;
+        }
+        platform_set_drvdata(pdev, dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+        ret = register_c_can_dev(dev);
+        if (ret) {
+                dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
+                        KBUILD_MODNAME, ret);
+                goto exit_free_device;
+        }
+        dev_info(&pdev->dev, "%s device registered (regs=%p, irq=%d)\n",
+                 KBUILD_MODNAME, priv->regs, dev->irq);
+        return 0;
+exit_free_device:
+        platform_set_drvdata(pdev, NULL);
+        free_c_can_dev(dev);
+exit_iounmap:
+        iounmap(addr);
+exit_release_mem:
+        release_mem_region(mem->start, resource_size(mem));
+exit_free_clk:
+#ifdef CONFIG_HAVE_CLK
+        clk_put(clk);
+exit:
+#endif
+        dev_err(&pdev->dev, "probe failed\n");
+        return ret;
+}
+static int __devexit c_can_plat_remove(struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct resource *mem;
+        unregister_c_can_dev(dev);
+        platform_set_drvdata(pdev, NULL);
+        free_c_can_dev(dev);
+        iounmap(priv->regs);
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(mem->start, resource_size(mem));
+#ifdef CONFIG_HAVE_CLK
+        clk_put(priv->priv);
+#endif
+        return 0;
+}
+static struct platform_driver c_can_plat_driver = {
+        .driver = {
+                .name = KBUILD_MODNAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = c_can_plat_probe,
+        .remove = __devexit_p(c_can_plat_remove),
+};
+static int __init c_can_plat_init(void)
+{
+        return platform_driver_register(&c_can_plat_driver);
+}
+module_init(c_can_plat_init);
+static void __exit c_can_plat_exit(void)
+{
+        platform_driver_unregister(&c_can_plat_driver);
+}
+module_exit(c_can_plat_exit);
+MODULE_AUTHOR("Bhupesh Sharma <bhupesh.sharma@st.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("Platform CAN bus driver for Bosch C_CAN controller");
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index b9a6d7a5a739..366f5cc050ae 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1618,7 +1618,7 @@ static ssize_t ican3_sysfs_set_term(struct device *dev,
        return count;
 }
-static DEVICE_ATTR(termination, S_IWUGO | S_IRUGO, ican3_sysfs_show_term,
+static DEVICE_ATTR(termination, S_IWUSR | S_IRUGO, ican3_sysfs_show_term,
                                                   ican3_sysfs_set_term);
 static struct attribute *ican3_sysfs_attrs[] = {
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 7ab534aee452..7513c4523ac4 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -940,7 +940,7 @@ static int mcp251x_open(struct net_device *net)
                goto open_unlock;
        }
-        priv->wq = create_freezeable_workqueue("mcp251x_wq");
+        priv->wq = create_freezable_workqueue("mcp251x_wq");
        INIT_WORK(&priv->tx_work, mcp251x_tx_work_handler);
        INIT_WORK(&priv->restart_work, mcp251x_restart_work_handler);
diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig
index 27d1d398e25e..d38706958af6 100644
--- a/drivers/net/can/mscan/Kconfig
+++ b/drivers/net/can/mscan/Kconfig
@@ -1,5 +1,5 @@
 config CAN_MSCAN
-        depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
+        depends on CAN_DEV && (PPC || M68K)
        tristate "Support for Freescale MSCAN based chips"
        ---help---
          The Motorola Scalable Controller Area Network (MSCAN) definition
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index c42e97268248..e54712b22c27 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -185,7 +185,7 @@ struct pch_can_priv {
 static struct can_bittiming_const pch_can_bittiming_const = {
        .name = KBUILD_MODNAME,
-        .tseg1_min = 1,
+        .tseg1_min = 2,
        .tseg1_max = 16,
        .tseg2_min = 1,
        .tseg2_max = 8,
@@ -959,13 +959,13 @@ static void __devexit pch_can_remove(struct pci_dev *pdev)
        struct pch_can_priv *priv = netdev_priv(ndev);
        unregister_candev(priv->ndev);
-        pci_iounmap(pdev, priv->regs);
        if (priv->use_msi)
                pci_disable_msi(priv->dev);
        pci_release_regions(pdev);
        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);
        pch_can_reset(priv);
+        pci_iounmap(pdev, priv->regs);
        free_candev(priv->ndev);
 }
@@ -1238,6 +1238,7 @@ static int __devinit pch_can_probe(struct pci_dev *pdev,
                priv->use_msi = 0;
        } else {
                netdev_err(ndev, "PCH CAN opened with MSI\n");
+                pci_set_master(pdev);
                priv->use_msi = 1;
        }
diff --git a/drivers/net/can/softing/Kconfig b/drivers/net/can/softing/Kconfig
new file mode 100644
index 000000000000..5de46a9a77bb
--- /dev/null
+++ b/drivers/net/can/softing/Kconfig
@@ -0,0 +1,30 @@
+config CAN_SOFTING
+        tristate "Softing Gmbh CAN generic support"
+        depends on CAN_DEV && HAS_IOMEM
+        ---help---
+          Support for CAN cards from Softing Gmbh & some cards
+          from Vector Gmbh.
+          Softing Gmbh CAN cards come with 1 or 2 physical busses.
+          Those cards typically use Dual Port RAM to communicate
+          with the host CPU. The interface is then identical for PCI
+          and PCMCIA cards. This driver operates on a platform device,
+          which has been created by softing_cs or softing_pci driver.
+          Warning:
+          The API of the card does not allow fine control per bus, but
+          controls the 2 busses on the card together.
+          As such, some actions (start/stop/busoff recovery) on 1 bus
+          must bring down the other bus too temporarily.
+config CAN_SOFTING_CS
+        tristate "Softing Gmbh CAN pcmcia cards"
+        depends on PCMCIA
+        depends on CAN_SOFTING
+        ---help---
+          Support for PCMCIA cards from Softing Gmbh & some cards
+          from Vector Gmbh.
+          You need firmware for these, which you can get at
+          http://developer.berlios.de/projects/socketcan/
+          This version of the driver is written against
+          firmware version 4.6 (softing-fw-4.6-binaries.tar.gz)
+          In order to use the card as CAN device, you need the Softing generic
+          support too.
diff --git a/drivers/net/can/softing/Makefile b/drivers/net/can/softing/Makefile
new file mode 100644
index 000000000000..c5e5016c742e
--- /dev/null
+++ b/drivers/net/can/softing/Makefile
@@ -0,0 +1,6 @@
+softing-y := softing_main.o softing_fw.o
+obj-$(CONFIG_CAN_SOFTING) += softing.o
+obj-$(CONFIG_CAN_SOFTING_CS) += softing_cs.o
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/softing/softing.h b/drivers/net/can/softing/softing.h
new file mode 100644
index 000000000000..7ec9f4db3d52
--- /dev/null
+++ b/drivers/net/can/softing/softing.h
@@ -0,0 +1,167 @@
+/*
+ * softing common interfaces
+ *
+ * by Kurt Van Dijck, 2008-2010
+ */
+#include <linux/atomic.h>
+#include <linux/netdevice.h>
+#include <linux/ktime.h>
+#include <linux/mutex.h>
+#include <linux/spinlock.h>
+#include <linux/can.h>
+#include <linux/can/dev.h>
+#include "softing_platform.h"
+struct softing;
+struct softing_priv {
+        struct can_priv can; /* must be the first member! */
+        struct net_device *netdev;
+        struct softing *card;
+        struct {
+                int pending;
+                /* variables wich hold the circular buffer */
+                int echo_put;
+                int echo_get;
+        } tx;
+        struct can_bittiming_const btr_const;
+        int index;
+        uint8_t output;
+        uint16_t chip;
+};
+#define netdev2softing(netdev)  ((struct softing_priv *)netdev_priv(netdev))
+struct softing {
+        const struct softing_platform_data *pdat;
+        struct platform_device *pdev;
+        struct net_device *net[2];
+        spinlock_t spin; /* protect this structure & DPRAM access */
+        ktime_t ts_ref;
+        ktime_t ts_overflow; /* timestamp overflow value, in ktime */
+        struct {
+                /* indication of firmware status */
+                int up;
+                /* protection of the 'up' variable */
+                struct mutex lock;
+        } fw;
+        struct {
+                int nr;
+                int requested;
+                int svc_count;
+                unsigned int dpram_position;
+        } irq;
+        struct {
+                int pending;
+                int last_bus;
+                /*
+                 * keep the bus that last tx'd a message,
+                 * in order to let every netdev queue resume
+                 */
+        } tx;
+        __iomem uint8_t *dpram;
+        unsigned long dpram_phys;
+        unsigned long dpram_size;
+        struct {
+                uint16_t fw_version, hw_version, license, serial;
+                uint16_t chip[2];
+                unsigned int freq; /* remote cpu's operating frequency */
+        } id;
+};
+extern int softing_default_output(struct net_device *netdev);
+extern ktime_t softing_raw2ktime(struct softing *card, u32 raw);
+extern int softing_chip_poweron(struct softing *card);
+extern int softing_bootloader_command(struct softing *card, int16_t cmd,
+                const char *msg);
+/* Load firmware after reset */
+extern int softing_load_fw(const char *file, struct softing *card,
+                        __iomem uint8_t *virt, unsigned int size, int offset);
+/* Load final application firmware after bootloader */
+extern int softing_load_app_fw(const char *file, struct softing *card);
+/*
+ * enable or disable irq
+ * only called with fw.lock locked
+ */
+extern int softing_enable_irq(struct softing *card, int enable);
+/* start/stop 1 bus on card */
+extern int softing_startstop(struct net_device *netdev, int up);
+/* netif_rx() */
+extern int softing_netdev_rx(struct net_device *netdev,
+                const struct can_frame *msg, ktime_t ktime);
+/* SOFTING DPRAM mappings */
+#define DPRAM_RX                0x0000
+        #define DPRAM_RX_SIZE   32
+        #define DPRAM_RX_CNT    16
+#define DPRAM_RX_RD             0x0201  /* uint8_t */
+#define DPRAM_RX_WR             0x0205  /* uint8_t */
+#define DPRAM_RX_LOST           0x0207  /* uint8_t */
+#define DPRAM_FCT_PARAM         0x0300  /* int16_t [20] */
+#define DPRAM_FCT_RESULT        0x0328  /* int16_t */
+#define DPRAM_FCT_HOST          0x032b  /* uint16_t */
+#define DPRAM_INFO_BUSSTATE     0x0331  /* uint16_t */
+#define DPRAM_INFO_BUSSTATE2    0x0335  /* uint16_t */
+#define DPRAM_INFO_ERRSTATE     0x0339  /* uint16_t */
+#define DPRAM_INFO_ERRSTATE2    0x033d  /* uint16_t */
+#define DPRAM_RESET             0x0341  /* uint16_t */
+#define DPRAM_CLR_RECV_FIFO     0x0345  /* uint16_t */
+#define DPRAM_RESET_TIME        0x034d  /* uint16_t */
+#define DPRAM_TIME              0x0350  /* uint64_t */
+#define DPRAM_WR_START          0x0358  /* uint8_t */
+#define DPRAM_WR_END            0x0359  /* uint8_t */
+#define DPRAM_RESET_RX_FIFO     0x0361  /* uint16_t */
+#define DPRAM_RESET_TX_FIFO     0x0364  /* uint8_t */
+#define DPRAM_READ_FIFO_LEVEL   0x0365  /* uint8_t */
+#define DPRAM_RX_FIFO_LEVEL     0x0366  /* uint16_t */
+#define DPRAM_TX_FIFO_LEVEL     0x0366  /* uint16_t */
+#define DPRAM_TX                0x0400  /* uint16_t */
+        #define DPRAM_TX_SIZE   16
+        #define DPRAM_TX_CNT    32
+#define DPRAM_TX_RD             0x0601  /* uint8_t */
+#define DPRAM_TX_WR             0x0605  /* uint8_t */
+#define DPRAM_COMMAND           0x07e0  /* uint16_t */
+#define DPRAM_RECEIPT           0x07f0  /* uint16_t */
+#define DPRAM_IRQ_TOHOST        0x07fe  /* uint8_t */
+#define DPRAM_IRQ_TOCARD        0x07ff  /* uint8_t */
+#define DPRAM_V2_RESET          0x0e00  /* uint8_t */
+#define DPRAM_V2_IRQ_TOHOST     0x0e02  /* uint8_t */
+#define TXMAX   (DPRAM_TX_CNT - 1)
+/* DPRAM return codes */
+#define RES_NONE        0
+#define RES_OK          1
+#define RES_NOK         2
+#define RES_UNKNOWN     3
+/* DPRAM flags */
+#define CMD_TX          0x01
+#define CMD_ACK         0x02
+#define CMD_XTD         0x04
+#define CMD_RTR         0x08
+#define CMD_ERR         0x10
+#define CMD_BUS2        0x80
+/* returned fifo entry bus state masks */
+#define SF_MASK_BUSOFF          0x80
+#define SF_MASK_EPASSIVE        0x60
+/* bus states */
+#define STATE_BUSOFF    2
+#define STATE_EPASSIVE  1
+#define STATE_EACTIVE   0
diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c
new file mode 100644
index 000000000000..c11bb4de8630
--- /dev/null
+++ b/drivers/net/can/softing/softing_cs.c
@@ -0,0 +1,360 @@
+/*
+ * Copyright (C) 2008-2010
+ *
+ * - Kurt Van Dijck, EIA Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/ds.h>
+#include "softing_platform.h"
+static int softingcs_index;
+static spinlock_t softingcs_index_lock;
+static int softingcs_reset(struct platform_device *pdev, int v);
+static int softingcs_enable_irq(struct platform_device *pdev, int v);
+/*
+ * platform_data descriptions
+ */
+#define MHZ (1000*1000)
+static const struct softing_platform_data softingcs_platform_data[] = {
+{
+        .name = "CANcard",
+        .manf = 0x0168, .prod = 0x001,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "CANcard-NEC",
+        .manf = 0x0168, .prod = 0x002,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "CANcard-SJA",
+        .manf = 0x0168, .prod = 0x004,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 20 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cansja.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "CANcard-2",
+        .manf = 0x0168, .prod = 0x005,
+        .generation = 2,
+        .nbus = 2,
+        .freq = 24 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x1000,
+        .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = NULL,
+}, {
+        .name = "Vector-CANcard",
+        .manf = 0x0168, .prod = 0x081,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "Vector-CANcard-SJA",
+        .manf = 0x0168, .prod = 0x084,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 20 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cansja.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "Vector-CANcard-2",
+        .manf = 0x0168, .prod = 0x085,
+        .generation = 2,
+        .nbus = 2,
+        .freq = 24 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x1000,
+        .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = NULL,
+}, {
+        .name = "EDICcard-NEC",
+        .manf = 0x0168, .prod = 0x102,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "EDICcard-2",
+        .manf = 0x0168, .prod = 0x105,
+        .generation = 2,
+        .nbus = 2,
+        .freq = 24 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x1000,
+        .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = NULL,
+}, {
+        0, 0,
+},
+};
+MODULE_FIRMWARE(fw_dir "bcard.bin");
+MODULE_FIRMWARE(fw_dir "ldcard.bin");
+MODULE_FIRMWARE(fw_dir "cancard.bin");
+MODULE_FIRMWARE(fw_dir "cansja.bin");
+MODULE_FIRMWARE(fw_dir "bcard2.bin");
+MODULE_FIRMWARE(fw_dir "ldcard2.bin");
+MODULE_FIRMWARE(fw_dir "cancrd2.bin");
+static __devinit const struct softing_platform_data
+*softingcs_find_platform_data(unsigned int manf, unsigned int prod)
+{
+        const struct softing_platform_data *lp;
+        for (lp = softingcs_platform_data; lp->manf; ++lp) {
+                if ((lp->manf == manf) && (lp->prod == prod))
+                        return lp;
+        }
+        return NULL;
+}
+/*
+ * platformdata callbacks
+ */
+static int softingcs_reset(struct platform_device *pdev, int v)
+{
+        struct pcmcia_device *pcmcia = to_pcmcia_dev(pdev->dev.parent);
+        dev_dbg(&pdev->dev, "pcmcia config [2] %02x\n", v ? 0 : 0x20);
+        return pcmcia_write_config_byte(pcmcia, 2, v ? 0 : 0x20);
+}
+static int softingcs_enable_irq(struct platform_device *pdev, int v)
+{
+        struct pcmcia_device *pcmcia = to_pcmcia_dev(pdev->dev.parent);
+        dev_dbg(&pdev->dev, "pcmcia config [0] %02x\n", v ? 0x60 : 0);
+        return pcmcia_write_config_byte(pcmcia, 0, v ? 0x60 : 0);
+}
+/*
+ * pcmcia check
+ */
+static __devinit int softingcs_probe_config(struct pcmcia_device *pcmcia,
+                void *priv_data)
+{
+        struct softing_platform_data *pdat = priv_data;
+        struct resource *pres;
+        int memspeed = 0;
+        WARN_ON(!pdat);
+        pres = pcmcia->resource[PCMCIA_IOMEM_0];
+        if (resource_size(pres) < 0x1000)
+                return -ERANGE;
+        pres->flags |= WIN_MEMORY_TYPE_CM | WIN_ENABLE;
+        if (pdat->generation < 2) {
+                pres->flags |= WIN_USE_WAIT | WIN_DATA_WIDTH_8;
+                memspeed = 3;
+        } else {
+                pres->flags |= WIN_DATA_WIDTH_16;
+        }
+        return pcmcia_request_window(pcmcia, pres, memspeed);
+}
+static __devexit void softingcs_remove(struct pcmcia_device *pcmcia)
+{
+        struct platform_device *pdev = pcmcia->priv;
+        /* free bits */
+        platform_device_unregister(pdev);
+        /* release pcmcia stuff */
+        pcmcia_disable_device(pcmcia);
+}
+/*
+ * platform_device wrapper
+ * pdev->resource has 2 entries: io & irq
+ */
+static void softingcs_pdev_release(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        kfree(pdev);
+}
+static __devinit int softingcs_probe(struct pcmcia_device *pcmcia)
+{
+        int ret;
+        struct platform_device *pdev;
+        const struct softing_platform_data *pdat;
+        struct resource *pres;
+        struct dev {
+                struct platform_device pdev;
+                struct resource res[2];
+        } *dev;
+        /* find matching platform_data */
+        pdat = softingcs_find_platform_data(pcmcia->manf_id, pcmcia->card_id);
+        if (!pdat)
+                return -ENOTTY;
+        /* setup pcmcia device */
+        pcmcia->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IOMEM |
+                CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC;
+        ret = pcmcia_loop_config(pcmcia, softingcs_probe_config, (void *)pdat);
+        if (ret)
+                goto pcmcia_failed;
+        ret = pcmcia_enable_device(pcmcia);
+        if (ret < 0)
+                goto pcmcia_failed;
+        pres = pcmcia->resource[PCMCIA_IOMEM_0];
+        if (!pres) {
+                ret = -EBADF;
+                goto pcmcia_bad;
+        }
+        /* create softing platform device */
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev) {
+                ret = -ENOMEM;
+                goto mem_failed;
+        }
+        dev->pdev.resource = dev->res;
+        dev->pdev.num_resources = ARRAY_SIZE(dev->res);
+        dev->pdev.dev.release = softingcs_pdev_release;
+        pdev = &dev->pdev;
+        pdev->dev.platform_data = (void *)pdat;
+        pdev->dev.parent = &pcmcia->dev;
+        pcmcia->priv = pdev;
+        /* platform device resources */
+        pdev->resource[0].flags = IORESOURCE_MEM;
+        pdev->resource[0].start = pres->start;
+        pdev->resource[0].end = pres->end;
+        pdev->resource[1].flags = IORESOURCE_IRQ;
+        pdev->resource[1].start = pcmcia->irq;
+        pdev->resource[1].end = pdev->resource[1].start;
+        /* platform device setup */
+        spin_lock(&softingcs_index_lock);
+        pdev->id = softingcs_index++;
+        spin_unlock(&softingcs_index_lock);
+        pdev->name = "softing";
+        dev_set_name(&pdev->dev, "softingcs.%i", pdev->id);
+        ret = platform_device_register(pdev);
+        if (ret < 0)
+                goto platform_failed;
+        dev_info(&pcmcia->dev, "created %s\n", dev_name(&pdev->dev));
+        return 0;
+platform_failed:
+        kfree(dev);
+mem_failed:
+pcmcia_bad:
+pcmcia_failed:
+        pcmcia_disable_device(pcmcia);
+        pcmcia->priv = NULL;
+        return ret ?: -ENODEV;
+}
+static /*const*/ struct pcmcia_device_id softingcs_ids[] = {
+        /* softing */
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0001),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0004),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0005),
+        /* vector, manufacturer? */
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0081),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0084),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0085),
+        /* EDIC */
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0102),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0105),
+        PCMCIA_DEVICE_NULL,
+};
+MODULE_DEVICE_TABLE(pcmcia, softingcs_ids);
+static struct pcmcia_driver softingcs_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "softingcs",
+        .id_table       = softingcs_ids,
+        .probe          = softingcs_probe,
+        .remove         = __devexit_p(softingcs_remove),
+};
+static int __init softingcs_start(void)
+{
+        spin_lock_init(&softingcs_index_lock);
+        return pcmcia_register_driver(&softingcs_driver);
+}
+static void __exit softingcs_stop(void)
+{
+        pcmcia_unregister_driver(&softingcs_driver);
+}
+module_init(softingcs_start);
+module_exit(softingcs_stop);
+MODULE_DESCRIPTION("softing CANcard driver"
+                ", links PCMCIA card to softing driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c
new file mode 100644
index 000000000000..b520784fb197
--- /dev/null
+++ b/drivers/net/can/softing/softing_fw.c
@@ -0,0 +1,691 @@
+/*
+ * Copyright (C) 2008-2010
+ *
+ * - Kurt Van Dijck, EIA Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/firmware.h>
+#include <linux/sched.h>
+#include <asm/div64.h>
+#include "softing.h"
+/*
+ * low level DPRAM command.
+ * Make sure that card->dpram[DPRAM_FCT_HOST] is preset
+ */
+static int _softing_fct_cmd(struct softing *card, int16_t cmd, uint16_t vector,
+                const char *msg)
+{
+        int ret;
+        unsigned long stamp;
+        iowrite16(cmd, &card->dpram[DPRAM_FCT_PARAM]);
+        iowrite8(vector >> 8, &card->dpram[DPRAM_FCT_HOST + 1]);
+        iowrite8(vector, &card->dpram[DPRAM_FCT_HOST]);
+        /* be sure to flush this to the card */
+        wmb();
+        stamp = jiffies + 1 * HZ;
+        /* wait for card */
+        do {
+                /* DPRAM_FCT_HOST is _not_ aligned */
+                ret = ioread8(&card->dpram[DPRAM_FCT_HOST]) +
+                        (ioread8(&card->dpram[DPRAM_FCT_HOST + 1]) << 8);
+                /* don't have any cached variables */
+                rmb();
+                if (ret == RES_OK)
+                        /* read return-value now */
+                        return ioread16(&card->dpram[DPRAM_FCT_RESULT]);
+                if ((ret != vector) || time_after(jiffies, stamp))
+                        break;
+                /* process context => relax */
+                usleep_range(500, 10000);
+        } while (1);
+        ret = (ret == RES_NONE) ? -ETIMEDOUT : -ECANCELED;
+        dev_alert(&card->pdev->dev, "firmware %s failed (%i)\n", msg, ret);
+        return ret;
+}
+static int softing_fct_cmd(struct softing *card, int16_t cmd, const char *msg)
+{
+        int ret;
+        ret = _softing_fct_cmd(card, cmd, 0, msg);
+        if (ret > 0) {
+                dev_alert(&card->pdev->dev, "%s returned %u\n", msg, ret);
+                ret = -EIO;
+        }
+        return ret;
+}
+int softing_bootloader_command(struct softing *card, int16_t cmd,
+                const char *msg)
+{
+        int ret;
+        unsigned long stamp;
+        iowrite16(RES_NONE, &card->dpram[DPRAM_RECEIPT]);
+        iowrite16(cmd, &card->dpram[DPRAM_COMMAND]);
+        /* be sure to flush this to the card */
+        wmb();
+        stamp = jiffies + 3 * HZ;
+        /* wait for card */
+        do {
+                ret = ioread16(&card->dpram[DPRAM_RECEIPT]);
+                /* don't have any cached variables */
+                rmb();
+                if (ret == RES_OK)
+                        return 0;
+                if (time_after(jiffies, stamp))
+                        break;
+                /* process context => relax */
+                usleep_range(500, 10000);
+        } while (!signal_pending(current));
+        ret = (ret == RES_NONE) ? -ETIMEDOUT : -ECANCELED;
+        dev_alert(&card->pdev->dev, "bootloader %s failed (%i)\n", msg, ret);
+        return ret;
+}
+static int fw_parse(const uint8_t **pmem, uint16_t *ptype, uint32_t *paddr,
+                uint16_t *plen, const uint8_t **pdat)
+{
+        uint16_t checksum[2];
+        const uint8_t *mem;
+        const uint8_t *end;
+        /*
+         * firmware records are a binary, unaligned stream composed of:
+         * uint16_t type;
+         * uint32_t addr;
+         * uint16_t len;
+         * uint8_t dat[len];
+         * uint16_t checksum;
+         * all values in little endian.
+         * We could define a struct for this, with __attribute__((packed)),
+         * but would that solve the alignment in _all_ cases (cfr. the
+         * struct itself may be an odd address)?
+         *
+         * I chose to use leXX_to_cpup() since this solves both
+         * endianness & alignment.
+         */
+        mem = *pmem;
+        *ptype = le16_to_cpup((void *)&mem[0]);
+        *paddr = le32_to_cpup((void *)&mem[2]);
+        *plen = le16_to_cpup((void *)&mem[6]);
+        *pdat = &mem[8];
+        /* verify checksum */
+        end = &mem[8 + *plen];
+        checksum[0] = le16_to_cpup((void *)end);
+        for (checksum[1] = 0; mem < end; ++mem)
+                checksum[1] += *mem;
+        if (checksum[0] != checksum[1])
+                return -EINVAL;
+        /* increment */
+        *pmem += 10 + *plen;
+        return 0;
+}
+int softing_load_fw(const char *file, struct softing *card,
+                __iomem uint8_t *dpram, unsigned int size, int offset)
+{
+        const struct firmware *fw;
+        int ret;
+        const uint8_t *mem, *end, *dat;
+        uint16_t type, len;
+        uint32_t addr;
+        uint8_t *buf = NULL;
+        int buflen = 0;
+        int8_t type_end = 0;
+        ret = request_firmware(&fw, file, &card->pdev->dev);
+        if (ret < 0)
+                return ret;
+        dev_dbg(&card->pdev->dev, "%s, firmware(%s) got %u bytes"
+                ", offset %c0x%04x\n",
+                card->pdat->name, file, (unsigned int)fw->size,
+                (offset >= 0) ? '+' : '-', (unsigned int)abs(offset));
+        /* parse the firmware */
+        mem = fw->data;
+        end = &mem[fw->size];
+        /* look for header record */
+        ret = fw_parse(&mem, &type, &addr, &len, &dat);
+        if (ret < 0)
+                goto failed;
+        if (type != 0xffff)
+                goto failed;
+        if (strncmp("Structured Binary Format, Softing GmbH" , dat, len)) {
+                ret = -EINVAL;
+                goto failed;
+        }
+        /* ok, we had a header */
+        while (mem < end) {
+                ret = fw_parse(&mem, &type, &addr, &len, &dat);
+                if (ret < 0)
+                        goto failed;
+                if (type == 3) {
+                        /* start address, not used here */
+                        continue;
+                } else if (type == 1) {
+                        /* eof */
+                        type_end = 1;
+                        break;
+                } else if (type != 0) {
+                        ret = -EINVAL;
+                        goto failed;
+                }
+                if ((addr + len + offset) > size)
+                        goto failed;
+                memcpy_toio(&dpram[addr + offset], dat, len);
+                /* be sure to flush caches from IO space */
+                mb();
+                if (len > buflen) {
+                        /* align buflen */
+                        buflen = (len + (1024-1)) & ~(1024-1);
+                        buf = krealloc(buf, buflen, GFP_KERNEL);
+                        if (!buf) {
+                                ret = -ENOMEM;
+                                goto failed;
+                        }
+                }
+                /* verify record data */
+                memcpy_fromio(buf, &dpram[addr + offset], len);
+                if (memcmp(buf, dat, len)) {
+                        /* is not ok */
+                        dev_alert(&card->pdev->dev, "DPRAM readback failed\n");
+                        ret = -EIO;
+                        goto failed;
+                }
+        }
+        if (!type_end)
+                /* no end record seen */
+                goto failed;
+        ret = 0;
+failed:
+        kfree(buf);
+        release_firmware(fw);
+        if (ret < 0)
+                dev_info(&card->pdev->dev, "firmware %s failed\n", file);
+        return ret;
+}
+int softing_load_app_fw(const char *file, struct softing *card)
+{
+        const struct firmware *fw;
+        const uint8_t *mem, *end, *dat;
+        int ret, j;
+        uint16_t type, len;
+        uint32_t addr, start_addr = 0;
+        unsigned int sum, rx_sum;
+        int8_t type_end = 0, type_entrypoint = 0;
+        ret = request_firmware(&fw, file, &card->pdev->dev);
+        if (ret) {
+                dev_alert(&card->pdev->dev, "request_firmware(%s) got %i\n",
+                        file, ret);
+                return ret;
+        }
+        dev_dbg(&card->pdev->dev, "firmware(%s) got %lu bytes\n",
+                file, (unsigned long)fw->size);
+        /* parse the firmware */
+        mem = fw->data;
+        end = &mem[fw->size];
+        /* look for header record */
+        ret = fw_parse(&mem, &type, &addr, &len, &dat);
+        if (ret)
+                goto failed;
+        ret = -EINVAL;
+        if (type != 0xffff) {
+                dev_alert(&card->pdev->dev, "firmware starts with type 0x%x\n",
+                        type);
+                goto failed;
+        }
+        if (strncmp("Structured Binary Format, Softing GmbH", dat, len)) {
+                dev_alert(&card->pdev->dev, "firmware string '%.*s' fault\n",
+                                len, dat);
+                goto failed;
+        }
+        /* ok, we had a header */
+        while (mem < end) {
+                ret = fw_parse(&mem, &type, &addr, &len, &dat);
+                if (ret)
+                        goto failed;
+                if (type == 3) {
+                        /* start address */
+                        start_addr = addr;
+                        type_entrypoint = 1;
+                        continue;
+                } else if (type == 1) {
+                        /* eof */
+                        type_end = 1;
+                        break;
+                } else if (type != 0) {
+                        dev_alert(&card->pdev->dev,
+                                        "unknown record type 0x%04x\n", type);
+                        ret = -EINVAL;
+                        goto failed;
+                }
+                /* regualar data */
+                for (sum = 0, j = 0; j < len; ++j)
+                        sum += dat[j];
+                /* work in 16bit (target) */
+                sum &= 0xffff;
+                memcpy_toio(&card->dpram[card->pdat->app.offs], dat, len);
+                iowrite32(card->pdat->app.offs + card->pdat->app.addr,
+                                &card->dpram[DPRAM_COMMAND + 2]);
+                iowrite32(addr, &card->dpram[DPRAM_COMMAND + 6]);
+                iowrite16(len, &card->dpram[DPRAM_COMMAND + 10]);
+                iowrite8(1, &card->dpram[DPRAM_COMMAND + 12]);
+                ret = softing_bootloader_command(card, 1, "loading app.");
+                if (ret < 0)
+                        goto failed;
+                /* verify checksum */
+                rx_sum = ioread16(&card->dpram[DPRAM_RECEIPT + 2]);
+                if (rx_sum != sum) {
+                        dev_alert(&card->pdev->dev, "SRAM seems to be damaged"
+                                ", wanted 0x%04x, got 0x%04x\n", sum, rx_sum);
+                        ret = -EIO;
+                        goto failed;
+                }
+        }
+        if (!type_end || !type_entrypoint)
+                goto failed;
+        /* start application in card */
+        iowrite32(start_addr, &card->dpram[DPRAM_COMMAND + 2]);
+        iowrite8(1, &card->dpram[DPRAM_COMMAND + 6]);
+        ret = softing_bootloader_command(card, 3, "start app.");
+        if (ret < 0)
+                goto failed;
+        ret = 0;
+failed:
+        release_firmware(fw);
+        if (ret < 0)
+                dev_info(&card->pdev->dev, "firmware %s failed\n", file);
+        return ret;
+}
+static int softing_reset_chip(struct softing *card)
+{
+        int ret;
+        do {
+                /* reset chip */
+                iowrite8(0, &card->dpram[DPRAM_RESET_RX_FIFO]);
+                iowrite8(0, &card->dpram[DPRAM_RESET_RX_FIFO+1]);
+                iowrite8(1, &card->dpram[DPRAM_RESET]);
+                iowrite8(0, &card->dpram[DPRAM_RESET+1]);
+                ret = softing_fct_cmd(card, 0, "reset_can");
+                if (!ret)
+                        break;
+                if (signal_pending(current))
+                        /* don't wait any longer */
+                        break;
+        } while (1);
+        card->tx.pending = 0;
+        return ret;
+}
+int softing_chip_poweron(struct softing *card)
+{
+        int ret;
+        /* sync */
+        ret = _softing_fct_cmd(card, 99, 0x55, "sync-a");
+        if (ret < 0)
+                goto failed;
+        ret = _softing_fct_cmd(card, 99, 0xaa, "sync-b");
+        if (ret < 0)
+                goto failed;
+        ret = softing_reset_chip(card);
+        if (ret < 0)
+                goto failed;
+        /* get_serial */
+        ret = softing_fct_cmd(card, 43, "get_serial_number");
+        if (ret < 0)
+                goto failed;
+        card->id.serial = ioread32(&card->dpram[DPRAM_FCT_PARAM]);
+        /* get_version */
+        ret = softing_fct_cmd(card, 12, "get_version");
+        if (ret < 0)
+                goto failed;
+        card->id.fw_version = ioread16(&card->dpram[DPRAM_FCT_PARAM + 2]);
+        card->id.hw_version = ioread16(&card->dpram[DPRAM_FCT_PARAM + 4]);
+        card->id.license = ioread16(&card->dpram[DPRAM_FCT_PARAM + 6]);
+        card->id.chip[0] = ioread16(&card->dpram[DPRAM_FCT_PARAM + 8]);
+        card->id.chip[1] = ioread16(&card->dpram[DPRAM_FCT_PARAM + 10]);
+        return 0;
+failed:
+        return ret;
+}
+static void softing_initialize_timestamp(struct softing *card)
+{
+        uint64_t ovf;
+        card->ts_ref = ktime_get();
+        /* 16MHz is the reference */
+        ovf = 0x100000000ULL * 16;
+        do_div(ovf, card->pdat->freq ?: 16);
+        card->ts_overflow = ktime_add_us(ktime_set(0, 0), ovf);
+}
+ktime_t softing_raw2ktime(struct softing *card, u32 raw)
+{
+        uint64_t rawl;
+        ktime_t now, real_offset;
+        ktime_t target;
+        ktime_t tmp;
+        now = ktime_get();
+        real_offset = ktime_sub(ktime_get_real(), now);
+        /* find nsec from card */
+        rawl = raw * 16;
+        do_div(rawl, card->pdat->freq ?: 16);
+        target = ktime_add_us(card->ts_ref, rawl);
+        /* test for overflows */
+        tmp = ktime_add(target, card->ts_overflow);
+        while (unlikely(ktime_to_ns(tmp) > ktime_to_ns(now))) {
+                card->ts_ref = ktime_add(card->ts_ref, card->ts_overflow);
+                target = tmp;
+                tmp = ktime_add(target, card->ts_overflow);
+        }
+        return ktime_add(target, real_offset);
+}
+static inline int softing_error_reporting(struct net_device *netdev)
+{
+        struct softing_priv *priv = netdev_priv(netdev);
+        return (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)
+                ? 1 : 0;
+}
+int softing_startstop(struct net_device *dev, int up)
+{
+        int ret;
+        struct softing *card;
+        struct softing_priv *priv;
+        struct net_device *netdev;
+        int bus_bitmask_start;
+        int j, error_reporting;
+        struct can_frame msg;
+        const struct can_bittiming *bt;
+        priv = netdev_priv(dev);
+        card = priv->card;
+        if (!card->fw.up)
+                return -EIO;
+        ret = mutex_lock_interruptible(&card->fw.lock);
+        if (ret)
+                return ret;
+        bus_bitmask_start = 0;
+        if (dev && up)
+                /* prepare to start this bus as well */
+                bus_bitmask_start |= (1 << priv->index);
+        /* bring netdevs down */
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                netdev = card->net[j];
+                if (!netdev)
+                        continue;
+                priv = netdev_priv(netdev);
+                if (dev != netdev)
+                        netif_stop_queue(netdev);
+                if (netif_running(netdev)) {
+                        if (dev != netdev)
+                                bus_bitmask_start |= (1 << j);
+                        priv->tx.pending = 0;
+                        priv->tx.echo_put = 0;
+                        priv->tx.echo_get = 0;
+                        /*
+                         * this bus' may just have called open_candev()
+                         * which is rather stupid to call close_candev()
+                         * already
+                         * but we may come here from busoff recovery too
+                         * in which case the echo_skb _needs_ flushing too.
+                         * just be sure to call open_candev() again
+                         */
+                        close_candev(netdev);
+                }
+                priv->can.state = CAN_STATE_STOPPED;
+        }
+        card->tx.pending = 0;
+        softing_enable_irq(card, 0);
+        ret = softing_reset_chip(card);
+        if (ret)
+                goto failed;
+        if (!bus_bitmask_start)
+                /* no busses to be brought up */
+                goto card_done;
+        if ((bus_bitmask_start & 1) && (bus_bitmask_start & 2)
+                        && (softing_error_reporting(card->net[0])
+                                != softing_error_reporting(card->net[1]))) {
+                dev_alert(&card->pdev->dev,
+                                "err_reporting flag differs for busses\n");
+                goto invalid;
+        }
+        error_reporting = 0;
+        if (bus_bitmask_start & 1) {
+                netdev = card->net[0];
+                priv = netdev_priv(netdev);
+                error_reporting += softing_error_reporting(netdev);
+                /* init chip 1 */
+                bt = &priv->can.bittiming;
+                iowrite16(bt->brp, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(bt->sjw, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                iowrite16(bt->phase_seg1 + bt->prop_seg,
+                                &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(bt->phase_seg2, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16((priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) ? 1 : 0,
+                                &card->dpram[DPRAM_FCT_PARAM + 10]);
+                ret = softing_fct_cmd(card, 1, "initialize_chip[0]");
+                if (ret < 0)
+                        goto failed;
+                /* set mode */
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                ret = softing_fct_cmd(card, 3, "set_mode[0]");
+                if (ret < 0)
+                        goto failed;
+                /* set filter */
+                /* 11bit id & mask */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0x07ff, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                /* 29bit id.lo & mask.lo & id.hi & mask.hi */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(0xffff, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 10]);
+                iowrite16(0x1fff, &card->dpram[DPRAM_FCT_PARAM + 12]);
+                ret = softing_fct_cmd(card, 7, "set_filter[0]");
+                if (ret < 0)
+                        goto failed;
+                /* set output control */
+                iowrite16(priv->output, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                ret = softing_fct_cmd(card, 5, "set_output[0]");
+                if (ret < 0)
+                        goto failed;
+        }
+        if (bus_bitmask_start & 2) {
+                netdev = card->net[1];
+                priv = netdev_priv(netdev);
+                error_reporting += softing_error_reporting(netdev);
+                /* init chip2 */
+                bt = &priv->can.bittiming;
+                iowrite16(bt->brp, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(bt->sjw, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                iowrite16(bt->phase_seg1 + bt->prop_seg,
+                                &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(bt->phase_seg2, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16((priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) ? 1 : 0,
+                                &card->dpram[DPRAM_FCT_PARAM + 10]);
+                ret = softing_fct_cmd(card, 2, "initialize_chip[1]");
+                if (ret < 0)
+                        goto failed;
+                /* set mode2 */
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                ret = softing_fct_cmd(card, 4, "set_mode[1]");
+                if (ret < 0)
+                        goto failed;
+                /* set filter2 */
+                /* 11bit id & mask */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0x07ff, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                /* 29bit id.lo & mask.lo & id.hi & mask.hi */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(0xffff, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 10]);
+                iowrite16(0x1fff, &card->dpram[DPRAM_FCT_PARAM + 12]);
+                ret = softing_fct_cmd(card, 8, "set_filter[1]");
+                if (ret < 0)
+                        goto failed;
+                /* set output control2 */
+                iowrite16(priv->output, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                ret = softing_fct_cmd(card, 6, "set_output[1]");
+                if (ret < 0)
+                        goto failed;
+        }
+        /* enable_error_frame */
+        /*
+         * Error reporting is switched off at the moment since
+         * the receiving of them is not yet 100% verified
+         * This should be enabled sooner or later
+         *
+        if (error_reporting) {
+                ret = softing_fct_cmd(card, 51, "enable_error_frame");
+                if (ret < 0)
+                        goto failed;
+        }
+        */
+        /* initialize interface */
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 2]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 4]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 6]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 8]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 10]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 12]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 14]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 16]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 18]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 20]);
+        ret = softing_fct_cmd(card, 17, "initialize_interface");
+        if (ret < 0)
+                goto failed;
+        /* enable_fifo */
+        ret = softing_fct_cmd(card, 36, "enable_fifo");
+        if (ret < 0)
+                goto failed;
+        /* enable fifo tx ack */
+        ret = softing_fct_cmd(card, 13, "fifo_tx_ack[0]");
+        if (ret < 0)
+                goto failed;
+        /* enable fifo tx ack2 */
+        ret = softing_fct_cmd(card, 14, "fifo_tx_ack[1]");
+        if (ret < 0)
+                goto failed;
+        /* start_chip */
+        ret = softing_fct_cmd(card, 11, "start_chip");
+        if (ret < 0)
+                goto failed;
+        iowrite8(0, &card->dpram[DPRAM_INFO_BUSSTATE]);
+        iowrite8(0, &card->dpram[DPRAM_INFO_BUSSTATE2]);
+        if (card->pdat->generation < 2) {
+                iowrite8(0, &card->dpram[DPRAM_V2_IRQ_TOHOST]);
+                /* flush the DPRAM caches */
+                wmb();
+        }
+        softing_initialize_timestamp(card);
+        /*
+         * do socketcan notifications/status changes
+         * from here, no errors should occur, or the failed: part
+         * must be reviewed
+         */
+        memset(&msg, 0, sizeof(msg));
+        msg.can_id = CAN_ERR_FLAG | CAN_ERR_RESTARTED;
+        msg.can_dlc = CAN_ERR_DLC;
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (!(bus_bitmask_start & (1 << j)))
+                        continue;
+                netdev = card->net[j];
+                if (!netdev)
+                        continue;
+                priv = netdev_priv(netdev);
+                priv->can.state = CAN_STATE_ERROR_ACTIVE;
+                open_candev(netdev);
+                if (dev != netdev) {
+                        /* notify other busses on the restart */
+                        softing_netdev_rx(netdev, &msg, ktime_set(0, 0));
+                        ++priv->can.can_stats.restarts;
+                }
+                netif_wake_queue(netdev);
+        }
+        /* enable interrupts */
+        ret = softing_enable_irq(card, 1);
+        if (ret)
+                goto failed;
+card_done:
+        mutex_unlock(&card->fw.lock);
+        return 0;
+invalid:
+        ret = -EINVAL;
+failed:
+        softing_enable_irq(card, 0);
+        softing_reset_chip(card);
+        mutex_unlock(&card->fw.lock);
+        /* bring all other interfaces down */
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                netdev = card->net[j];
+                if (!netdev)
+                        continue;
+                dev_close(netdev);
+        }
+        return ret;
+}
+int softing_default_output(struct net_device *netdev)
+{
+        struct softing_priv *priv = netdev_priv(netdev);
+        struct softing *card = priv->card;
+        switch (priv->chip) {
+        case 1000:
+                return (card->pdat->generation < 2) ? 0xfb : 0xfa;
+        case 5:
+                return 0x60;
+        default:
+                return 0x40;
+        }
+}
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
new file mode 100644
index 000000000000..5157e15e96eb
--- /dev/null
+++ b/drivers/net/can/softing/softing_main.c
@@ -0,0 +1,893 @@
+/*
+ * Copyright (C) 2008-2010
+ *
+ * - Kurt Van Dijck, EIA Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include "softing.h"
+#define TX_ECHO_SKB_MAX (((TXMAX+1)/2)-1)
+/*
+ * test is a specific CAN netdev
+ * is online (ie. up 'n running, not sleeping, not busoff
+ */
+static inline int canif_is_active(struct net_device *netdev)
+{
+        struct can_priv *can = netdev_priv(netdev);
+        if (!netif_running(netdev))
+                return 0;
+        return (can->state <= CAN_STATE_ERROR_PASSIVE);
+}
+/* reset DPRAM */
+static inline void softing_set_reset_dpram(struct softing *card)
+{
+        if (card->pdat->generation >= 2) {
+                spin_lock_bh(&card->spin);
+                iowrite8(ioread8(&card->dpram[DPRAM_V2_RESET]) & ~1,
+                                &card->dpram[DPRAM_V2_RESET]);
+                spin_unlock_bh(&card->spin);
+        }
+}
+static inline void softing_clr_reset_dpram(struct softing *card)
+{
+        if (card->pdat->generation >= 2) {
+                spin_lock_bh(&card->spin);
+                iowrite8(ioread8(&card->dpram[DPRAM_V2_RESET]) | 1,
+                                &card->dpram[DPRAM_V2_RESET]);
+                spin_unlock_bh(&card->spin);
+        }
+}
+/* trigger the tx queue-ing */
+static netdev_tx_t softing_netdev_start_xmit(struct sk_buff *skb,
+                struct net_device *dev)
+{
+        struct softing_priv *priv = netdev_priv(dev);
+        struct softing *card = priv->card;
+        int ret;
+        uint8_t *ptr;
+        uint8_t fifo_wr, fifo_rd;
+        struct can_frame *cf = (struct can_frame *)skb->data;
+        uint8_t buf[DPRAM_TX_SIZE];
+        if (can_dropped_invalid_skb(dev, skb))
+                return NETDEV_TX_OK;
+        spin_lock(&card->spin);
+        ret = NETDEV_TX_BUSY;
+        if (!card->fw.up ||
+                        (card->tx.pending >= TXMAX) ||
+                        (priv->tx.pending >= TX_ECHO_SKB_MAX))
+                goto xmit_done;
+        fifo_wr = ioread8(&card->dpram[DPRAM_TX_WR]);
+        fifo_rd = ioread8(&card->dpram[DPRAM_TX_RD]);
+        if (fifo_wr == fifo_rd)
+                /* fifo full */
+                goto xmit_done;
+        memset(buf, 0, sizeof(buf));
+        ptr = buf;
+        *ptr = CMD_TX;
+        if (cf->can_id & CAN_RTR_FLAG)
+                *ptr |= CMD_RTR;
+        if (cf->can_id & CAN_EFF_FLAG)
+                *ptr |= CMD_XTD;
+        if (priv->index)
+                *ptr |= CMD_BUS2;
+        ++ptr;
+        *ptr++ = cf->can_dlc;
+        *ptr++ = (cf->can_id >> 0);
+        *ptr++ = (cf->can_id >> 8);
+        if (cf->can_id & CAN_EFF_FLAG) {
+                *ptr++ = (cf->can_id >> 16);
+                *ptr++ = (cf->can_id >> 24);
+        } else {
+                /* increment 1, not 2 as you might think */
+                ptr += 1;
+        }
+        if (!(cf->can_id & CAN_RTR_FLAG))
+                memcpy(ptr, &cf->data[0], cf->can_dlc);
+        memcpy_toio(&card->dpram[DPRAM_TX + DPRAM_TX_SIZE * fifo_wr],
+                        buf, DPRAM_TX_SIZE);
+        if (++fifo_wr >= DPRAM_TX_CNT)
+                fifo_wr = 0;
+        iowrite8(fifo_wr, &card->dpram[DPRAM_TX_WR]);
+        card->tx.last_bus = priv->index;
+        ++card->tx.pending;
+        ++priv->tx.pending;
+        can_put_echo_skb(skb, dev, priv->tx.echo_put);
+        ++priv->tx.echo_put;
+        if (priv->tx.echo_put >= TX_ECHO_SKB_MAX)
+                priv->tx.echo_put = 0;
+        /* can_put_echo_skb() saves the skb, safe to return TX_OK */
+        ret = NETDEV_TX_OK;
+xmit_done:
+        spin_unlock(&card->spin);
+        if (card->tx.pending >= TXMAX) {
+                int j;
+                for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                        if (card->net[j])
+                                netif_stop_queue(card->net[j]);
+                }
+        }
+        if (ret != NETDEV_TX_OK)
+                netif_stop_queue(dev);
+        return ret;
+}
+/*
+ * shortcut for skb delivery
+ */
+int softing_netdev_rx(struct net_device *netdev, const struct can_frame *msg,
+                ktime_t ktime)
+{
+        struct sk_buff *skb;
+        struct can_frame *cf;
+        skb = alloc_can_skb(netdev, &cf);
+        if (!skb)
+                return -ENOMEM;
+        memcpy(cf, msg, sizeof(*msg));
+        skb->tstamp = ktime;
+        return netif_rx(skb);
+}
+/*
+ * softing_handle_1
+ * pop 1 entry from the DPRAM queue, and process
+ */
+static int softing_handle_1(struct softing *card)
+{
+        struct net_device *netdev;
+        struct softing_priv *priv;
+        ktime_t ktime;
+        struct can_frame msg;
+        int cnt = 0, lost_msg;
+        uint8_t fifo_rd, fifo_wr, cmd;
+        uint8_t *ptr;
+        uint32_t tmp_u32;
+        uint8_t buf[DPRAM_RX_SIZE];
+        memset(&msg, 0, sizeof(msg));
+        /* test for lost msgs */
+        lost_msg = ioread8(&card->dpram[DPRAM_RX_LOST]);
+        if (lost_msg) {
+                int j;
+                /* reset condition */
+                iowrite8(0, &card->dpram[DPRAM_RX_LOST]);
+                /* prepare msg */
+                msg.can_id = CAN_ERR_FLAG | CAN_ERR_CRTL;
+                msg.can_dlc = CAN_ERR_DLC;
+                msg.data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+                /*
+                 * service to all busses, we don't know which it was applicable
+                 * but only service busses that are online
+                 */
+                for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                        netdev = card->net[j];
+                        if (!netdev)
+                                continue;
+                        if (!canif_is_active(netdev))
+                                /* a dead bus has no overflows */
+                                continue;
+                        ++netdev->stats.rx_over_errors;
+                        softing_netdev_rx(netdev, &msg, ktime_set(0, 0));
+                }
+                /* prepare for other use */
+                memset(&msg, 0, sizeof(msg));
+                ++cnt;
+        }
+        fifo_rd = ioread8(&card->dpram[DPRAM_RX_RD]);
+        fifo_wr = ioread8(&card->dpram[DPRAM_RX_WR]);
+        if (++fifo_rd >= DPRAM_RX_CNT)
+                fifo_rd = 0;
+        if (fifo_wr == fifo_rd)
+                return cnt;
+        memcpy_fromio(buf, &card->dpram[DPRAM_RX + DPRAM_RX_SIZE*fifo_rd],
+                        DPRAM_RX_SIZE);
+        mb();
+        /* trigger dual port RAM */
+        iowrite8(fifo_rd, &card->dpram[DPRAM_RX_RD]);
+        ptr = buf;
+        cmd = *ptr++;
+        if (cmd == 0xff)
+                /* not quite usefull, probably the card has got out */
+                return 0;
+        netdev = card->net[0];
+        if (cmd & CMD_BUS2)
+                netdev = card->net[1];
+        priv = netdev_priv(netdev);
+        if (cmd & CMD_ERR) {
+                uint8_t can_state, state;
+                state = *ptr++;
+                msg.can_id = CAN_ERR_FLAG;
+                msg.can_dlc = CAN_ERR_DLC;
+                if (state & SF_MASK_BUSOFF) {
+                        can_state = CAN_STATE_BUS_OFF;
+                        msg.can_id |= CAN_ERR_BUSOFF;
+                        state = STATE_BUSOFF;
+                } else if (state & SF_MASK_EPASSIVE) {
+                        can_state = CAN_STATE_ERROR_PASSIVE;
+                        msg.can_id |= CAN_ERR_CRTL;
+                        msg.data[1] = CAN_ERR_CRTL_TX_PASSIVE;
+                        state = STATE_EPASSIVE;
+                } else {
+                        can_state = CAN_STATE_ERROR_ACTIVE;
+                        msg.can_id |= CAN_ERR_CRTL;
+                        state = STATE_EACTIVE;
+                }
+                /* update DPRAM */
+                iowrite8(state, &card->dpram[priv->index ?
+                                DPRAM_INFO_BUSSTATE2 : DPRAM_INFO_BUSSTATE]);
+                /* timestamp */
+                tmp_u32 = le32_to_cpup((void *)ptr);
+                ptr += 4;
+                ktime = softing_raw2ktime(card, tmp_u32);
+                ++netdev->stats.rx_errors;
+                /* update internal status */
+                if (can_state != priv->can.state) {
+                        priv->can.state = can_state;
+                        if (can_state == CAN_STATE_ERROR_PASSIVE)
+                                ++priv->can.can_stats.error_passive;
+                        else if (can_state == CAN_STATE_BUS_OFF) {
+                                /* this calls can_close_cleanup() */
+                                can_bus_off(netdev);
+                                netif_stop_queue(netdev);
+                        }
+                        /* trigger socketcan */
+                        softing_netdev_rx(netdev, &msg, ktime);
+                }
+        } else {
+                if (cmd & CMD_RTR)
+                        msg.can_id |= CAN_RTR_FLAG;
+                msg.can_dlc = get_can_dlc(*ptr++);
+                if (cmd & CMD_XTD) {
+                        msg.can_id |= CAN_EFF_FLAG;
+                        msg.can_id |= le32_to_cpup((void *)ptr);
+                        ptr += 4;
+                } else {
+                        msg.can_id |= le16_to_cpup((void *)ptr);
+                        ptr += 2;
+                }
+                /* timestamp */
+                tmp_u32 = le32_to_cpup((void *)ptr);
+                ptr += 4;
+                ktime = softing_raw2ktime(card, tmp_u32);
+                if (!(msg.can_id & CAN_RTR_FLAG))
+                        memcpy(&msg.data[0], ptr, 8);
+                ptr += 8;
+                /* update socket */
+                if (cmd & CMD_ACK) {
+                        /* acknowledge, was tx msg */
+                        struct sk_buff *skb;
+                        skb = priv->can.echo_skb[priv->tx.echo_get];
+                        if (skb)
+                                skb->tstamp = ktime;
+                        can_get_echo_skb(netdev, priv->tx.echo_get);
+                        ++priv->tx.echo_get;
+                        if (priv->tx.echo_get >= TX_ECHO_SKB_MAX)
+                                priv->tx.echo_get = 0;
+                        if (priv->tx.pending)
+                                --priv->tx.pending;
+                        if (card->tx.pending)
+                                --card->tx.pending;
+                        ++netdev->stats.tx_packets;
+                        if (!(msg.can_id & CAN_RTR_FLAG))
+                                netdev->stats.tx_bytes += msg.can_dlc;
+                } else {
+                        int ret;
+                        ret = softing_netdev_rx(netdev, &msg, ktime);
+                        if (ret == NET_RX_SUCCESS) {
+                                ++netdev->stats.rx_packets;
+                                if (!(msg.can_id & CAN_RTR_FLAG))
+                                        netdev->stats.rx_bytes += msg.can_dlc;
+                        } else {
+                                ++netdev->stats.rx_dropped;
+                        }
+                }
+        }
+        ++cnt;
+        return cnt;
+}
+/*
+ * real interrupt handler
+ */
+static irqreturn_t softing_irq_thread(int irq, void *dev_id)
+{
+        struct softing *card = (struct softing *)dev_id;
+        struct net_device *netdev;
+        struct softing_priv *priv;
+        int j, offset, work_done;
+        work_done = 0;
+        spin_lock_bh(&card->spin);
+        while (softing_handle_1(card) > 0) {
+                ++card->irq.svc_count;
+                ++work_done;
+        }
+        spin_unlock_bh(&card->spin);
+        /* resume tx queue's */
+        offset = card->tx.last_bus;
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (card->tx.pending >= TXMAX)
+                        break;
+                netdev = card->net[(j + offset + 1) % card->pdat->nbus];
+                if (!netdev)
+                        continue;
+                priv = netdev_priv(netdev);
+                if (!canif_is_active(netdev))
+                        /* it makes no sense to wake dead busses */
+                        continue;
+                if (priv->tx.pending >= TX_ECHO_SKB_MAX)
+                        continue;
+                ++work_done;
+                netif_wake_queue(netdev);
+        }
+        return work_done ? IRQ_HANDLED : IRQ_NONE;
+}
+/*
+ * interrupt routines:
+ * schedule the 'real interrupt handler'
+ */
+static irqreturn_t softing_irq_v2(int irq, void *dev_id)
+{
+        struct softing *card = (struct softing *)dev_id;
+        uint8_t ir;
+        ir = ioread8(&card->dpram[DPRAM_V2_IRQ_TOHOST]);
+        iowrite8(0, &card->dpram[DPRAM_V2_IRQ_TOHOST]);
+        return (1 == ir) ? IRQ_WAKE_THREAD : IRQ_NONE;
+}
+static irqreturn_t softing_irq_v1(int irq, void *dev_id)
+{
+        struct softing *card = (struct softing *)dev_id;
+        uint8_t ir;
+        ir = ioread8(&card->dpram[DPRAM_IRQ_TOHOST]);
+        iowrite8(0, &card->dpram[DPRAM_IRQ_TOHOST]);
+        return ir ? IRQ_WAKE_THREAD : IRQ_NONE;
+}
+/*
+ * netdev/candev inter-operability
+ */
+static int softing_netdev_open(struct net_device *ndev)
+{
+        int ret;
+        /* check or determine and set bittime */
+        ret = open_candev(ndev);
+        if (!ret)
+                ret = softing_startstop(ndev, 1);
+        return ret;
+}
+static int softing_netdev_stop(struct net_device *ndev)
+{
+        int ret;
+        netif_stop_queue(ndev);
+        /* softing cycle does close_candev() */
+        ret = softing_startstop(ndev, 0);
+        return ret;
+}
+static int softing_candev_set_mode(struct net_device *ndev, enum can_mode mode)
+{
+        int ret;
+        switch (mode) {
+        case CAN_MODE_START:
+                /* softing_startstop does close_candev() */
+                ret = softing_startstop(ndev, 1);
+                return ret;
+        case CAN_MODE_STOP:
+        case CAN_MODE_SLEEP:
+                return -EOPNOTSUPP;
+        }
+        return 0;
+}
+/*
+ * Softing device management helpers
+ */
+int softing_enable_irq(struct softing *card, int enable)
+{
+        int ret;
+        if (!card->irq.nr) {
+                return 0;
+        } else if (card->irq.requested && !enable) {
+                free_irq(card->irq.nr, card);
+                card->irq.requested = 0;
+        } else if (!card->irq.requested && enable) {
+                ret = request_threaded_irq(card->irq.nr,
+                                (card->pdat->generation >= 2) ?
+                                        softing_irq_v2 : softing_irq_v1,
+                                softing_irq_thread, IRQF_SHARED,
+                                dev_name(&card->pdev->dev), card);
+                if (ret) {
+                        dev_alert(&card->pdev->dev,
+                                        "request_threaded_irq(%u) failed\n",
+                                        card->irq.nr);
+                        return ret;
+                }
+                card->irq.requested = 1;
+        }
+        return 0;
+}
+static void softing_card_shutdown(struct softing *card)
+{
+        int fw_up = 0;
+        if (mutex_lock_interruptible(&card->fw.lock))
+                /* return -ERESTARTSYS */;
+        fw_up = card->fw.up;
+        card->fw.up = 0;
+        if (card->irq.requested && card->irq.nr) {
+                free_irq(card->irq.nr, card);
+                card->irq.requested = 0;
+        }
+        if (fw_up) {
+                if (card->pdat->enable_irq)
+                        card->pdat->enable_irq(card->pdev, 0);
+                softing_set_reset_dpram(card);
+                if (card->pdat->reset)
+                        card->pdat->reset(card->pdev, 1);
+        }
+        mutex_unlock(&card->fw.lock);
+}
+static __devinit int softing_card_boot(struct softing *card)
+{
+        int ret, j;
+        static const uint8_t stream[] = {
+                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, };
+        unsigned char back[sizeof(stream)];
+        if (mutex_lock_interruptible(&card->fw.lock))
+                return -ERESTARTSYS;
+        if (card->fw.up) {
+                mutex_unlock(&card->fw.lock);
+                return 0;
+        }
+        /* reset board */
+        if (card->pdat->enable_irq)
+                card->pdat->enable_irq(card->pdev, 1);
+        /* boot card */
+        softing_set_reset_dpram(card);
+        if (card->pdat->reset)
+                card->pdat->reset(card->pdev, 1);
+        for (j = 0; (j + sizeof(stream)) < card->dpram_size;
+                        j += sizeof(stream)) {
+                memcpy_toio(&card->dpram[j], stream, sizeof(stream));
+                /* flush IO cache */
+                mb();
+                memcpy_fromio(back, &card->dpram[j], sizeof(stream));
+                if (!memcmp(back, stream, sizeof(stream)))
+                        continue;
+                /* memory is not equal */
+                dev_alert(&card->pdev->dev, "dpram failed at 0x%04x\n", j);
+                ret = -EIO;
+                goto failed;
+        }
+        wmb();
+        /* load boot firmware */
+        ret = softing_load_fw(card->pdat->boot.fw, card, card->dpram,
+                                card->dpram_size,
+                                card->pdat->boot.offs - card->pdat->boot.addr);
+        if (ret < 0)
+                goto failed;
+        /* load loader firmware */
+        ret = softing_load_fw(card->pdat->load.fw, card, card->dpram,
+                                card->dpram_size,
+                                card->pdat->load.offs - card->pdat->load.addr);
+        if (ret < 0)
+                goto failed;
+        if (card->pdat->reset)
+                card->pdat->reset(card->pdev, 0);
+        softing_clr_reset_dpram(card);
+        ret = softing_bootloader_command(card, 0, "card boot");
+        if (ret < 0)
+                goto failed;
+        ret = softing_load_app_fw(card->pdat->app.fw, card);
+        if (ret < 0)
+                goto failed;
+        ret = softing_chip_poweron(card);
+        if (ret < 0)
+                goto failed;
+        card->fw.up = 1;
+        mutex_unlock(&card->fw.lock);
+        return 0;
+failed:
+        card->fw.up = 0;
+        if (card->pdat->enable_irq)
+                card->pdat->enable_irq(card->pdev, 0);
+        softing_set_reset_dpram(card);
+        if (card->pdat->reset)
+                card->pdat->reset(card->pdev, 1);
+        mutex_unlock(&card->fw.lock);
+        return ret;
+}
+/*
+ * netdev sysfs
+ */
+static ssize_t show_channel(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+        return sprintf(buf, "%i\n", priv->index);
+}
+static ssize_t show_chip(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+        return sprintf(buf, "%i\n", priv->chip);
+}
+static ssize_t show_output(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+        return sprintf(buf, "0x%02x\n", priv->output);
+}
+static ssize_t store_output(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+        struct softing *card = priv->card;
+        unsigned long val;
+        int ret;
+        ret = strict_strtoul(buf, 0, &val);
+        if (ret < 0)
+                return ret;
+        val &= 0xFF;
+        ret = mutex_lock_interruptible(&card->fw.lock);
+        if (ret)
+                return -ERESTARTSYS;
+        if (netif_running(ndev)) {
+                mutex_unlock(&card->fw.lock);
+                return -EBUSY;
+        }
+        priv->output = val;
+        mutex_unlock(&card->fw.lock);
+        return count;
+}
+static const DEVICE_ATTR(channel, S_IRUGO, show_channel, NULL);
+static const DEVICE_ATTR(chip, S_IRUGO, show_chip, NULL);
+static const DEVICE_ATTR(output, S_IRUGO | S_IWUSR, show_output, store_output);
+static const struct attribute *const netdev_sysfs_attrs[] = {
+        &dev_attr_channel.attr,
+        &dev_attr_chip.attr,
+        &dev_attr_output.attr,
+        NULL,
+};
+static const struct attribute_group netdev_sysfs_group = {
+        .name = NULL,
+        .attrs = (struct attribute **)netdev_sysfs_attrs,
+};
+static const struct net_device_ops softing_netdev_ops = {
+        .ndo_open = softing_netdev_open,
+        .ndo_stop = softing_netdev_stop,
+        .ndo_start_xmit = softing_netdev_start_xmit,
+};
+static const struct can_bittiming_const softing_btr_const = {
+        .tseg1_min = 1,
+        .tseg1_max = 16,
+        .tseg2_min = 1,
+        .tseg2_max = 8,
+        .sjw_max = 4, /* overruled */
+        .brp_min = 1,
+        .brp_max = 32, /* overruled */
+        .brp_inc = 1,
+};
+static __devinit struct net_device *softing_netdev_create(struct softing *card,
+                uint16_t chip_id)
+{
+        struct net_device *netdev;
+        struct softing_priv *priv;
+        netdev = alloc_candev(sizeof(*priv), TX_ECHO_SKB_MAX);
+        if (!netdev) {
+                dev_alert(&card->pdev->dev, "alloc_candev failed\n");
+                return NULL;
+        }
+        priv = netdev_priv(netdev);
+        priv->netdev = netdev;
+        priv->card = card;
+        memcpy(&priv->btr_const, &softing_btr_const, sizeof(priv->btr_const));
+        priv->btr_const.brp_max = card->pdat->max_brp;
+        priv->btr_const.sjw_max = card->pdat->max_sjw;
+        priv->can.bittiming_const = &priv->btr_const;
+        priv->can.clock.freq = 8000000;
+        priv->chip = chip_id;
+        priv->output = softing_default_output(netdev);
+        SET_NETDEV_DEV(netdev, &card->pdev->dev);
+        netdev->flags |= IFF_ECHO;
+        netdev->netdev_ops = &softing_netdev_ops;
+        priv->can.do_set_mode = softing_candev_set_mode;
+        priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
+        return netdev;
+}
+static __devinit int softing_netdev_register(struct net_device *netdev)
+{
+        int ret;
+        netdev->sysfs_groups[0] = &netdev_sysfs_group;
+        ret = register_candev(netdev);
+        if (ret) {
+                dev_alert(&netdev->dev, "register failed\n");
+                return ret;
+        }
+        return 0;
+}
+static void softing_netdev_cleanup(struct net_device *netdev)
+{
+        unregister_candev(netdev);
+        free_candev(netdev);
+}
+/*
+ * sysfs for Platform device
+ */
+#define DEV_ATTR_RO(name, member) \
+static ssize_t show_##name(struct device *dev, \
+                struct device_attribute *attr, char *buf) \
+{ \
+        struct softing *card = platform_get_drvdata(to_platform_device(dev)); \
+        return sprintf(buf, "%u\n", card->member); \
+} \
+static DEVICE_ATTR(name, 0444, show_##name, NULL)
+#define DEV_ATTR_RO_STR(name, member) \
+static ssize_t show_##name(struct device *dev, \
+                struct device_attribute *attr, char *buf) \
+{ \
+        struct softing *card = platform_get_drvdata(to_platform_device(dev)); \
+        return sprintf(buf, "%s\n", card->member); \
+} \
+static DEVICE_ATTR(name, 0444, show_##name, NULL)
+DEV_ATTR_RO(serial, id.serial);
+DEV_ATTR_RO_STR(firmware, pdat->app.fw);
+DEV_ATTR_RO(firmware_version, id.fw_version);
+DEV_ATTR_RO_STR(hardware, pdat->name);
+DEV_ATTR_RO(hardware_version, id.hw_version);
+DEV_ATTR_RO(license, id.license);
+DEV_ATTR_RO(frequency, id.freq);
+DEV_ATTR_RO(txpending, tx.pending);
+static struct attribute *softing_pdev_attrs[] = {
+        &dev_attr_serial.attr,
+        &dev_attr_firmware.attr,
+        &dev_attr_firmware_version.attr,
+        &dev_attr_hardware.attr,
+        &dev_attr_hardware_version.attr,
+        &dev_attr_license.attr,
+        &dev_attr_frequency.attr,
+        &dev_attr_txpending.attr,
+        NULL,
+};
+static const struct attribute_group softing_pdev_group = {
+        .name = NULL,
+        .attrs = softing_pdev_attrs,
+};
+/*
+ * platform driver
+ */
+static __devexit int softing_pdev_remove(struct platform_device *pdev)
+{
+        struct softing *card = platform_get_drvdata(pdev);
+        int j;
+        /* first, disable card*/
+        softing_card_shutdown(card);
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (!card->net[j])
+                        continue;
+                softing_netdev_cleanup(card->net[j]);
+                card->net[j] = NULL;
+        }
+        sysfs_remove_group(&pdev->dev.kobj, &softing_pdev_group);
+        iounmap(card->dpram);
+        kfree(card);
+        return 0;
+}
+static __devinit int softing_pdev_probe(struct platform_device *pdev)
+{
+        const struct softing_platform_data *pdat = pdev->dev.platform_data;
+        struct softing *card;
+        struct net_device *netdev;
+        struct softing_priv *priv;
+        struct resource *pres;
+        int ret;
+        int j;
+        if (!pdat) {
+                dev_warn(&pdev->dev, "no platform data\n");
+                return -EINVAL;
+        }
+        if (pdat->nbus > ARRAY_SIZE(card->net)) {
+                dev_warn(&pdev->dev, "%u nets??\n", pdat->nbus);
+                return -EINVAL;
+        }
+        card = kzalloc(sizeof(*card), GFP_KERNEL);
+        if (!card)
+                return -ENOMEM;
+        card->pdat = pdat;
+        card->pdev = pdev;
+        platform_set_drvdata(pdev, card);
+        mutex_init(&card->fw.lock);
+        spin_lock_init(&card->spin);
+        ret = -EINVAL;
+        pres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!pres)
+                goto platform_resource_failed;;
+        card->dpram_phys = pres->start;
+        card->dpram_size = pres->end - pres->start + 1;
+        card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);
+        if (!card->dpram) {
+                dev_alert(&card->pdev->dev, "dpram ioremap failed\n");
+                goto ioremap_failed;
+        }
+        pres = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (pres)
+                card->irq.nr = pres->start;
+        /* reset card */
+        ret = softing_card_boot(card);
+        if (ret < 0) {
+                dev_alert(&pdev->dev, "failed to boot\n");
+                goto boot_failed;
+        }
+        /* only now, the chip's are known */
+        card->id.freq = card->pdat->freq;
+        ret = sysfs_create_group(&pdev->dev.kobj, &softing_pdev_group);
+        if (ret < 0) {
+                dev_alert(&card->pdev->dev, "sysfs failed\n");
+                goto sysfs_failed;
+        }
+        ret = -ENOMEM;
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                card->net[j] = netdev =
+                        softing_netdev_create(card, card->id.chip[j]);
+                if (!netdev) {
+                        dev_alert(&pdev->dev, "failed to make can[%i]", j);
+                        goto netdev_failed;
+                }
+                priv = netdev_priv(card->net[j]);
+                priv->index = j;
+                ret = softing_netdev_register(netdev);
+                if (ret) {
+                        free_candev(netdev);
+                        card->net[j] = NULL;
+                        dev_alert(&card->pdev->dev,
+                                        "failed to register can[%i]\n", j);
+                        goto netdev_failed;
+                }
+        }
+        dev_info(&card->pdev->dev, "%s ready.\n", card->pdat->name);
+        return 0;
+netdev_failed:
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (!card->net[j])
+                        continue;
+                softing_netdev_cleanup(card->net[j]);
+        }
+        sysfs_remove_group(&pdev->dev.kobj, &softing_pdev_group);
+sysfs_failed:
+        softing_card_shutdown(card);
+boot_failed:
+        iounmap(card->dpram);
+ioremap_failed:
+platform_resource_failed:
+        kfree(card);
+        return ret;
+}
+static struct platform_driver softing_driver = {
+        .driver = {
+                .name = "softing",
+                .owner = THIS_MODULE,
+        },
+        .probe = softing_pdev_probe,
+        .remove = __devexit_p(softing_pdev_remove),
+};
+MODULE_ALIAS("platform:softing");
+static int __init softing_start(void)
+{
+        return platform_driver_register(&softing_driver);
+}
+static void __exit softing_stop(void)
+{
+        platform_driver_unregister(&softing_driver);
+}
+module_init(softing_start);
+module_exit(softing_stop);
+MODULE_DESCRIPTION("Softing DPRAM CAN driver");
+MODULE_AUTHOR("Kurt Van Dijck <kurt.van.dijck@eia.be>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/can/softing/softing_platform.h b/drivers/net/can/softing/softing_platform.h
new file mode 100644
index 000000000000..ebbf69815623
--- /dev/null
+++ b/drivers/net/can/softing/softing_platform.h
@@ -0,0 +1,40 @@
+#include <linux/platform_device.h>
+#ifndef _SOFTING_DEVICE_H_
+#define _SOFTING_DEVICE_H_
+/* softing firmware directory prefix */
+#define fw_dir "softing-4.6/"
+struct softing_platform_data {
+        unsigned int manf;
+        unsigned int prod;
+        /*
+         * generation
+         * 1st with NEC or SJA1000
+         * 8bit, exclusive interrupt, ...
+         * 2nd only SJA1000
+         * 16bit, shared interrupt
+         */
+        int generation;
+        int nbus; /* # busses on device */
+        unsigned int freq; /* operating frequency in Hz */
+        unsigned int max_brp;
+        unsigned int max_sjw;
+        unsigned long dpram_size;
+        const char *name;
+        struct {
+                unsigned long offs;
+                unsigned long addr;
+                const char *fw;
+        } boot, load, app;
+        /*
+         * reset() function
+         * bring pdev in or out of reset, depending on value
+         */
+        int (*reset)(struct platform_device *pdev, int value);
+        int (*enable_irq)(struct platform_device *pdev, int value);
+};
+#endif
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 263a2944566f..2d2d28f58e91 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -65,7 +65,14 @@ static LIST_HEAD(cnic_udev_list);
 static DEFINE_RWLOCK(cnic_dev_lock);
 static DEFINE_MUTEX(cnic_lock);
-static struct cnic_ulp_ops *cnic_ulp_tbl[MAX_CNIC_ULP_TYPE];
+static struct cnic_ulp_ops __rcu *cnic_ulp_tbl[MAX_CNIC_ULP_TYPE];
+/* helper function, assuming cnic_lock is held */
+static inline struct cnic_ulp_ops *cnic_ulp_tbl_prot(int type)
+{
+        return rcu_dereference_protected(cnic_ulp_tbl[type],
+                                         lockdep_is_held(&cnic_lock));
+}
 static int cnic_service_bnx2(void *, void *);
 static int cnic_service_bnx2x(void *, void *);
@@ -435,7 +442,7 @@ int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops)
                return -EINVAL;
        }
        mutex_lock(&cnic_lock);
-        if (cnic_ulp_tbl[ulp_type]) {
+        if (cnic_ulp_tbl_prot(ulp_type)) {
                pr_err("%s: Type %d has already been registered\n",
                       __func__, ulp_type);
                mutex_unlock(&cnic_lock);
@@ -478,7 +485,7 @@ int cnic_unregister_driver(int ulp_type)
                return -EINVAL;
        }
        mutex_lock(&cnic_lock);
-        ulp_ops = cnic_ulp_tbl[ulp_type];
+        ulp_ops = cnic_ulp_tbl_prot(ulp_type);
        if (!ulp_ops) {
                pr_err("%s: Type %d has not been registered\n",
                       __func__, ulp_type);
@@ -529,7 +536,7 @@ static int cnic_register_device(struct cnic_dev *dev, int ulp_type,
                return -EINVAL;
        }
        mutex_lock(&cnic_lock);
-        if (cnic_ulp_tbl[ulp_type] == NULL) {
+        if (cnic_ulp_tbl_prot(ulp_type) == NULL) {
                pr_err("%s: Driver with type %d has not been registered\n",
                       __func__, ulp_type);
                mutex_unlock(&cnic_lock);
@@ -544,7 +551,7 @@ static int cnic_register_device(struct cnic_dev *dev, int ulp_type,
        clear_bit(ULP_F_START, &cp->ulp_flags[ulp_type]);
        cp->ulp_handle[ulp_type] = ulp_ctx;
-        ulp_ops = cnic_ulp_tbl[ulp_type];
+        ulp_ops = cnic_ulp_tbl_prot(ulp_type);
        rcu_assign_pointer(cp->ulp_ops[ulp_type], ulp_ops);
        cnic_hold(dev);
@@ -699,13 +706,13 @@ static void cnic_free_dma(struct cnic_dev *dev, struct cnic_dma *dma)
 static void cnic_setup_page_tbl(struct cnic_dev *dev, struct cnic_dma *dma)
 {
        int i;
-        u32 *page_table = dma->pgtbl;
+        __le32 *page_table = (__le32 *) dma->pgtbl;
        for (i = 0; i < dma->num_pages; i++) {
                /* Each entry needs to be in big endian format. */
-                *page_table = (u32) ((u64) dma->pg_map_arr[i] >> 32);
+                *page_table = cpu_to_le32((u64) dma->pg_map_arr[i] >> 32);
                page_table++;
-                *page_table = (u32) dma->pg_map_arr[i];
+                *page_table = cpu_to_le32(dma->pg_map_arr[i] & 0xffffffff);
                page_table++;
        }
 }
@@ -713,13 +720,13 @@ static void cnic_setup_page_tbl(struct cnic_dev *dev, struct cnic_dma *dma)
 static void cnic_setup_page_tbl_le(struct cnic_dev *dev, struct cnic_dma *dma)
 {
        int i;
-        u32 *page_table = dma->pgtbl;
+        __le32 *page_table = (__le32 *) dma->pgtbl;
        for (i = 0; i < dma->num_pages; i++) {
                /* Each entry needs to be in little endian format. */
-                *page_table = dma->pg_map_arr[i] & 0xffffffff;
+                *page_table = cpu_to_le32(dma->pg_map_arr[i] & 0xffffffff);
                page_table++;
-                *page_table = (u32) ((u64) dma->pg_map_arr[i] >> 32);
+                *page_table = cpu_to_le32((u64) dma->pg_map_arr[i] >> 32);
                page_table++;
        }
 }
@@ -2953,7 +2960,8 @@ static void cnic_ulp_stop(struct cnic_dev *dev)
                struct cnic_ulp_ops *ulp_ops;
                mutex_lock(&cnic_lock);
-                ulp_ops = cp->ulp_ops[if_type];
+                ulp_ops = rcu_dereference_protected(cp->ulp_ops[if_type],
+                                                    lockdep_is_held(&cnic_lock));
                if (!ulp_ops) {
                        mutex_unlock(&cnic_lock);
                        continue;
@@ -2977,7 +2985,8 @@ static void cnic_ulp_start(struct cnic_dev *dev)
                struct cnic_ulp_ops *ulp_ops;
                mutex_lock(&cnic_lock);
-                ulp_ops = cp->ulp_ops[if_type];
+                ulp_ops = rcu_dereference_protected(cp->ulp_ops[if_type],
+                                                    lockdep_is_held(&cnic_lock));
                if (!ulp_ops || !ulp_ops->cnic_start) {
                        mutex_unlock(&cnic_lock);
                        continue;
@@ -3041,7 +3050,7 @@ static void cnic_ulp_init(struct cnic_dev *dev)
                struct cnic_ulp_ops *ulp_ops;
                mutex_lock(&cnic_lock);
-                ulp_ops = cnic_ulp_tbl[i];
+                ulp_ops = cnic_ulp_tbl_prot(i);
                if (!ulp_ops || !ulp_ops->cnic_init) {
                        mutex_unlock(&cnic_lock);
                        continue;
@@ -3065,7 +3074,7 @@ static void cnic_ulp_exit(struct cnic_dev *dev)
                struct cnic_ulp_ops *ulp_ops;
                mutex_lock(&cnic_lock);
-                ulp_ops = cnic_ulp_tbl[i];
+                ulp_ops = cnic_ulp_tbl_prot(i);
                if (!ulp_ops || !ulp_ops->cnic_exit) {
                        mutex_unlock(&cnic_lock);
                        continue;
@@ -4170,6 +4179,14 @@ static void cnic_enable_bnx2_int(struct cnic_dev *dev)
                BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | cp->last_status_idx);
 }
+static void cnic_get_bnx2_iscsi_info(struct cnic_dev *dev)
+{
+        u32 max_conn;
+        max_conn = cnic_reg_rd_ind(dev, BNX2_FW_MAX_ISCSI_CONN);
+        dev->max_iscsi_conn = max_conn;
+}
 static void cnic_disable_bnx2_int_sync(struct cnic_dev *dev)
 {
        struct cnic_local *cp = dev->cnic_priv;
@@ -4494,6 +4511,8 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
                return err;
        }
+        cnic_get_bnx2_iscsi_info(dev);
        return 0;
 }
@@ -4705,129 +4724,6 @@ static void cnic_init_bnx2x_rx_ring(struct cnic_dev *dev,
        cp->rx_cons = *cp->rx_cons_ptr;
 }
-static int cnic_read_bnx2x_iscsi_mac(struct cnic_dev *dev, u32 upper_addr,
-                                     u32 lower_addr)
-{
-        u32 val;
-        u8 mac[6];
-        val = CNIC_RD(dev, upper_addr);
-        mac[0] = (u8) (val >> 8);
-        mac[1] = (u8) val;
-        val = CNIC_RD(dev, lower_addr);
-        mac[2] = (u8) (val >> 24);
-        mac[3] = (u8) (val >> 16);
-        mac[4] = (u8) (val >> 8);
-        mac[5] = (u8) val;
-        if (is_valid_ether_addr(mac)) {
-                memcpy(dev->mac_addr, mac, 6);
-                return 0;
-        } else {
-                return -EINVAL;
-        }
-}
-static void cnic_get_bnx2x_iscsi_info(struct cnic_dev *dev)
-{
-        struct cnic_local *cp = dev->cnic_priv;
-        u32 base, base2, addr, addr1, val;
-        int port = CNIC_PORT(cp);
-        dev->max_iscsi_conn = 0;
-        base = CNIC_RD(dev, MISC_REG_SHARED_MEM_ADDR);
-        if (base == 0)
-                return;
-        base2 = CNIC_RD(dev, (CNIC_PATH(cp) ? MISC_REG_GENERIC_CR_1 :
-                                              MISC_REG_GENERIC_CR_0));
-        addr = BNX2X_SHMEM_ADDR(base,
-                dev_info.port_hw_config[port].iscsi_mac_upper);
-        addr1 = BNX2X_SHMEM_ADDR(base,
-                dev_info.port_hw_config[port].iscsi_mac_lower);
-        cnic_read_bnx2x_iscsi_mac(dev, addr, addr1);
-        addr = BNX2X_SHMEM_ADDR(base, validity_map[port]);
-        val = CNIC_RD(dev, addr);
-        if (!(val & SHR_MEM_VALIDITY_LIC_NO_KEY_IN_EFFECT)) {
-                u16 val16;
-                addr = BNX2X_SHMEM_ADDR(base,
-                                drv_lic_key[port].max_iscsi_init_conn);
-                val16 = CNIC_RD16(dev, addr);
-                if (val16)
-                        val16 ^= 0x1e1e;
-                dev->max_iscsi_conn = val16;
-        }
-        if (BNX2X_CHIP_IS_E2(cp->chip_id))
-                dev->max_fcoe_conn = BNX2X_FCOE_NUM_CONNECTIONS;
-        if (BNX2X_CHIP_IS_E1H(cp->chip_id) || BNX2X_CHIP_IS_E2(cp->chip_id)) {
-                int func = CNIC_FUNC(cp);
-                u32 mf_cfg_addr;
-                if (BNX2X_SHMEM2_HAS(base2, mf_cfg_addr))
-                        mf_cfg_addr = CNIC_RD(dev, BNX2X_SHMEM2_ADDR(base2,
-                                              mf_cfg_addr));
-                else
-                        mf_cfg_addr = base + BNX2X_SHMEM_MF_BLK_OFFSET;
-                if (BNX2X_CHIP_IS_E2(cp->chip_id)) {
-                        /* Must determine if the MF is SD vs SI mode */
-                        addr = BNX2X_SHMEM_ADDR(base,
-                                        dev_info.shared_feature_config.config);
-                        val = CNIC_RD(dev, addr);
-                        if ((val & SHARED_FEAT_CFG_FORCE_SF_MODE_MASK) ==
-                            SHARED_FEAT_CFG_FORCE_SF_MODE_SWITCH_INDEPT) {
-                                int rc;
-                                /* MULTI_FUNCTION_SI mode */
-                                addr = BNX2X_MF_CFG_ADDR(mf_cfg_addr,
-                                        func_ext_config[func].func_cfg);
-                                val = CNIC_RD(dev, addr);
-                                if (!(val & MACP_FUNC_CFG_FLAGS_ISCSI_OFFLOAD))
-                                        dev->max_iscsi_conn = 0;
-                                if (!(val & MACP_FUNC_CFG_FLAGS_FCOE_OFFLOAD))
-                                        dev->max_fcoe_conn = 0;
-                                addr = BNX2X_MF_CFG_ADDR(mf_cfg_addr,
-                                        func_ext_config[func].
-                                        iscsi_mac_addr_upper);
-                                addr1 = BNX2X_MF_CFG_ADDR(mf_cfg_addr,
-                                        func_ext_config[func].
-                                        iscsi_mac_addr_lower);
-                                rc = cnic_read_bnx2x_iscsi_mac(dev, addr,
-                                                                addr1);
-                                if (rc && func > 1)
-                                        dev->max_iscsi_conn = 0;
-                                return;
-                        }
-                }
-                addr = BNX2X_MF_CFG_ADDR(mf_cfg_addr,
-                        func_mf_config[func].e1hov_tag);
-                val = CNIC_RD(dev, addr);
-                val &= FUNC_MF_CFG_E1HOV_TAG_MASK;
-                if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) {
-                        dev->max_fcoe_conn = 0;
-                        dev->max_iscsi_conn = 0;
-                }
-        }
-        if (!is_valid_ether_addr(dev->mac_addr))
-                dev->max_iscsi_conn = 0;
-}
 static void cnic_init_bnx2x_kcq(struct cnic_dev *dev)
 {
        struct cnic_local *cp = dev->cnic_priv;
@@ -4909,8 +4805,6 @@ static int cnic_start_bnx2x_hw(struct cnic_dev *dev)
        cnic_init_bnx2x_kcq(dev);
-        cnic_get_bnx2x_iscsi_info(dev);
        /* Only 1 EQ */
        CNIC_WR16(dev, cp->kcq1.io_addr, MAX_KCQ_IDX);
        CNIC_WR(dev, BAR_CSTRORM_INTMEM +
@@ -5343,6 +5237,14 @@ static struct cnic_dev *init_bnx2x_cnic(struct net_device *dev)
        cdev->pcidev = pdev;
        cp->chip_id = ethdev->chip_id;
+        if (!(ethdev->drv_state & CNIC_DRV_STATE_NO_ISCSI))
+                cdev->max_iscsi_conn = ethdev->max_iscsi_conn;
+        if (BNX2X_CHIP_IS_E2(cp->chip_id) &&
+            !(ethdev->drv_state & CNIC_DRV_STATE_NO_FCOE))
+                cdev->max_fcoe_conn = ethdev->max_fcoe_conn;
+        memcpy(cdev->mac_addr, ethdev->iscsi_mac, 6);
        cp->cnic_ops = &cnic_bnx2x_ops;
        cp->start_hw = cnic_start_bnx2x_hw;
        cp->stop_hw = cnic_stop_bnx2x_hw;
diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h
index b328f6c924c3..4456260c653c 100644
--- a/drivers/net/cnic.h
+++ b/drivers/net/cnic.h
@@ -220,7 +220,7 @@ struct cnic_local {
 #define ULP_F_INIT      0
 #define ULP_F_START     1
 #define ULP_F_CALL_PENDING      2
-        struct cnic_ulp_ops *ulp_ops[MAX_CNIC_ULP_TYPE];
+        struct cnic_ulp_ops __rcu *ulp_ops[MAX_CNIC_ULP_TYPE];
        unsigned long cnic_local_flags;
 #define CNIC_LCL_FL_KWQ_INIT            0x0
diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index 9f44e0ffe003..e01b49ee3591 100644
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/cnic_if.h
@@ -12,8 +12,8 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
-#define CNIC_MODULE_VERSION     "2.2.12"
+#define CNIC_MODULE_VERSION     "2.2.13"
-#define CNIC_MODULE_RELDATE     "Jan 03, 2011"
+#define CNIC_MODULE_RELDATE     "Jan 31, 2011"
 #define CNIC_ULP_RDMA           0
 #define CNIC_ULP_ISCSI          1
@@ -159,6 +159,9 @@ struct cnic_eth_dev {
        u32             drv_state;
 #define CNIC_DRV_STATE_REGD             0x00000001
 #define CNIC_DRV_STATE_USING_MSIX       0x00000002
+#define CNIC_DRV_STATE_NO_ISCSI_OOO     0x00000004
+#define CNIC_DRV_STATE_NO_ISCSI         0x00000008
+#define CNIC_DRV_STATE_NO_FCOE          0x00000010
        u32             chip_id;
        u32             max_kwqe_pending;
        struct pci_dev  *pdev;
@@ -176,6 +179,7 @@ struct cnic_eth_dev {
        u32             fcoe_init_cid;
        u16             iscsi_l2_client_id;
        u16             iscsi_l2_cid;
+        u8              iscsi_mac[ETH_ALEN];
        int             num_irq;
        struct cnic_irq irq_arr[MAX_CNIC_VEC];
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index ef02aa68c926..862804f32b6e 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -186,9 +186,10 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter,
                                dev = NULL;
                                if (grp)
                                        dev = vlan_group_get_device(grp, vlan);
-                        } else
+                        } else if (netif_is_bond_slave(dev)) {
                                while (dev->master)
                                        dev = dev->master;
+                        }
                        return dev;
                }
        }
@@ -967,8 +968,6 @@ static int nb_callback(struct notifier_block *self, unsigned long event,
                cxgb_neigh_update((struct neighbour *)ctx);
                break;
        }
-        case (NETEVENT_PMTU_UPDATE):
-                break;
        case (NETEVENT_REDIRECT):{
                struct netevent_redirect *nr = ctx;
                cxgb_redirect(nr->old, nr->new);
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index 059c1eec8c3f..5352c8a23f4d 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -2471,7 +2471,6 @@ static int netevent_cb(struct notifier_block *nb, unsigned long event,
        case NETEVENT_NEIGH_UPDATE:
                check_neigh_update(data);
                break;
-        case NETEVENT_PMTU_UPDATE:
        case NETEVENT_REDIRECT:
        default:
                break;
@@ -2710,6 +2709,8 @@ static int cxgb_open(struct net_device *dev)
        struct port_info *pi = netdev_priv(dev);
        struct adapter *adapter = pi->adapter;
+        netif_carrier_off(dev);
        if (!(adapter->flags & FULL_INIT_DONE)) {
                err = cxgb_up(adapter);
                if (err < 0)
@@ -3661,7 +3662,6 @@ static int __devinit init_one(struct pci_dev *pdev,
                pi->xact_addr_filt = -1;
                pi->rx_offload = RX_CSO;
                pi->port_id = i;
-                netif_carrier_off(netdev);
                netdev->irq = pdev->irq;
                netdev->features |= NETIF_F_SG | TSO_FLAGS;
diff --git a/drivers/net/cxgb4vf/cxgb4vf_main.c b/drivers/net/cxgb4vf/cxgb4vf_main.c
index 56166ae2059f..6aad64df4dcb 100644
--- a/drivers/net/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/cxgb4vf/cxgb4vf_main.c
@@ -2040,7 +2040,7 @@ static int __devinit setup_debugfs(struct adapter *adapter)
 {
        int i;
-        BUG_ON(adapter->debugfs_root == NULL);
+        BUG_ON(IS_ERR_OR_NULL(adapter->debugfs_root));
        /*
         * Debugfs support is best effort.
@@ -2061,7 +2061,7 @@ static int __devinit setup_debugfs(struct adapter *adapter)
 */
 static void cleanup_debugfs(struct adapter *adapter)
 {
-        BUG_ON(adapter->debugfs_root == NULL);
+        BUG_ON(IS_ERR_OR_NULL(adapter->debugfs_root));
        /*
         * Unlike our sister routine cleanup_proc(), we don't need to remove
@@ -2489,17 +2489,6 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
        struct net_device *netdev;
        /*
-         * Vet our module parameters.
-         */
-        if (msi != MSI_MSIX && msi != MSI_MSI) {
-                dev_err(&pdev->dev, "bad module parameter msi=%d; must be %d"
-                        " (MSI-X or MSI) or %d (MSI)\n", msi, MSI_MSIX,
-                        MSI_MSI);
-                err = -EINVAL;
-                goto err_out;
-        }
-        /*
         * Print our driver banner the first time we're called to initialize a
         * device.
         */
@@ -2711,11 +2700,11 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
        /*
         * Set up our debugfs entries.
         */
-        if (cxgb4vf_debugfs_root) {
+        if (!IS_ERR_OR_NULL(cxgb4vf_debugfs_root)) {
                adapter->debugfs_root =
                        debugfs_create_dir(pci_name(pdev),
                                           cxgb4vf_debugfs_root);
-                if (adapter->debugfs_root == NULL)
+                if (IS_ERR_OR_NULL(adapter->debugfs_root))
                        dev_warn(&pdev->dev, "could not create debugfs"
                                 " directory");
                else
@@ -2770,7 +2759,7 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
         */
 err_free_debugfs:
-        if (adapter->debugfs_root) {
+        if (!IS_ERR_OR_NULL(adapter->debugfs_root)) {
                cleanup_debugfs(adapter);
                debugfs_remove_recursive(adapter->debugfs_root);
        }
@@ -2802,7 +2791,6 @@ err_release_regions:
 err_disable_device:
        pci_disable_device(pdev);
-err_out:
        return err;
 }
@@ -2840,7 +2828,7 @@ static void __devexit cxgb4vf_pci_remove(struct pci_dev *pdev)
                /*
                 * Tear down our debugfs entries.
                 */
-                if (adapter->debugfs_root) {
+                if (!IS_ERR_OR_NULL(adapter->debugfs_root)) {
                        cleanup_debugfs(adapter);
                        debugfs_remove_recursive(adapter->debugfs_root);
                }
@@ -2874,6 +2862,46 @@ static void __devexit cxgb4vf_pci_remove(struct pci_dev *pdev)
 }
 /*
+ * "Shutdown" quiesce the device, stopping Ingress Packet and Interrupt
+ * delivery.
+ */
+static void __devexit cxgb4vf_pci_shutdown(struct pci_dev *pdev)
+{
+        struct adapter *adapter;
+        int pidx;
+        adapter = pci_get_drvdata(pdev);
+        if (!adapter)
+                return;
+        /*
+         * Disable all Virtual Interfaces.  This will shut down the
+         * delivery of all ingress packets into the chip for these
+         * Virtual Interfaces.
+         */
+        for_each_port(adapter, pidx) {
+                struct net_device *netdev;
+                struct port_info *pi;
+                if (!test_bit(pidx, &adapter->registered_device_map))
+                        continue;
+                netdev = adapter->port[pidx];
+                if (!netdev)
+                        continue;
+                pi = netdev_priv(netdev);
+                t4vf_enable_vi(adapter, pi->viid, false, false);
+        }
+        /*
+         * Free up all Queues which will prevent further DMA and
+         * Interrupts allowing various internal pathways to drain.
+         */
+        t4vf_free_sge_resources(adapter);
+}
+/*
 * PCI Device registration data structures.
 */
 #define CH_DEVICE(devid, idx) \
@@ -2906,6 +2934,7 @@ static struct pci_driver cxgb4vf_driver = {
        .id_table       = cxgb4vf_pci_tbl,
        .probe          = cxgb4vf_pci_probe,
        .remove         = __devexit_p(cxgb4vf_pci_remove),
+        .shutdown       = __devexit_p(cxgb4vf_pci_shutdown),
 };
 /*
@@ -2915,14 +2944,25 @@ static int __init cxgb4vf_module_init(void)
 {
        int ret;
+        /*
+         * Vet our module parameters.
+         */
+        if (msi != MSI_MSIX && msi != MSI_MSI) {
+                printk(KERN_WARNING KBUILD_MODNAME
+                       ": bad module parameter msi=%d; must be %d"
+                       " (MSI-X or MSI) or %d (MSI)\n",
+                       msi, MSI_MSIX, MSI_MSI);
+                return -EINVAL;
+        }
        /* Debugfs support is optional, just warn if this fails */
        cxgb4vf_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);
-        if (!cxgb4vf_debugfs_root)
+        if (IS_ERR_OR_NULL(cxgb4vf_debugfs_root))
                printk(KERN_WARNING KBUILD_MODNAME ": could not create"
                       " debugfs entry, continuing\n");
        ret = pci_register_driver(&cxgb4vf_driver);
-        if (ret < 0)
+        if (ret < 0 && !IS_ERR_OR_NULL(cxgb4vf_debugfs_root))
                debugfs_remove(cxgb4vf_debugfs_root);
        return ret;
 }
diff --git a/drivers/net/cxgb4vf/t4vf_hw.c b/drivers/net/cxgb4vf/t4vf_hw.c
index 0f51c80475ce..192db226ec7f 100644
--- a/drivers/net/cxgb4vf/t4vf_hw.c
+++ b/drivers/net/cxgb4vf/t4vf_hw.c
@@ -171,7 +171,7 @@ int t4vf_wr_mbox_core(struct adapter *adapter, const void *cmd, int size,
        delay_idx = 0;
        ms = delay[0];
-        for (i = 0; i < 500; i += ms) {
+        for (i = 0; i < FW_CMD_MAX_TIMEOUT; i += ms) {
                if (sleep_ok) {
                        ms = delay[delay_idx];
                        if (delay_idx < ARRAY_SIZE(delay) - 1)
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 1b48b68ad4fd..8b0084d17c8c 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -1094,7 +1094,7 @@ static int depca_rx(struct net_device *dev)
                                }
                        }
                        /* Change buffer ownership for this last frame, back to the adapter */
-                        for (; lp->rx_old != entry; lp->rx_old = (++lp->rx_old) & lp->rxRingMask) {
+                        for (; lp->rx_old != entry; lp->rx_old = (lp->rx_old + 1) & lp->rxRingMask) {
                                writel(readl(&lp->rx_ring[lp->rx_old].base) | R_OWN, &lp->rx_ring[lp->rx_old].base);
                        }
                        writel(readl(&lp->rx_ring[entry].base) | R_OWN, &lp->rx_ring[entry].base);
@@ -1103,7 +1103,7 @@ static int depca_rx(struct net_device *dev)
                /*
                   ** Update entry information
                 */
-                lp->rx_new = (++lp->rx_new) & lp->rxRingMask;
+                lp->rx_new = (lp->rx_new + 1) & lp->rxRingMask;
        }
        return 0;
@@ -1148,7 +1148,7 @@ static int depca_tx(struct net_device *dev)
                }
                /* Update all the pointers */
-                lp->tx_old = (++lp->tx_old) & lp->txRingMask;
+                lp->tx_old = (lp->tx_old + 1) & lp->txRingMask;
        }
        return 0;
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index e1a8216ff692..c05db6046050 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -1753,8 +1753,6 @@ rio_close (struct net_device *dev)
        /* Free all the skbuffs in the queue. */
        for (i = 0; i < RX_RING_SIZE; i++) {
-                np->rx_ring[i].status = 0;
-                np->rx_ring[i].fraginfo = 0;
                skb = np->rx_skbuff[i];
                if (skb) {
                        pci_unmap_single(np->pdev,
@@ -1763,6 +1761,8 @@ rio_close (struct net_device *dev)
                        dev_kfree_skb (skb);
                        np->rx_skbuff[i] = NULL;
                }
+                np->rx_ring[i].status = 0;
+                np->rx_ring[i].fraginfo = 0;
        }
        for (i = 0; i < TX_RING_SIZE; i++) {
                skb = np->tx_skbuff[i];
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index aed223b1b897..7501d977d992 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -124,6 +124,7 @@ static s32 e1000_set_phy_type(struct e1000_hw *hw)
        case M88E1000_I_PHY_ID:
        case M88E1011_I_PHY_ID:
        case M88E1111_I_PHY_ID:
+        case M88E1118_E_PHY_ID:
                hw->phy_type = e1000_phy_m88;
                break;
        case IGP01E1000_I_PHY_ID:
@@ -3222,7 +3223,8 @@ static s32 e1000_detect_gig_phy(struct e1000_hw *hw)
                break;
        case e1000_ce4100:
                if ((hw->phy_id == RTL8211B_PHY_ID) ||
-                    (hw->phy_id == RTL8201N_PHY_ID))
+                    (hw->phy_id == RTL8201N_PHY_ID) ||
+                    (hw->phy_id == M88E1118_E_PHY_ID))
                        match = true;
                break;
        case e1000_82541:
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index 196eeda2dd6c..c70b23d52284 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -2917,6 +2917,7 @@ struct e1000_host_command_info {
 #define M88E1000_14_PHY_ID M88E1000_E_PHY_ID
 #define M88E1011_I_REV_4   0x04
 #define M88E1111_I_PHY_ID  0x01410CC0
+#define M88E1118_E_PHY_ID  0x01410E40
 #define L1LXT971A_PHY_ID   0x001378E0
 #define RTL8211B_PHY_ID    0x001CC910
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index e610e1369053..00bf595ebd67 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -364,6 +364,7 @@ struct e1000_adapter {
        /* structs defined in e1000_hw.h */
        struct e1000_hw hw;
+        spinlock_t stats64_lock;
        struct e1000_hw_stats stats;
        struct e1000_phy_info phy_info;
        struct e1000_phy_stats phy_stats;
@@ -494,7 +495,9 @@ extern int e1000e_setup_rx_resources(struct e1000_adapter *adapter);
 extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter);
 extern void e1000e_free_rx_resources(struct e1000_adapter *adapter);
 extern void e1000e_free_tx_resources(struct e1000_adapter *adapter);
-extern void e1000e_update_stats(struct e1000_adapter *adapter);
+extern struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
+                                                    struct rtnl_link_stats64
+                                                    *stats);
 extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);
 extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);
 extern void e1000e_get_hw_control(struct e1000_adapter *adapter);
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index fa08b6336cfb..65ef9b5548d8 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -46,15 +46,15 @@ struct e1000_stats {
 };
 #define E1000_STAT(str, m) { \
-                        .stat_string = str, \
+                .stat_string = str, \
-                        .type = E1000_STATS, \
+                .type = E1000_STATS, \
-                        .sizeof_stat = sizeof(((struct e1000_adapter *)0)->m), \
+                .sizeof_stat = sizeof(((struct e1000_adapter *)0)->m), \
-                        .stat_offset = offsetof(struct e1000_adapter, m) }
+                .stat_offset = offsetof(struct e1000_adapter, m) }
 #define E1000_NETDEV_STAT(str, m) { \
-                        .stat_string = str, \
+                .stat_string = str, \
-                        .type = NETDEV_STATS, \
+                .type = NETDEV_STATS, \
-                        .sizeof_stat = sizeof(((struct net_device *)0)->m), \
+                .sizeof_stat = sizeof(((struct rtnl_link_stats64 *)0)->m), \
-                        .stat_offset = offsetof(struct net_device, m) }
+                .stat_offset = offsetof(struct rtnl_link_stats64, m) }
 static const struct e1000_stats e1000_gstrings_stats[] = {
        E1000_STAT("rx_packets", stats.gprc),
@@ -65,21 +65,21 @@ static const struct e1000_stats e1000_gstrings_stats[] = {
        E1000_STAT("tx_broadcast", stats.bptc),
        E1000_STAT("rx_multicast", stats.mprc),
        E1000_STAT("tx_multicast", stats.mptc),
-        E1000_NETDEV_STAT("rx_errors", stats.rx_errors),
+        E1000_NETDEV_STAT("rx_errors", rx_errors),
-        E1000_NETDEV_STAT("tx_errors", stats.tx_errors),
+        E1000_NETDEV_STAT("tx_errors", tx_errors),
-        E1000_NETDEV_STAT("tx_dropped", stats.tx_dropped),
+        E1000_NETDEV_STAT("tx_dropped", tx_dropped),
        E1000_STAT("multicast", stats.mprc),
        E1000_STAT("collisions", stats.colc),
-        E1000_NETDEV_STAT("rx_length_errors", stats.rx_length_errors),
+        E1000_NETDEV_STAT("rx_length_errors", rx_length_errors),
-        E1000_NETDEV_STAT("rx_over_errors", stats.rx_over_errors),
+        E1000_NETDEV_STAT("rx_over_errors", rx_over_errors),
        E1000_STAT("rx_crc_errors", stats.crcerrs),
-        E1000_NETDEV_STAT("rx_frame_errors", stats.rx_frame_errors),
+        E1000_NETDEV_STAT("rx_frame_errors", rx_frame_errors),
        E1000_STAT("rx_no_buffer_count", stats.rnbc),
        E1000_STAT("rx_missed_errors", stats.mpc),
        E1000_STAT("tx_aborted_errors", stats.ecol),
        E1000_STAT("tx_carrier_errors", stats.tncrs),
-        E1000_NETDEV_STAT("tx_fifo_errors", stats.tx_fifo_errors),
+        E1000_NETDEV_STAT("tx_fifo_errors", tx_fifo_errors),
-        E1000_NETDEV_STAT("tx_heartbeat_errors", stats.tx_heartbeat_errors),
+        E1000_NETDEV_STAT("tx_heartbeat_errors", tx_heartbeat_errors),
        E1000_STAT("tx_window_errors", stats.latecol),
        E1000_STAT("tx_abort_late_coll", stats.latecol),
        E1000_STAT("tx_deferred_ok", stats.dc),
@@ -684,20 +684,13 @@ static int e1000_set_ringparam(struct net_device *netdev,
        rx_old = adapter->rx_ring;
        err = -ENOMEM;
-        tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
+        tx_ring = kmemdup(tx_old, sizeof(struct e1000_ring), GFP_KERNEL);
        if (!tx_ring)
                goto err_alloc_tx;
-        /*
-         * use a memcpy to save any previously configured
-         * items like napi structs from having to be
-         * reinitialized
-         */
-        memcpy(tx_ring, tx_old, sizeof(struct e1000_ring));
-        rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
+        rx_ring = kmemdup(rx_old, sizeof(struct e1000_ring), GFP_KERNEL);
        if (!rx_ring)
                goto err_alloc_rx;
-        memcpy(rx_ring, rx_old, sizeof(struct e1000_ring));
        adapter->tx_ring = tx_ring;
        adapter->rx_ring = rx_ring;
@@ -1255,7 +1248,6 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 {
        struct e1000_hw *hw = &adapter->hw;
        u32 ctrl_reg = 0;
-        u32 stat_reg = 0;
        u16 phy_reg = 0;
        s32 ret_val = 0;
@@ -1363,8 +1355,7 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
                 * Set the ILOS bit on the fiber Nic if half duplex link is
                 * detected.
                 */
-                stat_reg = er32(STATUS);
+                if ((er32(STATUS) & E1000_STATUS_FD) == 0)
-                if ((stat_reg & E1000_STATUS_FD) == 0)
                        ctrl_reg |= (E1000_CTRL_ILOS | E1000_CTRL_SLU);
        }
@@ -1972,8 +1963,15 @@ static int e1000_set_coalesce(struct net_device *netdev,
 static int e1000_nway_reset(struct net_device *netdev)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
-        if (netif_running(netdev))
-                e1000e_reinit_locked(adapter);
+        if (!netif_running(netdev))
+                return -EAGAIN;
+        if (!adapter->hw.mac.autoneg)
+                return -EINVAL;
+        e1000e_reinit_locked(adapter);
        return 0;
 }
@@ -1982,14 +1980,15 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
                                    u64 *data)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
+        struct rtnl_link_stats64 net_stats;
        int i;
        char *p = NULL;
-        e1000e_update_stats(adapter);
+        e1000e_get_stats64(netdev, &net_stats);
        for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
                switch (e1000_gstrings_stats[i].type) {
                case NETDEV_STATS:
-                        p = (char *) netdev +
+                        p = (char *) &net_stats +
                                        e1000_gstrings_stats[i].stat_offset;
                        break;
                case E1000_STATS:
@@ -2014,7 +2013,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
        switch (stringset) {
        case ETH_SS_TEST:
-                memcpy(data, *e1000_gstrings_test, sizeof(e1000_gstrings_test));
+                memcpy(data, e1000_gstrings_test, sizeof(e1000_gstrings_test));
                break;
        case ETH_SS_STATS:
                for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index fb46974cfec1..232b42b7f7ce 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -2104,7 +2104,6 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
 {
        union ich8_hws_flash_status hsfsts;
        s32 ret_val = -E1000_ERR_NVM;
-        s32 i = 0;
        hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
@@ -2140,6 +2139,8 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
                ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
                ret_val = 0;
        } else {
+                s32 i = 0;
                /*
                 * Otherwise poll for sometime so the current
                 * cycle has a chance to end before giving up.
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 68aa1749bf66..96921de5df2e 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -1978,15 +1978,15 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)
 {
        struct e1000_nvm_info *nvm = &hw->nvm;
        u32 eecd = er32(EECD);
-        u16 timeout = 0;
        u8 spi_stat_reg;
        if (nvm->type == e1000_nvm_eeprom_spi) {
+                u16 timeout = NVM_MAX_RETRY_SPI;
                /* Clear SK and CS */
                eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
                ew32(EECD, eecd);
                udelay(1);
-                timeout = NVM_MAX_RETRY_SPI;
                /*
                 * Read "Status Register" repeatedly until the LSB is cleared.
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 1c18f26b0812..ec0b803c501e 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -900,8 +900,6 @@ next_desc:
        adapter->total_rx_bytes += total_rx_bytes;
        adapter->total_rx_packets += total_rx_packets;
-        netdev->stats.rx_bytes += total_rx_bytes;
-        netdev->stats.rx_packets += total_rx_packets;
        return cleaned;
 }
@@ -937,6 +935,9 @@ static void e1000_print_hw_hang(struct work_struct *work)
        u16 phy_status, phy_1000t_status, phy_ext_status;
        u16 pci_status;
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
        e1e_rphy(hw, PHY_STATUS, &phy_status);
        e1e_rphy(hw, PHY_1000T_STATUS, &phy_1000t_status);
        e1e_rphy(hw, PHY_EXT_STATUS, &phy_ext_status);
@@ -1057,8 +1058,6 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
        }
        adapter->total_tx_bytes += total_tx_bytes;
        adapter->total_tx_packets += total_tx_packets;
-        netdev->stats.tx_bytes += total_tx_bytes;
-        netdev->stats.tx_packets += total_tx_packets;
        return count < tx_ring->count;
 }
@@ -1245,8 +1244,6 @@ next_desc:
        adapter->total_rx_bytes += total_rx_bytes;
        adapter->total_rx_packets += total_rx_packets;
-        netdev->stats.rx_bytes += total_rx_bytes;
-        netdev->stats.rx_packets += total_rx_packets;
        return cleaned;
 }
@@ -1426,8 +1423,6 @@ next_desc:
        adapter->total_rx_bytes += total_rx_bytes;
        adapter->total_rx_packets += total_rx_packets;
-        netdev->stats.rx_bytes += total_rx_bytes;
-        netdev->stats.rx_packets += total_rx_packets;
        return cleaned;
 }
@@ -1506,6 +1501,9 @@ static void e1000e_downshift_workaround(struct work_struct *work)
        struct e1000_adapter *adapter = container_of(work,
                                        struct e1000_adapter, downshift_task);
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
        e1000e_gig_downshift_workaround_ich8lan(&adapter->hw);
 }
@@ -1851,7 +1849,9 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
        int err = 0, vector = 0;
        if (strlen(netdev->name) < (IFNAMSIZ - 5))
-                sprintf(adapter->rx_ring->name, "%s-rx-0", netdev->name);
+                snprintf(adapter->rx_ring->name,
+                         sizeof(adapter->rx_ring->name) - 1,
+                         "%s-rx-0", netdev->name);
        else
                memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
        err = request_irq(adapter->msix_entries[vector].vector,
@@ -1864,7 +1864,9 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
        vector++;
        if (strlen(netdev->name) < (IFNAMSIZ - 5))
-                sprintf(adapter->tx_ring->name, "%s-tx-0", netdev->name);
+                snprintf(adapter->tx_ring->name,
+                         sizeof(adapter->tx_ring->name) - 1,
+                         "%s-tx-0", netdev->name);
        else
                memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
        err = request_irq(adapter->msix_entries[vector].vector,
@@ -2728,7 +2730,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
 {
        struct e1000_hw *hw = &adapter->hw;
        u32 rctl, rfctl;
-        u32 psrctl = 0;
        u32 pages = 0;
        /* Workaround Si errata on 82579 - configure jumbo frame flow */
@@ -2827,6 +2828,8 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
                adapter->rx_ps_pages = 0;
        if (adapter->rx_ps_pages) {
+                u32 psrctl = 0;
                /* Configure extra packet-split registers */
                rfctl = er32(RFCTL);
                rfctl |= E1000_RFCTL_EXTEN;
@@ -3028,7 +3031,6 @@ static void e1000_set_multi(struct net_device *netdev)
        struct netdev_hw_addr *ha;
        u8  *mta_list;
        u32 rctl;
-        int i;
        /* Check for Promiscuous and All Multicast modes */
@@ -3051,12 +3053,13 @@ static void e1000_set_multi(struct net_device *netdev)
        ew32(RCTL, rctl);
        if (!netdev_mc_empty(netdev)) {
+                int i = 0;
                mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);
                if (!mta_list)
                        return;
                /* prepare a packed array of only addresses. */
-                i = 0;
                netdev_for_each_mc_addr(ha, netdev)
                        memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
@@ -3338,6 +3341,23 @@ int e1000e_up(struct e1000_adapter *adapter)
        return 0;
 }
+static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
+{
+        struct e1000_hw *hw = &adapter->hw;
+        if (!(adapter->flags2 & FLAG2_DMA_BURST))
+                return;
+        /* flush pending descriptor writebacks to memory */
+        ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
+        ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
+        /* execute the writes immediately */
+        e1e_flush();
+}
+static void e1000e_update_stats(struct e1000_adapter *adapter);
 void e1000e_down(struct e1000_adapter *adapter)
 {
        struct net_device *netdev = adapter->netdev;
@@ -3372,11 +3392,19 @@ void e1000e_down(struct e1000_adapter *adapter)
        del_timer_sync(&adapter->phy_info_timer);
        netif_carrier_off(netdev);
+        spin_lock(&adapter->stats64_lock);
+        e1000e_update_stats(adapter);
+        spin_unlock(&adapter->stats64_lock);
        adapter->link_speed = 0;
        adapter->link_duplex = 0;
        if (!pci_channel_offline(adapter->pdev))
                e1000e_reset(adapter);
+        e1000e_flush_descriptors(adapter);
        e1000_clean_tx_ring(adapter);
        e1000_clean_rx_ring(adapter);
@@ -3413,6 +3441,8 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
        adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
        adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
+        spin_lock_init(&adapter->stats64_lock);
        e1000e_set_interrupt_capability(adapter);
        if (e1000_alloc_queues(adapter))
@@ -3765,6 +3795,10 @@ static void e1000e_update_phy_task(struct work_struct *work)
 {
        struct e1000_adapter *adapter = container_of(work,
                                        struct e1000_adapter, update_phy_task);
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
        e1000_get_phy_info(&adapter->hw);
 }
@@ -3775,6 +3809,10 @@ static void e1000e_update_phy_task(struct work_struct *work)
 static void e1000_update_phy_info(unsigned long data)
 {
        struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
        schedule_work(&adapter->update_phy_task);
 }
@@ -3886,7 +3924,7 @@ release:
 * e1000e_update_stats - Update the board statistics counters
 * @adapter: board private structure
 **/
-void e1000e_update_stats(struct e1000_adapter *adapter)
+static void e1000e_update_stats(struct e1000_adapter *adapter)
 {
        struct net_device *netdev = adapter->netdev;
        struct e1000_hw *hw = &adapter->hw;
@@ -3998,10 +4036,11 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter)
 {
        struct e1000_hw *hw = &adapter->hw;
        struct e1000_phy_regs *phy = &adapter->phy_regs;
-        int ret_val;
        if ((er32(STATUS) & E1000_STATUS_LU) &&
            (adapter->hw.phy.media_type == e1000_media_type_copper)) {
+                int ret_val;
                ret_val  = e1e_rphy(hw, PHY_CONTROL, &phy->bmcr);
                ret_val |= e1e_rphy(hw, PHY_STATUS, &phy->bmsr);
                ret_val |= e1e_rphy(hw, PHY_AUTONEG_ADV, &phy->advertise);
@@ -4147,7 +4186,9 @@ static void e1000_watchdog_task(struct work_struct *work)
        struct e1000_ring *tx_ring = adapter->tx_ring;
        struct e1000_hw *hw = &adapter->hw;
        u32 link, tctl;
-        int tx_pending = 0;
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
        link = e1000e_has_link(adapter);
        if ((netif_carrier_ok(netdev)) && link) {
@@ -4285,7 +4326,9 @@ static void e1000_watchdog_task(struct work_struct *work)
        }
 link_up:
+        spin_lock(&adapter->stats64_lock);
        e1000e_update_stats(adapter);
+        spin_unlock(&adapter->stats64_lock);
        mac->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;
        adapter->tpt_old = adapter->stats.tpt;
@@ -4299,21 +4342,17 @@ link_up:
        e1000e_update_adaptive(&adapter->hw);
-        if (!netif_carrier_ok(netdev)) {
+        if (!netif_carrier_ok(netdev) &&
-                tx_pending = (e1000_desc_unused(tx_ring) + 1 <
+            (e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
-                               tx_ring->count);
+                /*
-                if (tx_pending) {
+                 * We've lost link, so the controller stops DMA,
-                        /*
+                 * but we've got queued Tx work that's never going
-                         * We've lost link, so the controller stops DMA,
+                 * to get done, so reset controller to flush Tx.
-                         * but we've got queued Tx work that's never going
+                 * (Do the reset outside of interrupt context).
-                         * to get done, so reset controller to flush Tx.
+                 */
-                         * (Do the reset outside of interrupt context).
+                schedule_work(&adapter->reset_task);
-                         */
+                /* return immediately since reset is imminent */
-                        adapter->tx_timeout_count++;
+                return;
-                        schedule_work(&adapter->reset_task);
-                        /* return immediately since reset is imminent */
-                        return;
-                }
        }
        /* Simple mode for Interrupt Throttle Rate (ITR) */
@@ -4338,19 +4377,12 @@ link_up:
        else
                ew32(ICS, E1000_ICS_RXDMT0);
+        /* flush pending descriptors to memory before detecting Tx hang */
+        e1000e_flush_descriptors(adapter);
        /* Force detection of hung controller every watchdog period */
        adapter->detect_tx_hung = 1;
-        /* flush partial descriptors to memory before detecting Tx hang */
-        if (adapter->flags2 & FLAG2_DMA_BURST) {
-                ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
-                ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
-                /*
-                 * no need to flush the writes because the timeout code does
-                 * an er32 first thing
-                 */
-        }
        /*
         * With 82571 controllers, LAA may be overwritten due to controller
         * reset from the other port. Set the appropriate LAA in RAR[0]
@@ -4384,13 +4416,13 @@ static int e1000_tso(struct e1000_adapter *adapter,
        u32 cmd_length = 0;
        u16 ipcse = 0, tucse, mss;
        u8 ipcss, ipcso, tucss, tucso, hdr_len;
-        int err;
        if (!skb_is_gso(skb))
                return 0;
        if (skb_header_cloned(skb)) {
-                err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
+                int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
                if (err)
                        return err;
        }
@@ -4888,6 +4920,10 @@ static void e1000_reset_task(struct work_struct *work)
        struct e1000_adapter *adapter;
        adapter = container_of(work, struct e1000_adapter, reset_task);
+        /* don't run the task if already down */
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
        if (!((adapter->flags & FLAG_RX_NEEDS_RESTART) &&
              (adapter->flags & FLAG_RX_RESTART_NOW))) {
                e1000e_dump(adapter);
@@ -4897,16 +4933,55 @@ static void e1000_reset_task(struct work_struct *work)
 }
 /**
- * e1000_get_stats - Get System Network Statistics
+ * e1000_get_stats64 - Get System Network Statistics
 * @netdev: network interface device structure
+ * @stats: rtnl_link_stats64 pointer
 *
 * Returns the address of the device statistics structure.
- * The statistics are actually updated from the timer callback.
 **/
-static struct net_device_stats *e1000_get_stats(struct net_device *netdev)
+struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
+                                             struct rtnl_link_stats64 *stats)
 {
-        /* only return the current stats */
+        struct e1000_adapter *adapter = netdev_priv(netdev);
-        return &netdev->stats;
+        memset(stats, 0, sizeof(struct rtnl_link_stats64));
+        spin_lock(&adapter->stats64_lock);
+        e1000e_update_stats(adapter);
+        /* Fill out the OS statistics structure */
+        stats->rx_bytes = adapter->stats.gorc;
+        stats->rx_packets = adapter->stats.gprc;
+        stats->tx_bytes = adapter->stats.gotc;
+        stats->tx_packets = adapter->stats.gptc;
+        stats->multicast = adapter->stats.mprc;
+        stats->collisions = adapter->stats.colc;
+        /* Rx Errors */
+        /*
+         * RLEC on some newer hardware can be incorrect so build
+         * our own version based on RUC and ROC
+         */
+        stats->rx_errors = adapter->stats.rxerrc +
+                adapter->stats.crcerrs + adapter->stats.algnerrc +
+                adapter->stats.ruc + adapter->stats.roc +
+                adapter->stats.cexterr;
+        stats->rx_length_errors = adapter->stats.ruc +
+                                              adapter->stats.roc;
+        stats->rx_crc_errors = adapter->stats.crcerrs;
+        stats->rx_frame_errors = adapter->stats.algnerrc;
+        stats->rx_missed_errors = adapter->stats.mpc;
+        /* Tx Errors */
+        stats->tx_errors = adapter->stats.ecol +
+                                       adapter->stats.latecol;
+        stats->tx_aborted_errors = adapter->stats.ecol;
+        stats->tx_window_errors = adapter->stats.latecol;
+        stats->tx_carrier_errors = adapter->stats.tncrs;
+        /* Tx Dropped needs to be maintained elsewhere */
+        spin_unlock(&adapter->stats64_lock);
+        return stats;
 }
 /**
@@ -5476,9 +5551,10 @@ static irqreturn_t e1000_intr_msix(int irq, void *data)
 {
        struct net_device *netdev = data;
        struct e1000_adapter *adapter = netdev_priv(netdev);
-        int vector, msix_irq;
        if (adapter->msix_entries) {
+                int vector, msix_irq;
                vector = 0;
                msix_irq = adapter->msix_entries[vector].vector;
                disable_irq(msix_irq);
@@ -5675,7 +5751,7 @@ static const struct net_device_ops e1000e_netdev_ops = {
        .ndo_open               = e1000_open,
        .ndo_stop               = e1000_close,
        .ndo_start_xmit         = e1000_xmit_frame,
-        .ndo_get_stats          = e1000_get_stats,
+        .ndo_get_stats64        = e1000e_get_stats64,
        .ndo_set_multicast_list = e1000_set_multi,
        .ndo_set_mac_address    = e1000_set_mac,
        .ndo_change_mtu         = e1000_change_mtu,
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 6bea051b134b..6ae31fcfb629 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -2409,9 +2409,7 @@ static u32 e1000_get_phy_addr_for_bm_page(u32 page, u32 reg)
 s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data)
 {
        s32 ret_val;
-        u32 page_select = 0;
        u32 page = offset >> IGP_PAGE_SHIFT;
-        u32 page_shift = 0;
        ret_val = hw->phy.ops.acquire(hw);
        if (ret_val)
@@ -2427,6 +2425,8 @@ s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data)
        hw->phy.addr = e1000_get_phy_addr_for_bm_page(page, offset);
        if (offset > MAX_PHY_MULTI_PAGE_REG) {
+                u32 page_shift, page_select;
                /*
                 * Page select is register 31 for phy address 1 and 22 for
                 * phy address 2 and 3. Page select is shifted only for
@@ -2468,9 +2468,7 @@ out:
 s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data)
 {
        s32 ret_val;
-        u32 page_select = 0;
        u32 page = offset >> IGP_PAGE_SHIFT;
-        u32 page_shift = 0;
        ret_val = hw->phy.ops.acquire(hw);
        if (ret_val)
@@ -2486,6 +2484,8 @@ s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data)
        hw->phy.addr = e1000_get_phy_addr_for_bm_page(page, offset);
        if (offset > MAX_PHY_MULTI_PAGE_REG) {
+                u32 page_shift, page_select;
                /*
                 * Page select is register 31 for phy address 1 and 22 for
                 * phy address 2 and 3. Page select is shifted only for
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 112c5aa9af7f..907b05a1c659 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -812,7 +812,7 @@ static void enc28j60_read_tsv(struct enc28j60_net *priv, u8 tsv[TSV_SIZE])
        if (netif_msg_hw(priv))
                printk(KERN_DEBUG DRV_NAME ": reading TSV at addr:0x%04x\n",
                         endptr + 1);
-        enc28j60_mem_read(priv, endptr + 1, sizeof(tsv), tsv);
+        enc28j60_mem_read(priv, endptr + 1, TSV_SIZE, tsv);
 }
 static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg,
diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile
index e7b6c31880ba..2e573be16c13 100644
--- a/drivers/net/enic/Makefile
+++ b/drivers/net/enic/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_ENIC) := enic.o
 enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \
-        enic_res.o vnic_dev.o vnic_rq.o vnic_vic.o
+        enic_res.o enic_dev.o vnic_dev.o vnic_rq.o vnic_vic.o
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index a937f49d9db7..aee5256e522b 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -32,13 +32,13 @@
 #define DRV_NAME                "enic"
 #define DRV_DESCRIPTION         "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION             "1.4.1.10"
+#define DRV_VERSION             "2.1.1.9"
-#define DRV_COPYRIGHT           "Copyright 2008-2010 Cisco Systems, Inc"
+#define DRV_COPYRIGHT           "Copyright 2008-2011 Cisco Systems, Inc"
 #define ENIC_BARS_MAX           6
-#define ENIC_WQ_MAX             8
+#define ENIC_WQ_MAX             1
-#define ENIC_RQ_MAX             8
+#define ENIC_RQ_MAX             1
 #define ENIC_CQ_MAX             (ENIC_WQ_MAX + ENIC_RQ_MAX)
 #define ENIC_INTR_MAX           (ENIC_CQ_MAX + 2)
@@ -49,7 +49,7 @@ struct enic_msix_entry {
        void *devid;
 };
-#define ENIC_SET_APPLIED                (1 << 0)
+#define ENIC_PORT_REQUEST_APPLIED       (1 << 0)
 #define ENIC_SET_REQUEST                (1 << 1)
 #define ENIC_SET_NAME                   (1 << 2)
 #define ENIC_SET_INSTANCE               (1 << 3)
@@ -101,7 +101,6 @@ struct enic {
        /* receive queue cache line section */
        ____cacheline_aligned struct vnic_rq rq[ENIC_RQ_MAX];
        unsigned int rq_count;
-        int (*rq_alloc_buf)(struct vnic_rq *rq);
        u64 rq_truncated_pkts;
        u64 rq_bad_fcs;
        struct napi_struct napi[ENIC_RQ_MAX];
diff --git a/drivers/net/enic/enic_dev.c b/drivers/net/enic/enic_dev.c
new file mode 100644
index 000000000000..37ad3a1c82ee
--- /dev/null
+++ b/drivers/net/enic/enic_dev.c
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2011 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+#include <linux/pci.h>
+#include <linux/etherdevice.h>
+#include "vnic_dev.h"
+#include "vnic_vic.h"
+#include "enic_res.h"
+#include "enic.h"
+#include "enic_dev.h"
+int enic_dev_fw_info(struct enic *enic, struct vnic_devcmd_fw_info **fw_info)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_fw_info(enic->vdev, fw_info);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_stats_dump(enic->vdev, vstats);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_add_station_addr(struct enic *enic)
+{
+        int err;
+        if (!is_valid_ether_addr(enic->netdev->dev_addr))
+                return -EADDRNOTAVAIL;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_del_station_addr(struct enic *enic)
+{
+        int err;
+        if (!is_valid_ether_addr(enic->netdev->dev_addr))
+                return -EADDRNOTAVAIL;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
+        int broadcast, int promisc, int allmulti)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_packet_filter(enic->vdev, directed,
+                multicast, broadcast, promisc, allmulti);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_add_addr(struct enic *enic, u8 *addr)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_add_addr(enic->vdev, addr);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_del_addr(struct enic *enic, u8 *addr)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_del_addr(enic->vdev, addr);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_notify_unset(struct enic *enic)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_notify_unset(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_hang_notify(struct enic *enic)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_hang_notify(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev,
+                IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_enable(struct enic *enic)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_enable_wait(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_disable(struct enic *enic)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_disable(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_vnic_dev_deinit(struct enic *enic)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_deinit(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_init_prov(enic->vdev,
+                (u8 *)vp, vic_provinfo_size(vp));
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+int enic_dev_init_done(struct enic *enic, int *done, int *error)
+{
+        int err;
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_init_done(enic->vdev, done, error);
+        spin_unlock(&enic->devcmd_lock);
+        return err;
+}
+/* rtnl lock is held */
+void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+{
+        struct enic *enic = netdev_priv(netdev);
+        spin_lock(&enic->devcmd_lock);
+        enic_add_vlan(enic, vid);
+        spin_unlock(&enic->devcmd_lock);
+}
+/* rtnl lock is held */
+void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+{
+        struct enic *enic = netdev_priv(netdev);
+        spin_lock(&enic->devcmd_lock);
+        enic_del_vlan(enic, vid);
+        spin_unlock(&enic->devcmd_lock);
+}
diff --git a/drivers/net/enic/enic_dev.h b/drivers/net/enic/enic_dev.h
new file mode 100644
index 000000000000..495f57fcb887
--- /dev/null
+++ b/drivers/net/enic/enic_dev.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2011 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+#ifndef _ENIC_DEV_H_
+#define _ENIC_DEV_H_
+int enic_dev_fw_info(struct enic *enic, struct vnic_devcmd_fw_info **fw_info);
+int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats);
+int enic_dev_add_station_addr(struct enic *enic);
+int enic_dev_del_station_addr(struct enic *enic);
+int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
+        int broadcast, int promisc, int allmulti);
+int enic_dev_add_addr(struct enic *enic, u8 *addr);
+int enic_dev_del_addr(struct enic *enic, u8 *addr);
+void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
+void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
+int enic_dev_notify_unset(struct enic *enic);
+int enic_dev_hang_notify(struct enic *enic);
+int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);
+int enic_dev_enable(struct enic *enic);
+int enic_dev_disable(struct enic *enic);
+int enic_vnic_dev_deinit(struct enic *enic);
+int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp);
+int enic_dev_init_done(struct enic *enic, int *done, int *error);
+#endif /* _ENIC_DEV_H_ */
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index a0af48c51fb3..4f1710e31eb4 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -44,6 +44,7 @@
 #include "vnic_vic.h"
 #include "enic_res.h"
 #include "enic.h"
+#include "enic_dev.h"
 #define ENIC_NOTIFY_TIMER_PERIOD        (2 * HZ)
 #define WQ_ENET_MAX_DESC_LEN            (1 << WQ_ENET_LEN_BITS)
@@ -190,18 +191,6 @@ static int enic_get_settings(struct net_device *netdev,
        return 0;
 }
-static int enic_dev_fw_info(struct enic *enic,
-        struct vnic_devcmd_fw_info **fw_info)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_fw_info(enic->vdev, fw_info);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
 static void enic_get_drvinfo(struct net_device *netdev,
        struct ethtool_drvinfo *drvinfo)
 {
@@ -246,17 +235,6 @@ static int enic_get_sset_count(struct net_device *netdev, int sset)
        }
 }
-static int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_stats_dump(enic->vdev, vstats);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
 static void enic_get_ethtool_stats(struct net_device *netdev,
        struct ethtool_stats *stats, u64 *data)
 {
@@ -896,9 +874,10 @@ static struct net_device_stats *enic_get_stats(struct net_device *netdev)
        return net_stats;
 }
-static void enic_reset_multicast_list(struct enic *enic)
+static void enic_reset_addr_lists(struct enic *enic)
 {
        enic->mc_count = 0;
+        enic->uc_count = 0;
        enic->flags = 0;
 }
@@ -919,32 +898,6 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr)
        return 0;
 }
-static int enic_dev_add_station_addr(struct enic *enic)
-{
-        int err = 0;
-        if (is_valid_ether_addr(enic->netdev->dev_addr)) {
-                spin_lock(&enic->devcmd_lock);
-                err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
-                spin_unlock(&enic->devcmd_lock);
-        }
-        return err;
-}
-static int enic_dev_del_station_addr(struct enic *enic)
-{
-        int err = 0;
-        if (is_valid_ether_addr(enic->netdev->dev_addr)) {
-                spin_lock(&enic->devcmd_lock);
-                err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
-                spin_unlock(&enic->devcmd_lock);
-        }
-        return err;
-}
 static int enic_set_mac_address_dynamic(struct net_device *netdev, void *p)
 {
        struct enic *enic = netdev_priv(netdev);
@@ -989,42 +942,7 @@ static int enic_set_mac_address(struct net_device *netdev, void *p)
        return enic_dev_add_station_addr(enic);
 }
-static int enic_dev_packet_filter(struct enic *enic, int directed,
+static void enic_update_multicast_addr_list(struct enic *enic)
-        int multicast, int broadcast, int promisc, int allmulti)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_packet_filter(enic->vdev, directed,
-                multicast, broadcast, promisc, allmulti);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
-static int enic_dev_add_addr(struct enic *enic, u8 *addr)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_add_addr(enic->vdev, addr);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
-static int enic_dev_del_addr(struct enic *enic, u8 *addr)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_del_addr(enic->vdev, addr);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
-static void enic_add_multicast_addr_list(struct enic *enic)
 {
        struct net_device *netdev = enic->netdev;
        struct netdev_hw_addr *ha;
@@ -1079,7 +997,7 @@ static void enic_add_multicast_addr_list(struct enic *enic)
        enic->mc_count = mc_count;
 }
-static void enic_add_unicast_addr_list(struct enic *enic)
+static void enic_update_unicast_addr_list(struct enic *enic)
 {
        struct net_device *netdev = enic->netdev;
        struct netdev_hw_addr *ha;
@@ -1156,9 +1074,9 @@ static void enic_set_rx_mode(struct net_device *netdev)
        }
        if (!promisc) {
-                enic_add_unicast_addr_list(enic);
+                enic_update_unicast_addr_list(enic);
                if (!allmulti)
-                        enic_add_multicast_addr_list(enic);
+                        enic_update_multicast_addr_list(enic);
        }
 }
@@ -1170,26 +1088,6 @@ static void enic_vlan_rx_register(struct net_device *netdev,
        enic->vlan_group = vlan_group;
 }
-/* rtnl lock is held */
-static void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-        struct enic *enic = netdev_priv(netdev);
-        spin_lock(&enic->devcmd_lock);
-        enic_add_vlan(enic, vid);
-        spin_unlock(&enic->devcmd_lock);
-}
-/* rtnl lock is held */
-static void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-        struct enic *enic = netdev_priv(netdev);
-        spin_lock(&enic->devcmd_lock);
-        enic_del_vlan(enic, vid);
-        spin_unlock(&enic->devcmd_lock);
-}
 /* netif_tx_lock held, BHs disabled */
 static void enic_tx_timeout(struct net_device *netdev)
 {
@@ -1197,40 +1095,6 @@ static void enic_tx_timeout(struct net_device *netdev)
        schedule_work(&enic->reset);
 }
-static int enic_vnic_dev_deinit(struct enic *enic)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_deinit(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
-static int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_init_prov(enic->vdev,
-                (u8 *)vp, vic_provinfo_size(vp));
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
-static int enic_dev_init_done(struct enic *enic, int *done, int *error)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_init_done(enic->vdev, done, error);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
 static int enic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
 {
        struct enic *enic = netdev_priv(netdev);
@@ -1318,18 +1182,20 @@ static int enic_set_port_profile(struct enic *enic, u8 *mac)
                vic_provinfo_free(vp);
                if (err)
                        return err;
-                enic->pp.set |= ENIC_SET_APPLIED;
                break;
        case PORT_REQUEST_DISASSOCIATE:
-                enic->pp.set &= ~ENIC_SET_APPLIED;
                break;
        default:
                return -EINVAL;
        }
+        /* Set flag to indicate that the port assoc/disassoc
+         * request has been sent out to fw
+         */
+        enic->pp.set |= ENIC_PORT_REQUEST_APPLIED;
        return 0;
 }
@@ -1379,9 +1245,6 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
                if (is_zero_ether_addr(netdev->dev_addr))
                        random_ether_addr(netdev->dev_addr);
-        } else if (new_pp.request == PORT_REQUEST_DISASSOCIATE) {
-                if (!is_zero_ether_addr(enic->pp.mac_addr))
-                        enic_dev_del_addr(enic, enic->pp.mac_addr);
        }
        memcpy(&enic->pp, &new_pp, sizeof(struct enic_port_profile));
@@ -1390,9 +1253,6 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
        if (err)
                goto set_port_profile_cleanup;
-        if (!is_zero_ether_addr(enic->pp.mac_addr))
-                enic_dev_add_addr(enic, enic->pp.mac_addr);
 set_port_profile_cleanup:
        memset(enic->pp.vf_mac, 0, ETH_ALEN);
@@ -1411,7 +1271,7 @@ static int enic_get_vf_port(struct net_device *netdev, int vf,
        int err, error, done;
        u16 response = PORT_PROFILE_RESPONSE_SUCCESS;
-        if (!(enic->pp.set & ENIC_SET_APPLIED))
+        if (!(enic->pp.set & ENIC_PORT_REQUEST_APPLIED))
                return -ENODATA;
        err = enic_dev_init_done(enic, &done, &error);
@@ -1489,62 +1349,6 @@ static int enic_rq_alloc_buf(struct vnic_rq *rq)
        return 0;
 }
-static int enic_rq_alloc_buf_a1(struct vnic_rq *rq)
-{
-        struct rq_enet_desc *desc = vnic_rq_next_desc(rq);
-        if (vnic_rq_posting_soon(rq)) {
-                /* SW workaround for A0 HW erratum: if we're just about
-                 * to write posted_index, insert a dummy desc
-                 * of type resvd
-                 */
-                rq_enet_desc_enc(desc, 0, RQ_ENET_TYPE_RESV2, 0);
-                vnic_rq_post(rq, 0, 0, 0, 0);
-        } else {
-                return enic_rq_alloc_buf(rq);
-        }
-        return 0;
-}
-static int enic_dev_hw_version(struct enic *enic,
-        enum vnic_dev_hw_version *hw_ver)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_hw_version(enic->vdev, hw_ver);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
-static int enic_set_rq_alloc_buf(struct enic *enic)
-{
-        enum vnic_dev_hw_version hw_ver;
-        int err;
-        err = enic_dev_hw_version(enic, &hw_ver);
-        if (err)
-                return err;
-        switch (hw_ver) {
-        case VNIC_DEV_HW_VER_A1:
-                enic->rq_alloc_buf = enic_rq_alloc_buf_a1;
-                break;
-        case VNIC_DEV_HW_VER_A2:
-        case VNIC_DEV_HW_VER_UNKNOWN:
-                enic->rq_alloc_buf = enic_rq_alloc_buf;
-                break;
-        default:
-                return -ENODEV;
-        }
-        return 0;
-}
 static void enic_rq_indicate_buf(struct vnic_rq *rq,
        struct cq_desc *cq_desc, struct vnic_rq_buf *buf,
        int skipped, void *opaque)
@@ -1681,7 +1485,7 @@ static int enic_poll(struct napi_struct *napi, int budget)
                        0 /* don't unmask intr */,
                        0 /* don't reset intr timer */);
-        err = vnic_rq_fill(&enic->rq[0], enic->rq_alloc_buf);
+        err = vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
        /* Buffer allocation failed. Stay in polling
         * mode so we can try to fill the ring again.
@@ -1731,7 +1535,7 @@ static int enic_poll_msix(struct napi_struct *napi, int budget)
                        0 /* don't unmask intr */,
                        0 /* don't reset intr timer */);
-        err = vnic_rq_fill(&enic->rq[rq], enic->rq_alloc_buf);
+        err = vnic_rq_fill(&enic->rq[rq], enic_rq_alloc_buf);
        /* Buffer allocation failed. Stay in polling mode
         * so we can try to fill the ring again.
@@ -1901,39 +1705,6 @@ static int enic_dev_notify_set(struct enic *enic)
        return err;
 }
-static int enic_dev_notify_unset(struct enic *enic)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_notify_unset(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
-static int enic_dev_enable(struct enic *enic)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_enable_wait(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
-static int enic_dev_disable(struct enic *enic)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_disable(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
 static void enic_notify_timer_start(struct enic *enic)
 {
        switch (vnic_dev_get_intr_mode(enic->vdev)) {
@@ -1967,7 +1738,7 @@ static int enic_open(struct net_device *netdev)
        }
        for (i = 0; i < enic->rq_count; i++) {
-                vnic_rq_fill(&enic->rq[i], enic->rq_alloc_buf);
+                vnic_rq_fill(&enic->rq[i], enic_rq_alloc_buf);
                /* Need at least one buffer on ring to get going */
                if (vnic_rq_desc_used(&enic->rq[i]) == 0) {
                        netdev_err(netdev, "Unable to alloc receive buffers\n");
@@ -2285,29 +2056,6 @@ static int enic_set_rss_nic_cfg(struct enic *enic)
                rss_hash_bits, rss_base_cpu, rss_enable);
 }
-static int enic_dev_hang_notify(struct enic *enic)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_hang_notify(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
-static int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
-{
-        int err;
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev,
-                IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN);
-        spin_unlock(&enic->devcmd_lock);
-        return err;
-}
 static void enic_reset(struct work_struct *work)
 {
        struct enic *enic = container_of(work, struct enic, reset);
@@ -2320,7 +2068,7 @@ static void enic_reset(struct work_struct *work)
        enic_dev_hang_notify(enic);
        enic_stop(enic->netdev);
        enic_dev_hang_reset(enic);
-        enic_reset_multicast_list(enic);
+        enic_reset_addr_lists(enic);
        enic_init_vnic_resources(enic);
        enic_set_rss_nic_cfg(enic);
        enic_dev_set_ig_vlan_rewrite_mode(enic);
@@ -2332,7 +2080,7 @@ static void enic_reset(struct work_struct *work)
 static int enic_set_intr_mode(struct enic *enic)
 {
        unsigned int n = min_t(unsigned int, enic->rq_count, ENIC_RQ_MAX);
-        unsigned int m = 1;
+        unsigned int m = min_t(unsigned int, enic->wq_count, ENIC_WQ_MAX);
        unsigned int i;
        /* Set interrupt mode (INTx, MSI, MSI-X) depending
@@ -2475,9 +2223,7 @@ static const struct net_device_ops enic_netdev_dynamic_ops = {
        .ndo_tx_timeout         = enic_tx_timeout,
        .ndo_set_vf_port        = enic_set_vf_port,
        .ndo_get_vf_port        = enic_get_vf_port,
-#ifdef IFLA_VF_MAX
        .ndo_set_vf_mac         = enic_set_vf_mac,
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller    = enic_poll_controller,
 #endif
@@ -2556,25 +2302,12 @@ static int enic_dev_init(struct enic *enic)
        enic_init_vnic_resources(enic);
-        err = enic_set_rq_alloc_buf(enic);
-        if (err) {
-                dev_err(dev, "Failed to set RQ buffer allocator, aborting\n");
-                goto err_out_free_vnic_resources;
-        }
        err = enic_set_rss_nic_cfg(enic);
        if (err) {
                dev_err(dev, "Failed to config nic, aborting\n");
                goto err_out_free_vnic_resources;
        }
-        err = enic_dev_set_ig_vlan_rewrite_mode(enic);
-        if (err) {
-                dev_err(dev,
-                        "Failed to set ingress vlan rewrite mode, aborting.\n");
-                goto err_out_free_vnic_resources;
-        }
        switch (vnic_dev_get_intr_mode(enic->vdev)) {
        default:
                netif_napi_add(netdev, &enic->napi[0], enic_poll, 64);
@@ -2713,6 +2446,22 @@ static int __devinit enic_probe(struct pci_dev *pdev,
                goto err_out_vnic_unregister;
        }
+        /* Setup devcmd lock
+         */
+        spin_lock_init(&enic->devcmd_lock);
+        /*
+         * Set ingress vlan rewrite mode before vnic initialization
+         */
+        err = enic_dev_set_ig_vlan_rewrite_mode(enic);
+        if (err) {
+                dev_err(dev,
+                        "Failed to set ingress vlan rewrite mode, aborting.\n");
+                goto err_out_dev_close;
+        }
        /* Issue device init to initialize the vnic-to-switch link.
         * We'll start with carrier off and wait for link UP
         * notification later to turn on carrier.  We don't need
@@ -2736,11 +2485,6 @@ static int __devinit enic_probe(struct pci_dev *pdev,
                }
        }
-        /* Setup devcmd lock
-         */
-        spin_lock_init(&enic->devcmd_lock);
        err = enic_dev_init(enic);
        if (err) {
                dev_err(dev, "Device initialization failed, aborting\n");
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index fb35d8b17668..c489e72107de 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -419,25 +419,6 @@ int vnic_dev_fw_info(struct vnic_dev *vdev,
        return err;
 }
-int vnic_dev_hw_version(struct vnic_dev *vdev, enum vnic_dev_hw_version *hw_ver)
-{
-        struct vnic_devcmd_fw_info *fw_info;
-        int err;
-        err = vnic_dev_fw_info(vdev, &fw_info);
-        if (err)
-                return err;
-        if (strncmp(fw_info->hw_version, "A1", sizeof("A1")) == 0)
-                *hw_ver = VNIC_DEV_HW_VER_A1;
-        else if (strncmp(fw_info->hw_version, "A2", sizeof("A2")) == 0)
-                *hw_ver = VNIC_DEV_HW_VER_A2;
-        else
-                *hw_ver = VNIC_DEV_HW_VER_UNKNOWN;
-        return 0;
-}
 int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,
        void *value)
 {
diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/enic/vnic_dev.h
index 05f9a24cd459..e837546213a8 100644
--- a/drivers/net/enic/vnic_dev.h
+++ b/drivers/net/enic/vnic_dev.h
@@ -44,12 +44,6 @@ static inline void writeq(u64 val, void __iomem *reg)
 #undef pr_fmt
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-enum vnic_dev_hw_version {
-        VNIC_DEV_HW_VER_UNKNOWN,
-        VNIC_DEV_HW_VER_A1,
-        VNIC_DEV_HW_VER_A2,
-};
 enum vnic_dev_intr_mode {
        VNIC_DEV_INTR_MODE_UNKNOWN,
        VNIC_DEV_INTR_MODE_INTX,
@@ -93,8 +87,6 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
        u64 *a0, u64 *a1, int wait);
 int vnic_dev_fw_info(struct vnic_dev *vdev,
        struct vnic_devcmd_fw_info **fw_info);
-int vnic_dev_hw_version(struct vnic_dev *vdev,
-        enum vnic_dev_hw_version *hw_ver);
 int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,
        void *value);
 int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats);
diff --git a/drivers/net/enic/vnic_rq.h b/drivers/net/enic/vnic_rq.h
index 37f08de2454a..2056586f4d4b 100644
--- a/drivers/net/enic/vnic_rq.h
+++ b/drivers/net/enic/vnic_rq.h
@@ -141,11 +141,6 @@ static inline void vnic_rq_post(struct vnic_rq *rq,
        }
 }
-static inline int vnic_rq_posting_soon(struct vnic_rq *rq)
-{
-        return (rq->to_use->index & VNIC_RQ_RETURN_RATE) == 0;
-}
 static inline void vnic_rq_return_descs(struct vnic_rq *rq, unsigned int count)
 {
        rq->ring.desc_avail += count;
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 2a71373719ae..634c0daeecec 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -54,7 +54,7 @@
 #include "fec.h"
-#if defined(CONFIG_ARCH_MXC) || defined(CONFIG_SOC_IMX28)
+#if defined(CONFIG_ARM)
 #define FEC_ALIGNMENT   0xf
 #else
 #define FEC_ALIGNMENT   0x3
@@ -147,8 +147,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
 * account when setting it.
 */
 #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
-    defined(CONFIG_M520x) || defined(CONFIG_M532x) || \
+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM)
-    defined(CONFIG_ARCH_MXC) || defined(CONFIG_SOC_IMX28)
 #define OPT_FRAME_SIZE  (PKT_MAXBUF_SIZE << 16)
 #else
 #define OPT_FRAME_SIZE  0
@@ -183,7 +182,7 @@ struct fec_enet_private {
        struct bufdesc  *rx_bd_base;
        struct bufdesc  *tx_bd_base;
        /* The next free ring entry */
-        struct bufdesc  *cur_rx, *cur_tx; 
+        struct bufdesc  *cur_rx, *cur_tx;
        /* The ring entries to be free()ed */
        struct bufdesc  *dirty_tx;
@@ -191,28 +190,21 @@ struct fec_enet_private {
        /* hold while accessing the HW like ringbuffer for tx/rx but not MAC */
        spinlock_t hw_lock;
-        struct  platform_device *pdev;
+        struct  platform_device *pdev;
        int     opened;
        /* Phylib and MDIO interface */
-        struct  mii_bus *mii_bus;
+        struct  mii_bus *mii_bus;
-        struct  phy_device *phy_dev;
+        struct  phy_device *phy_dev;
-        int     mii_timeout;
+        int     mii_timeout;
-        uint    phy_speed;
+        uint    phy_speed;
        phy_interface_t phy_interface;
        int     link;
        int     full_duplex;
        struct  completion mdio_done;
 };
-static irqreturn_t fec_enet_interrupt(int irq, void * dev_id);
-static void fec_enet_tx(struct net_device *dev);
-static void fec_enet_rx(struct net_device *dev);
-static int fec_enet_close(struct net_device *dev);
-static void fec_restart(struct net_device *dev, int duplex);
-static void fec_stop(struct net_device *dev);
 /* FEC MII MMFR bits definition */
 #define FEC_MMFR_ST             (1 << 30)
 #define FEC_MMFR_OP_READ        (2 << 28)
@@ -239,9 +231,9 @@ static void *swap_buffer(void *bufaddr, int len)
 }
 static netdev_tx_t
-fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
+fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        const struct platform_device_id *id_entry =
                                platform_get_device_id(fep->pdev);
        struct bufdesc *bdp;
@@ -262,9 +254,9 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (status & BD_ENET_TX_READY) {
                /* Ooops.  All transmit buffers are full.  Bail out.
-                 * This should not happen, since dev->tbusy should be set.
+                 * This should not happen, since ndev->tbusy should be set.
                 */
-                printk("%s: tx queue full!.\n", dev->name);
+                printk("%s: tx queue full!.\n", ndev->name);
                spin_unlock_irqrestore(&fep->hw_lock, flags);
                return NETDEV_TX_BUSY;
        }
@@ -284,7 +276,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (((unsigned long) bufaddr) & FEC_ALIGNMENT) {
                unsigned int index;
                index = bdp - fep->tx_bd_base;
-                memcpy(fep->tx_bounce[index], (void *)skb->data, skb->len);
+                memcpy(fep->tx_bounce[index], skb->data, skb->len);
                bufaddr = fep->tx_bounce[index];
        }
@@ -299,13 +291,13 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        /* Save skb pointer */
        fep->tx_skbuff[fep->skb_cur] = skb;
-        dev->stats.tx_bytes += skb->len;
+        ndev->stats.tx_bytes += skb->len;
        fep->skb_cur = (fep->skb_cur+1) & TX_RING_MOD_MASK;
        /* Push the data cache so the CPM does not get stale memory
         * data.
         */
-        bdp->cbd_bufaddr = dma_map_single(&dev->dev, bufaddr,
+        bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, bufaddr,
                        FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
        /* Send it on its way.  Tell FEC it's ready, interrupt when done,
@@ -326,7 +318,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (bdp == fep->dirty_tx) {
                fep->tx_full = 1;
-                netif_stop_queue(dev);
+                netif_stop_queue(ndev);
        }
        fep->cur_tx = bdp;
@@ -336,62 +328,170 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        return NETDEV_TX_OK;
 }
+/* This function is called to start or restart the FEC during a link
+ * change.  This only happens when switching between half and full
+ * duplex.
+ */
 static void
-fec_timeout(struct net_device *dev)
+fec_restart(struct net_device *ndev, int duplex)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        const struct platform_device_id *id_entry =
+                                platform_get_device_id(fep->pdev);
+        int i;
+        u32 temp_mac[2];
+        u32 rcntl = OPT_FRAME_SIZE | 0x04;
-        dev->stats.tx_errors++;
+        /* Whack a reset.  We should wait for this. */
+        writel(1, fep->hwp + FEC_ECNTRL);
+        udelay(10);
-        fec_restart(dev, fep->full_duplex);
+        /*
-        netif_wake_queue(dev);
+         * enet-mac reset will reset mac address registers too,
-}
+         * so need to reconfigure it.
+         */
+        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
+                memcpy(&temp_mac, ndev->dev_addr, ETH_ALEN);
+                writel(cpu_to_be32(temp_mac[0]), fep->hwp + FEC_ADDR_LOW);
+                writel(cpu_to_be32(temp_mac[1]), fep->hwp + FEC_ADDR_HIGH);
+        }
-static irqreturn_t
+        /* Clear any outstanding interrupt. */
-fec_enet_interrupt(int irq, void * dev_id)
+        writel(0xffc00000, fep->hwp + FEC_IEVENT);
-{
-        struct  net_device *dev = dev_id;
-        struct fec_enet_private *fep = netdev_priv(dev);
-        uint    int_events;
-        irqreturn_t ret = IRQ_NONE;
-        do {
+        /* Reset all multicast. */
-                int_events = readl(fep->hwp + FEC_IEVENT);
+        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH);
-                writel(int_events, fep->hwp + FEC_IEVENT);
+        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW);
+#ifndef CONFIG_M5272
+        writel(0, fep->hwp + FEC_HASH_TABLE_HIGH);
+        writel(0, fep->hwp + FEC_HASH_TABLE_LOW);
+#endif
-                if (int_events & FEC_ENET_RXF) {
+        /* Set maximum receive buffer size. */
-                        ret = IRQ_HANDLED;
+        writel(PKT_MAXBLR_SIZE, fep->hwp + FEC_R_BUFF_SIZE);
-                        fec_enet_rx(dev);
-                }
-                /* Transmit OK, or non-fatal error. Update the buffer
+        /* Set receive and transmit descriptor base. */
-                 * descriptors. FEC handles all errors, we just discover
+        writel(fep->bd_dma, fep->hwp + FEC_R_DES_START);
-                 * them as part of the transmit process.
+        writel((unsigned long)fep->bd_dma + sizeof(struct bufdesc) * RX_RING_SIZE,
-                 */
+                        fep->hwp + FEC_X_DES_START);
-                if (int_events & FEC_ENET_TXF) {
-                        ret = IRQ_HANDLED;
+        fep->dirty_tx = fep->cur_tx = fep->tx_bd_base;
-                        fec_enet_tx(dev);
+        fep->cur_rx = fep->rx_bd_base;
+        /* Reset SKB transmit buffers. */
+        fep->skb_cur = fep->skb_dirty = 0;
+        for (i = 0; i <= TX_RING_MOD_MASK; i++) {
+                if (fep->tx_skbuff[i]) {
+                        dev_kfree_skb_any(fep->tx_skbuff[i]);
+                        fep->tx_skbuff[i] = NULL;
                }
+        }
-                if (int_events & FEC_ENET_MII) {
+        /* Enable MII mode */
-                        ret = IRQ_HANDLED;
+        if (duplex) {
-                        complete(&fep->mdio_done);
+                /* FD enable */
+                writel(0x04, fep->hwp + FEC_X_CNTRL);
+        } else {
+                /* No Rcv on Xmit */
+                rcntl |= 0x02;
+                writel(0x0, fep->hwp + FEC_X_CNTRL);
+        }
+        fep->full_duplex = duplex;
+        /* Set MII speed */
+        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
+        /*
+         * The phy interface and speed need to get configured
+         * differently on enet-mac.
+         */
+        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
+                /* Enable flow control and length check */
+                rcntl |= 0x40000000 | 0x00000020;
+                /* MII or RMII */
+                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII)
+                        rcntl |= (1 << 8);
+                else
+                        rcntl &= ~(1 << 8);
+                /* 10M or 100M */
+                if (fep->phy_dev && fep->phy_dev->speed == SPEED_100)
+                        rcntl &= ~(1 << 9);
+                else
+                        rcntl |= (1 << 9);
+        } else {
+#ifdef FEC_MIIGSK_ENR
+                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) {
+                        /* disable the gasket and wait */
+                        writel(0, fep->hwp + FEC_MIIGSK_ENR);
+                        while (readl(fep->hwp + FEC_MIIGSK_ENR) & 4)
+                                udelay(1);
+                        /*
+                         * configure the gasket:
+                         *   RMII, 50 MHz, no loopback, no echo
+                         */
+                        writel(1, fep->hwp + FEC_MIIGSK_CFGR);
+                        /* re-enable the gasket */
+                        writel(2, fep->hwp + FEC_MIIGSK_ENR);
                }
-        } while (int_events);
+#endif
+        }
+        writel(rcntl, fep->hwp + FEC_R_CNTRL);
-        return ret;
+        /* And last, enable the transmit and receive processing */
+        writel(2, fep->hwp + FEC_ECNTRL);
+        writel(0, fep->hwp + FEC_R_DES_ACTIVE);
+        /* Enable interrupts we wish to service */
+        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
+}
+static void
+fec_stop(struct net_device *ndev)
+{
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        /* We cannot expect a graceful transmit stop without link !!! */
+        if (fep->link) {
+                writel(1, fep->hwp + FEC_X_CNTRL); /* Graceful transmit stop */
+                udelay(10);
+                if (!(readl(fep->hwp + FEC_IEVENT) & FEC_ENET_GRA))
+                        printk("fec_stop : Graceful transmit stop did not complete !\n");
+        }
+        /* Whack a reset.  We should wait for this. */
+        writel(1, fep->hwp + FEC_ECNTRL);
+        udelay(10);
+        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
+        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
 }
 static void
-fec_enet_tx(struct net_device *dev)
+fec_timeout(struct net_device *ndev)
+{
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        ndev->stats.tx_errors++;
+        fec_restart(ndev, fep->full_duplex);
+        netif_wake_queue(ndev);
+}
+static void
+fec_enet_tx(struct net_device *ndev)
 {
        struct  fec_enet_private *fep;
        struct bufdesc *bdp;
        unsigned short status;
        struct  sk_buff *skb;
-        fep = netdev_priv(dev);
+        fep = netdev_priv(ndev);
        spin_lock(&fep->hw_lock);
        bdp = fep->dirty_tx;
@@ -399,7 +499,8 @@ fec_enet_tx(struct net_device *dev)
                if (bdp == fep->cur_tx && fep->tx_full == 0)
                        break;
-                dma_unmap_single(&dev->dev, bdp->cbd_bufaddr, FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
+                dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
+                                FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
                bdp->cbd_bufaddr = 0;
                skb = fep->tx_skbuff[fep->skb_dirty];
@@ -407,19 +508,19 @@ fec_enet_tx(struct net_device *dev)
                if (status & (BD_ENET_TX_HB | BD_ENET_TX_LC |
                                   BD_ENET_TX_RL | BD_ENET_TX_UN |
                                   BD_ENET_TX_CSL)) {
-                        dev->stats.tx_errors++;
+                        ndev->stats.tx_errors++;
                        if (status & BD_ENET_TX_HB)  /* No heartbeat */
-                                dev->stats.tx_heartbeat_errors++;
+                                ndev->stats.tx_heartbeat_errors++;
                        if (status & BD_ENET_TX_LC)  /* Late collision */
-                                dev->stats.tx_window_errors++;
+                                ndev->stats.tx_window_errors++;
                        if (status & BD_ENET_TX_RL)  /* Retrans limit */
-                                dev->stats.tx_aborted_errors++;
+                                ndev->stats.tx_aborted_errors++;
                        if (status & BD_ENET_TX_UN)  /* Underrun */
-                                dev->stats.tx_fifo_errors++;
+                                ndev->stats.tx_fifo_errors++;
                        if (status & BD_ENET_TX_CSL) /* Carrier lost */
-                                dev->stats.tx_carrier_errors++;
+                                ndev->stats.tx_carrier_errors++;
                } else {
-                        dev->stats.tx_packets++;
+                        ndev->stats.tx_packets++;
                }
                if (status & BD_ENET_TX_READY)
@@ -429,7 +530,7 @@ fec_enet_tx(struct net_device *dev)
                 * but we eventually sent the packet OK.
                 */
                if (status & BD_ENET_TX_DEF)
-                        dev->stats.collisions++;
+                        ndev->stats.collisions++;
                /* Free the sk buffer associated with this last transmit */
                dev_kfree_skb_any(skb);
@@ -446,8 +547,8 @@ fec_enet_tx(struct net_device *dev)
                 */
                if (fep->tx_full) {
                        fep->tx_full = 0;
-                        if (netif_queue_stopped(dev))
+                        if (netif_queue_stopped(ndev))
-                                netif_wake_queue(dev);
+                                netif_wake_queue(ndev);
                }
        }
        fep->dirty_tx = bdp;
@@ -461,9 +562,9 @@ fec_enet_tx(struct net_device *dev)
 * effectively tossing the packet.
 */
 static void
-fec_enet_rx(struct net_device *dev)
+fec_enet_rx(struct net_device *ndev)
 {
-        struct  fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        const struct platform_device_id *id_entry =
                                platform_get_device_id(fep->pdev);
        struct bufdesc *bdp;
@@ -497,17 +598,17 @@ fec_enet_rx(struct net_device *dev)
                /* Check for errors. */
                if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |
                           BD_ENET_RX_CR | BD_ENET_RX_OV)) {
-                        dev->stats.rx_errors++;
+                        ndev->stats.rx_errors++;
                        if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH)) {
                                /* Frame too long or too short. */
-                                dev->stats.rx_length_errors++;
+                                ndev->stats.rx_length_errors++;
                        }
                        if (status & BD_ENET_RX_NO)     /* Frame alignment */
-                                dev->stats.rx_frame_errors++;
+                                ndev->stats.rx_frame_errors++;
                        if (status & BD_ENET_RX_CR)     /* CRC Error */
-                                dev->stats.rx_crc_errors++;
+                                ndev->stats.rx_crc_errors++;
                        if (status & BD_ENET_RX_OV)     /* FIFO overrun */
-                                dev->stats.rx_fifo_errors++;
+                                ndev->stats.rx_fifo_errors++;
                }
                /* Report late collisions as a frame error.
@@ -515,19 +616,19 @@ fec_enet_rx(struct net_device *dev)
                 * have in the buffer.  So, just drop this frame on the floor.
                 */
                if (status & BD_ENET_RX_CL) {
-                        dev->stats.rx_errors++;
+                        ndev->stats.rx_errors++;
-                        dev->stats.rx_frame_errors++;
+                        ndev->stats.rx_frame_errors++;
                        goto rx_processing_done;
                }
                /* Process the incoming frame. */
-                dev->stats.rx_packets++;
+                ndev->stats.rx_packets++;
                pkt_len = bdp->cbd_datlen;
-                dev->stats.rx_bytes += pkt_len;
+                ndev->stats.rx_bytes += pkt_len;
                data = (__u8*)__va(bdp->cbd_bufaddr);
-                dma_unmap_single(NULL, bdp->cbd_bufaddr, bdp->cbd_datlen,
+                dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
-                                DMA_FROM_DEVICE);
+                                FEC_ENET_TX_FRSIZE, DMA_FROM_DEVICE);
                if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME)
                        swap_buffer(data, pkt_len);
@@ -541,18 +642,18 @@ fec_enet_rx(struct net_device *dev)
                if (unlikely(!skb)) {
                        printk("%s: Memory squeeze, dropping packet.\n",
-                                        dev->name);
+                                        ndev->name);
-                        dev->stats.rx_dropped++;
+                        ndev->stats.rx_dropped++;
                } else {
                        skb_reserve(skb, NET_IP_ALIGN);
                        skb_put(skb, pkt_len - 4);      /* Make room */
                        skb_copy_to_linear_data(skb, data, pkt_len - 4);
-                        skb->protocol = eth_type_trans(skb, dev);
+                        skb->protocol = eth_type_trans(skb, ndev);
                        netif_rx(skb);
                }
-                bdp->cbd_bufaddr = dma_map_single(NULL, data, bdp->cbd_datlen,
+                bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, data,
-                        DMA_FROM_DEVICE);
+                                FEC_ENET_TX_FRSIZE, DMA_FROM_DEVICE);
 rx_processing_done:
                /* Clear the status flags for this buffer */
                status &= ~BD_ENET_RX_STATS;
@@ -577,10 +678,47 @@ rx_processing_done:
        spin_unlock(&fep->hw_lock);
 }
+static irqreturn_t
+fec_enet_interrupt(int irq, void *dev_id)
+{
+        struct net_device *ndev = dev_id;
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        uint int_events;
+        irqreturn_t ret = IRQ_NONE;
+        do {
+                int_events = readl(fep->hwp + FEC_IEVENT);
+                writel(int_events, fep->hwp + FEC_IEVENT);
+                if (int_events & FEC_ENET_RXF) {
+                        ret = IRQ_HANDLED;
+                        fec_enet_rx(ndev);
+                }
+                /* Transmit OK, or non-fatal error. Update the buffer
+                 * descriptors. FEC handles all errors, we just discover
+                 * them as part of the transmit process.
+                 */
+                if (int_events & FEC_ENET_TXF) {
+                        ret = IRQ_HANDLED;
+                        fec_enet_tx(ndev);
+                }
+                if (int_events & FEC_ENET_MII) {
+                        ret = IRQ_HANDLED;
+                        complete(&fep->mdio_done);
+                }
+        } while (int_events);
+        return ret;
+}
 /* ------------------------------------------------------------------------- */
-static void __inline__ fec_get_mac(struct net_device *dev)
+static void __inline__ fec_get_mac(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        struct fec_platform_data *pdata = fep->pdev->dev.platform_data;
        unsigned char *iap, tmpaddr[ETH_ALEN];
@@ -616,11 +754,11 @@ static void __inline__ fec_get_mac(struct net_device *dev)
                iap = &tmpaddr[0];
        }
-        memcpy(dev->dev_addr, iap, ETH_ALEN);
+        memcpy(ndev->dev_addr, iap, ETH_ALEN);
        /* Adjust MAC if using macaddr */
        if (iap == macaddr)
-                 dev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->pdev->id;
+                 ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->pdev->id;
 }
 /* ------------------------------------------------------------------------- */
@@ -628,9 +766,9 @@ static void __inline__ fec_get_mac(struct net_device *dev)
 /*
 * Phy section
 */
-static void fec_enet_adjust_link(struct net_device *dev)
+static void fec_enet_adjust_link(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        struct phy_device *phy_dev = fep->phy_dev;
        unsigned long flags;
@@ -647,7 +785,7 @@ static void fec_enet_adjust_link(struct net_device *dev)
        /* Duplex link change */
        if (phy_dev->link) {
                if (fep->full_duplex != phy_dev->duplex) {
-                        fec_restart(dev, phy_dev->duplex);
+                        fec_restart(ndev, phy_dev->duplex);
                        status_change = 1;
                }
        }
@@ -656,9 +794,9 @@ static void fec_enet_adjust_link(struct net_device *dev)
        if (phy_dev->link != fep->link) {
                fep->link = phy_dev->link;
                if (phy_dev->link)
-                        fec_restart(dev, phy_dev->duplex);
+                        fec_restart(ndev, phy_dev->duplex);
                else
-                        fec_stop(dev);
+                        fec_stop(ndev);
                status_change = 1;
        }
@@ -727,9 +865,9 @@ static int fec_enet_mdio_reset(struct mii_bus *bus)
        return 0;
 }
-static int fec_enet_mii_probe(struct net_device *dev)
+static int fec_enet_mii_probe(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        struct phy_device *phy_dev = NULL;
        char mdio_bus_id[MII_BUS_ID_SIZE];
        char phy_name[MII_BUS_ID_SIZE + 3];
@@ -754,16 +892,16 @@ static int fec_enet_mii_probe(struct net_device *dev)
        if (phy_id >= PHY_MAX_ADDR) {
                printk(KERN_INFO "%s: no PHY, assuming direct connection "
-                        "to switch\n", dev->name);
+                        "to switch\n", ndev->name);
                strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE);
                phy_id = 0;
        }
        snprintf(phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
-        phy_dev = phy_connect(dev, phy_name, &fec_enet_adjust_link, 0,
+        phy_dev = phy_connect(ndev, phy_name, &fec_enet_adjust_link, 0,
                PHY_INTERFACE_MODE_MII);
        if (IS_ERR(phy_dev)) {
-                printk(KERN_ERR "%s: could not attach to PHY\n", dev->name);
+                printk(KERN_ERR "%s: could not attach to PHY\n", ndev->name);
                return PTR_ERR(phy_dev);
        }
@@ -776,7 +914,7 @@ static int fec_enet_mii_probe(struct net_device *dev)
        fep->full_duplex = 0;
        printk(KERN_INFO "%s: Freescale FEC PHY driver [%s] "
-                "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name,
+                "(mii_bus:phy_addr=%s, irq=%d)\n", ndev->name,
                fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev),
                fep->phy_dev->irq);
@@ -786,8 +924,8 @@ static int fec_enet_mii_probe(struct net_device *dev)
 static int fec_enet_mii_init(struct platform_device *pdev)
 {
        static struct mii_bus *fec0_mii_bus;
-        struct net_device *dev = platform_get_drvdata(pdev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        const struct platform_device_id *id_entry =
                                platform_get_device_id(fep->pdev);
        int err = -ENXIO, i;
@@ -845,8 +983,6 @@ static int fec_enet_mii_init(struct platform_device *pdev)
        for (i = 0; i < PHY_MAX_ADDR; i++)
                fep->mii_bus->irq[i] = PHY_POLL;
-        platform_set_drvdata(dev, fep->mii_bus);
        if (mdiobus_register(fep->mii_bus))
                goto err_out_free_mdio_irq;
@@ -873,10 +1009,10 @@ static void fec_enet_mii_remove(struct fec_enet_private *fep)
        mdiobus_free(fep->mii_bus);
 }
-static int fec_enet_get_settings(struct net_device *dev,
+static int fec_enet_get_settings(struct net_device *ndev,
                                  struct ethtool_cmd *cmd)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        struct phy_device *phydev = fep->phy_dev;
        if (!phydev)
@@ -885,10 +1021,10 @@ static int fec_enet_get_settings(struct net_device *dev,
        return phy_ethtool_gset(phydev, cmd);
 }
-static int fec_enet_set_settings(struct net_device *dev,
+static int fec_enet_set_settings(struct net_device *ndev,
                                 struct ethtool_cmd *cmd)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        struct phy_device *phydev = fep->phy_dev;
        if (!phydev)
@@ -897,14 +1033,14 @@ static int fec_enet_set_settings(struct net_device *dev,
        return phy_ethtool_sset(phydev, cmd);
 }
-static void fec_enet_get_drvinfo(struct net_device *dev,
+static void fec_enet_get_drvinfo(struct net_device *ndev,
                                 struct ethtool_drvinfo *info)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        strcpy(info->driver, fep->pdev->dev.driver->name);
        strcpy(info->version, "Revision: 1.0");
-        strcpy(info->bus_info, dev_name(&dev->dev));
+        strcpy(info->bus_info, dev_name(&ndev->dev));
 }
 static struct ethtool_ops fec_enet_ethtool_ops = {
@@ -914,12 +1050,12 @@ static struct ethtool_ops fec_enet_ethtool_ops = {
        .get_link               = ethtool_op_get_link,
 };
-static int fec_enet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        struct phy_device *phydev = fep->phy_dev;
-        if (!netif_running(dev))
+        if (!netif_running(ndev))
                return -EINVAL;
        if (!phydev)
@@ -928,9 +1064,9 @@ static int fec_enet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        return phy_mii_ioctl(phydev, rq, cmd);
 }
-static void fec_enet_free_buffers(struct net_device *dev)
+static void fec_enet_free_buffers(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        int i;
        struct sk_buff *skb;
        struct bufdesc  *bdp;
@@ -940,7 +1076,7 @@ static void fec_enet_free_buffers(struct net_device *dev)
                skb = fep->rx_skbuff[i];
                if (bdp->cbd_bufaddr)
-                        dma_unmap_single(&dev->dev, bdp->cbd_bufaddr,
+                        dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
                                        FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);
                if (skb)
                        dev_kfree_skb(skb);
@@ -952,9 +1088,9 @@ static void fec_enet_free_buffers(struct net_device *dev)
                kfree(fep->tx_bounce[i]);
 }
-static int fec_enet_alloc_buffers(struct net_device *dev)
+static int fec_enet_alloc_buffers(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        int i;
        struct sk_buff *skb;
        struct bufdesc  *bdp;
@@ -963,12 +1099,12 @@ static int fec_enet_alloc_buffers(struct net_device *dev)
        for (i = 0; i < RX_RING_SIZE; i++) {
                skb = dev_alloc_skb(FEC_ENET_RX_FRSIZE);
                if (!skb) {
-                        fec_enet_free_buffers(dev);
+                        fec_enet_free_buffers(ndev);
                        return -ENOMEM;
                }
                fep->rx_skbuff[i] = skb;
-                bdp->cbd_bufaddr = dma_map_single(&dev->dev, skb->data,
+                bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, skb->data,
                                FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);
                bdp->cbd_sc = BD_ENET_RX_EMPTY;
                bdp++;
@@ -995,45 +1131,47 @@ static int fec_enet_alloc_buffers(struct net_device *dev)
 }
 static int
-fec_enet_open(struct net_device *dev)
+fec_enet_open(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        int ret;
        /* I should reset the ring buffers here, but I don't yet know
         * a simple way to do that.
         */
-        ret = fec_enet_alloc_buffers(dev);
+        ret = fec_enet_alloc_buffers(ndev);
        if (ret)
                return ret;
        /* Probe and connect to PHY when open the interface */
-        ret = fec_enet_mii_probe(dev);
+        ret = fec_enet_mii_probe(ndev);
        if (ret) {
-                fec_enet_free_buffers(dev);
+                fec_enet_free_buffers(ndev);
                return ret;
        }
        phy_start(fep->phy_dev);
-        netif_start_queue(dev);
+        netif_start_queue(ndev);
        fep->opened = 1;
        return 0;
 }
 static int
-fec_enet_close(struct net_device *dev)
+fec_enet_close(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        /* Don't know what to do yet. */
        fep->opened = 0;
-        netif_stop_queue(dev);
+        netif_stop_queue(ndev);
-        fec_stop(dev);
+        fec_stop(ndev);
-        if (fep->phy_dev)
+        if (fep->phy_dev) {
+                phy_stop(fep->phy_dev);
                phy_disconnect(fep->phy_dev);
+        }
-        fec_enet_free_buffers(dev);
+        fec_enet_free_buffers(ndev);
        return 0;
 }
@@ -1051,14 +1189,14 @@ fec_enet_close(struct net_device *dev)
 #define HASH_BITS       6               /* #bits in hash */
 #define CRC32_POLY      0xEDB88320
-static void set_multicast_list(struct net_device *dev)
+static void set_multicast_list(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        struct netdev_hw_addr *ha;
        unsigned int i, bit, data, crc, tmp;
        unsigned char hash;
-        if (dev->flags & IFF_PROMISC) {
+        if (ndev->flags & IFF_PROMISC) {
                tmp = readl(fep->hwp + FEC_R_CNTRL);
                tmp |= 0x8;
                writel(tmp, fep->hwp + FEC_R_CNTRL);
@@ -1069,7 +1207,7 @@ static void set_multicast_list(struct net_device *dev)
        tmp &= ~0x8;
        writel(tmp, fep->hwp + FEC_R_CNTRL);
-        if (dev->flags & IFF_ALLMULTI) {
+        if (ndev->flags & IFF_ALLMULTI) {
                /* Catch all multicast addresses, so set the
                 * filter to all 1's
                 */
@@ -1084,7 +1222,7 @@ static void set_multicast_list(struct net_device *dev)
        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH);
        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW);
-        netdev_for_each_mc_addr(ha, dev) {
+        netdev_for_each_mc_addr(ha, ndev) {
                /* Only support group multicast for now */
                if (!(ha->addr[0] & 1))
                        continue;
@@ -1092,7 +1230,7 @@ static void set_multicast_list(struct net_device *dev)
                /* calculate crc32 value of mac address */
                crc = 0xffffffff;
-                for (i = 0; i < dev->addr_len; i++) {
+                for (i = 0; i < ndev->addr_len; i++) {
                        data = ha->addr[i];
                        for (bit = 0; bit < 8; bit++, data >>= 1) {
                                crc = (crc >> 1) ^
@@ -1119,20 +1257,20 @@ static void set_multicast_list(struct net_device *dev)
 /* Set a MAC change in hardware. */
 static int
-fec_set_mac_address(struct net_device *dev, void *p)
+fec_set_mac_address(struct net_device *ndev, void *p)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        struct sockaddr *addr = p;
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
-        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);
-        writel(dev->dev_addr[3] | (dev->dev_addr[2] << 8) |
+        writel(ndev->dev_addr[3] | (ndev->dev_addr[2] << 8) |
-                (dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24),
+                (ndev->dev_addr[1] << 16) | (ndev->dev_addr[0] << 24),
                fep->hwp + FEC_ADDR_LOW);
-        writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24),
+        writel((ndev->dev_addr[5] << 16) | (ndev->dev_addr[4] << 24),
                fep->hwp + FEC_ADDR_HIGH);
        return 0;
 }
@@ -1146,16 +1284,16 @@ static const struct net_device_ops fec_netdev_ops = {
        .ndo_validate_addr      = eth_validate_addr,
        .ndo_tx_timeout         = fec_timeout,
        .ndo_set_mac_address    = fec_set_mac_address,
-        .ndo_do_ioctl           = fec_enet_ioctl,
+        .ndo_do_ioctl           = fec_enet_ioctl,
 };
 /*
  * XXX:  We need to clean up on failure exits here.
  *
  */
-static int fec_enet_init(struct net_device *dev)
+static int fec_enet_init(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
        struct bufdesc *cbd_base;
        struct bufdesc *bdp;
        int i;
@@ -1170,20 +1308,19 @@ static int fec_enet_init(struct net_device *dev)
        spin_lock_init(&fep->hw_lock);
-        fep->hwp = (void __iomem *)dev->base_addr;
+        fep->netdev = ndev;
-        fep->netdev = dev;
        /* Get the Ethernet address */
-        fec_get_mac(dev);
+        fec_get_mac(ndev);
        /* Set receive and transmit descriptor base. */
        fep->rx_bd_base = cbd_base;
        fep->tx_bd_base = cbd_base + RX_RING_SIZE;
        /* The FEC Ethernet specific entries in the device structure */
-        dev->watchdog_timeo = TX_TIMEOUT;
+        ndev->watchdog_timeo = TX_TIMEOUT;
-        dev->netdev_ops = &fec_netdev_ops;
+        ndev->netdev_ops = &fec_netdev_ops;
-        dev->ethtool_ops = &fec_enet_ethtool_ops;
+        ndev->ethtool_ops = &fec_enet_ethtool_ops;
        /* Initialize the receive buffer descriptors. */
        bdp = fep->rx_bd_base;
@@ -1212,152 +1349,11 @@ static int fec_enet_init(struct net_device *dev)
        bdp--;
        bdp->cbd_sc |= BD_SC_WRAP;
-        fec_restart(dev, 0);
+        fec_restart(ndev, 0);
        return 0;
 }
-/* This function is called to start or restart the FEC during a link
- * change.  This only happens when switching between half and full
- * duplex.
- */
-static void
-fec_restart(struct net_device *dev, int duplex)
-{
-        struct fec_enet_private *fep = netdev_priv(dev);
-        const struct platform_device_id *id_entry =
-                                platform_get_device_id(fep->pdev);
-        int i;
-        u32 val, temp_mac[2];
-        /* Whack a reset.  We should wait for this. */
-        writel(1, fep->hwp + FEC_ECNTRL);
-        udelay(10);
-        /*
-         * enet-mac reset will reset mac address registers too,
-         * so need to reconfigure it.
-         */
-        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
-                memcpy(&temp_mac, dev->dev_addr, ETH_ALEN);
-                writel(cpu_to_be32(temp_mac[0]), fep->hwp + FEC_ADDR_LOW);
-                writel(cpu_to_be32(temp_mac[1]), fep->hwp + FEC_ADDR_HIGH);
-        }
-        /* Clear any outstanding interrupt. */
-        writel(0xffc00000, fep->hwp + FEC_IEVENT);
-        /* Reset all multicast. */
-        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH);
-        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW);
-#ifndef CONFIG_M5272
-        writel(0, fep->hwp + FEC_HASH_TABLE_HIGH);
-        writel(0, fep->hwp + FEC_HASH_TABLE_LOW);
-#endif
-        /* Set maximum receive buffer size. */
-        writel(PKT_MAXBLR_SIZE, fep->hwp + FEC_R_BUFF_SIZE);
-        /* Set receive and transmit descriptor base. */
-        writel(fep->bd_dma, fep->hwp + FEC_R_DES_START);
-        writel((unsigned long)fep->bd_dma + sizeof(struct bufdesc) * RX_RING_SIZE,
-                        fep->hwp + FEC_X_DES_START);
-        fep->dirty_tx = fep->cur_tx = fep->tx_bd_base;
-        fep->cur_rx = fep->rx_bd_base;
-        /* Reset SKB transmit buffers. */
-        fep->skb_cur = fep->skb_dirty = 0;
-        for (i = 0; i <= TX_RING_MOD_MASK; i++) {
-                if (fep->tx_skbuff[i]) {
-                        dev_kfree_skb_any(fep->tx_skbuff[i]);
-                        fep->tx_skbuff[i] = NULL;
-                }
-        }
-        /* Enable MII mode */
-        if (duplex) {
-                /* MII enable / FD enable */
-                writel(OPT_FRAME_SIZE | 0x04, fep->hwp + FEC_R_CNTRL);
-                writel(0x04, fep->hwp + FEC_X_CNTRL);
-        } else {
-                /* MII enable / No Rcv on Xmit */
-                writel(OPT_FRAME_SIZE | 0x06, fep->hwp + FEC_R_CNTRL);
-                writel(0x0, fep->hwp + FEC_X_CNTRL);
-        }
-        fep->full_duplex = duplex;
-        /* Set MII speed */
-        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
-        /*
-         * The phy interface and speed need to get configured
-         * differently on enet-mac.
-         */
-        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
-                val = readl(fep->hwp + FEC_R_CNTRL);
-                /* MII or RMII */
-                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII)
-                        val |= (1 << 8);
-                else
-                        val &= ~(1 << 8);
-                /* 10M or 100M */
-                if (fep->phy_dev && fep->phy_dev->speed == SPEED_100)
-                        val &= ~(1 << 9);
-                else
-                        val |= (1 << 9);
-                writel(val, fep->hwp + FEC_R_CNTRL);
-        } else {
-#ifdef FEC_MIIGSK_ENR
-                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) {
-                        /* disable the gasket and wait */
-                        writel(0, fep->hwp + FEC_MIIGSK_ENR);
-                        while (readl(fep->hwp + FEC_MIIGSK_ENR) & 4)
-                                udelay(1);
-                        /*
-                         * configure the gasket:
-                         *   RMII, 50 MHz, no loopback, no echo
-                         */
-                        writel(1, fep->hwp + FEC_MIIGSK_CFGR);
-                        /* re-enable the gasket */
-                        writel(2, fep->hwp + FEC_MIIGSK_ENR);
-                }
-#endif
-        }
-        /* And last, enable the transmit and receive processing */
-        writel(2, fep->hwp + FEC_ECNTRL);
-        writel(0, fep->hwp + FEC_R_DES_ACTIVE);
-        /* Enable interrupts we wish to service */
-        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
-}
-static void
-fec_stop(struct net_device *dev)
-{
-        struct fec_enet_private *fep = netdev_priv(dev);
-        /* We cannot expect a graceful transmit stop without link !!! */
-        if (fep->link) {
-                writel(1, fep->hwp + FEC_X_CNTRL); /* Graceful transmit stop */
-                udelay(10);
-                if (!(readl(fep->hwp + FEC_IEVENT) & FEC_ENET_GRA))
-                        printk("fec_stop : Graceful transmit stop did not complete !\n");
-        }
-        /* Whack a reset.  We should wait for this. */
-        writel(1, fep->hwp + FEC_ECNTRL);
-        udelay(10);
-        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
-        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
-}
 static int __devinit
 fec_probe(struct platform_device *pdev)
 {
@@ -1377,19 +1373,20 @@ fec_probe(struct platform_device *pdev)
        /* Init network device */
        ndev = alloc_etherdev(sizeof(struct fec_enet_private));
-        if (!ndev)
+        if (!ndev) {
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto failed_alloc_etherdev;
+        }
        SET_NETDEV_DEV(ndev, &pdev->dev);
        /* setup board info structure */
        fep = netdev_priv(ndev);
-        memset(fep, 0, sizeof(*fep));
-        ndev->base_addr = (unsigned long)ioremap(r->start, resource_size(r));
+        fep->hwp = ioremap(r->start, resource_size(r));
        fep->pdev = pdev;
-        if (!ndev->base_addr) {
+        if (!fep->hwp) {
                ret = -ENOMEM;
                goto failed_ioremap;
        }
@@ -1407,10 +1404,9 @@ fec_probe(struct platform_device *pdev)
                        break;
                ret = request_irq(irq, fec_enet_interrupt, IRQF_DISABLED, pdev->name, ndev);
                if (ret) {
-                        while (i >= 0) {
+                        while (--i >= 0) {
                                irq = platform_get_irq(pdev, i);
                                free_irq(irq, ndev);
-                                i--;
                        }
                        goto failed_irq;
                }
@@ -1453,9 +1449,11 @@ failed_clk:
                        free_irq(irq, ndev);
        }
 failed_irq:
-        iounmap((void __iomem *)ndev->base_addr);
+        iounmap(fep->hwp);
 failed_ioremap:
        free_netdev(ndev);
+failed_alloc_etherdev:
+        release_mem_region(r->start, resource_size(r));
        return ret;
 }
@@ -1465,16 +1463,22 @@ fec_drv_remove(struct platform_device *pdev)
 {
        struct net_device *ndev = platform_get_drvdata(pdev);
        struct fec_enet_private *fep = netdev_priv(ndev);
+        struct resource *r;
-        platform_set_drvdata(pdev, NULL);
        fec_stop(ndev);
        fec_enet_mii_remove(fep);
        clk_disable(fep->clk);
        clk_put(fep->clk);
-        iounmap((void __iomem *)ndev->base_addr);
+        iounmap(fep->hwp);
        unregister_netdev(ndev);
        free_netdev(ndev);
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        BUG_ON(!r);
+        release_mem_region(r->start, resource_size(r));
+        platform_set_drvdata(pdev, NULL);
        return 0;
 }
@@ -1483,16 +1487,14 @@ static int
 fec_suspend(struct device *dev)
 {
        struct net_device *ndev = dev_get_drvdata(dev);
-        struct fec_enet_private *fep;
+        struct fec_enet_private *fep = netdev_priv(ndev);
-        if (ndev) {
+        if (netif_running(ndev)) {
-                fep = netdev_priv(ndev);
+                fec_stop(ndev);
-                if (netif_running(ndev)) {
+                netif_device_detach(ndev);
-                        fec_stop(ndev);
-                        netif_device_detach(ndev);
-                }
-                clk_disable(fep->clk);
        }
+        clk_disable(fep->clk);
        return 0;
 }
@@ -1500,16 +1502,14 @@ static int
 fec_resume(struct device *dev)
 {
        struct net_device *ndev = dev_get_drvdata(dev);
-        struct fec_enet_private *fep;
+        struct fec_enet_private *fep = netdev_priv(ndev);
-        if (ndev) {
+        clk_enable(fep->clk);
-                fep = netdev_priv(ndev);
+        if (netif_running(ndev)) {
-                clk_enable(fep->clk);
+                fec_restart(ndev, fep->full_duplex);
-                if (netif_running(ndev)) {
+                netif_device_attach(ndev);
-                        fec_restart(ndev, fep->full_duplex);
-                        netif_device_attach(ndev);
-                }
        }
        return 0;
 }
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index af09296ef0dd..9c0b1bac6af6 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5645,6 +5645,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                goto out_error;
        }
+        netif_carrier_off(dev);
        dev_info(&pci_dev->dev, "ifname %s, PHY OUI 0x%x @ %d, addr %pM\n",
                 dev->name, np->phy_oui, np->phyaddr, dev->dev_addr);
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 119aa2000c24..5ed8f9f9419f 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1920,7 +1920,7 @@ int startup_gfar(struct net_device *ndev)
                if (err) {
                        for (j = 0; j < i; j++)
                                free_grp_irqs(&priv->gfargrp[j]);
-                                goto irq_fail;
+                        goto irq_fail;
                }
        }
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index ac1d323c5eb5..8931168d3e74 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -400,13 +400,14 @@ static void *bpq_seq_start(struct seq_file *seq, loff_t *pos)
 static void *bpq_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        struct list_head *p;
+        struct bpqdev *bpqdev = v;
        ++*pos;
        if (v == SEQ_START_TOKEN)
-                p = rcu_dereference(bpq_devices.next);
+                p = rcu_dereference(list_next_rcu(&bpq_devices));
        else
-                p = rcu_dereference(((struct bpqdev *)v)->bpq_list.next);
+                p = rcu_dereference(list_next_rcu(&bpqdev->bpq_list));
        return (p == &bpq_devices) ? NULL 
                : list_entry(p, struct bpqdev, bpq_list);
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index 0a2368fa6bc6..65c1833244f7 100644
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -129,6 +129,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                break;
        case E1000_DEV_ID_82580_COPPER:
        case E1000_DEV_ID_82580_FIBER:
+        case E1000_DEV_ID_82580_QUAD_FIBER:
        case E1000_DEV_ID_82580_SERDES:
        case E1000_DEV_ID_82580_SGMII:
        case E1000_DEV_ID_82580_COPPER_DUAL:
@@ -237,9 +238,15 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                size = 14;
        nvm->word_size = 1 << size;
-        /* if 82576 then initialize mailbox parameters */
+        /* if part supports SR-IOV then initialize mailbox parameters */
-        if (mac->type == e1000_82576)
+        switch (mac->type) {
+        case e1000_82576:
+        case e1000_i350:
                igb_init_mbx_params_pf(hw);
+                break;
+        default:
+                break;
+        }
        /* setup PHY parameters */
        if (phy->media_type != e1000_media_type_copper) {
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index e2638afb8cdc..281324e85980 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -54,6 +54,7 @@ struct e1000_hw;
 #define E1000_DEV_ID_82580_SERDES             0x1510
 #define E1000_DEV_ID_82580_SGMII              0x1511
 #define E1000_DEV_ID_82580_COPPER_DUAL        0x1516
+#define E1000_DEV_ID_82580_QUAD_FIBER         0x1527
 #define E1000_DEV_ID_DH89XXCC_SGMII           0x0438
 #define E1000_DEV_ID_DH89XXCC_SERDES          0x043A
 #define E1000_DEV_ID_DH89XXCC_BACKPLANE       0x043C
diff --git a/drivers/net/igb/e1000_mbx.c b/drivers/net/igb/e1000_mbx.c
index c474cdb70047..78d48c7fa859 100644
--- a/drivers/net/igb/e1000_mbx.c
+++ b/drivers/net/igb/e1000_mbx.c
@@ -422,26 +422,24 @@ s32 igb_init_mbx_params_pf(struct e1000_hw *hw)
 {
        struct e1000_mbx_info *mbx = &hw->mbx;
-        if (hw->mac.type == e1000_82576) {
+        mbx->timeout = 0;
-                mbx->timeout = 0;
+        mbx->usec_delay = 0;
-                mbx->usec_delay = 0;
+        mbx->size = E1000_VFMAILBOX_SIZE;
-                mbx->size = E1000_VFMAILBOX_SIZE;
+        mbx->ops.read = igb_read_mbx_pf;
-                mbx->ops.read = igb_read_mbx_pf;
+        mbx->ops.write = igb_write_mbx_pf;
-                mbx->ops.write = igb_write_mbx_pf;
+        mbx->ops.read_posted = igb_read_posted_mbx;
-                mbx->ops.read_posted = igb_read_posted_mbx;
+        mbx->ops.write_posted = igb_write_posted_mbx;
-                mbx->ops.write_posted = igb_write_posted_mbx;
+        mbx->ops.check_for_msg = igb_check_for_msg_pf;
-                mbx->ops.check_for_msg = igb_check_for_msg_pf;
+        mbx->ops.check_for_ack = igb_check_for_ack_pf;
-                mbx->ops.check_for_ack = igb_check_for_ack_pf;
+        mbx->ops.check_for_rst = igb_check_for_rst_pf;
-                mbx->ops.check_for_rst = igb_check_for_rst_pf;
+        mbx->stats.msgs_tx = 0;
-                mbx->stats.msgs_tx = 0;
+        mbx->stats.msgs_rx = 0;
-                mbx->stats.msgs_rx = 0;
+        mbx->stats.reqs = 0;
-                mbx->stats.reqs = 0;
+        mbx->stats.acks = 0;
-                mbx->stats.acks = 0;
+        mbx->stats.rsts = 0;
-                mbx->stats.rsts = 0;
-        }
        return 0;
 }
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 58c665b7513d..cb6bf7b815ae 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -68,6 +68,7 @@ static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SGMII), board_82575 },
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER), board_82575 },
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_FIBER), board_82575 },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_QUAD_FIBER), board_82575 },
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SERDES), board_82575 },
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SGMII), board_82575 },
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER_DUAL), board_82575 },
@@ -2286,9 +2287,14 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
        spin_lock_init(&adapter->stats64_lock);
 #ifdef CONFIG_PCI_IOV
-        if (hw->mac.type == e1000_82576)
+        switch (hw->mac.type) {
+        case e1000_82576:
+        case e1000_i350:
                adapter->vfs_allocated_count = (max_vfs > 7) ? 7 : max_vfs;
+                break;
+        default:
+                break;
+        }
 #endif /* CONFIG_PCI_IOV */
        adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index 9e3f4f54281d..4488bd581eca 100644
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@ -635,7 +635,7 @@ static int sh_irda_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
        ret = sh_irda_set_baudrate(self, speed);
        if (ret < 0)
-                return ret;
+                goto sh_irda_hard_xmit_end;
        self->tx_buff.len = 0;
        if (skb->len) {
@@ -652,11 +652,21 @@ static int sh_irda_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
                sh_irda_write(self, IRTFLR, self->tx_buff.len);
                sh_irda_write(self, IRTCTR, ARMOD | TE);
-        }
+        } else
+                goto sh_irda_hard_xmit_end;
        dev_kfree_skb(skb);
        return 0;
+sh_irda_hard_xmit_end:
+        sh_irda_set_baudrate(self, 9600);
+        netif_wake_queue(self->ndev);
+        sh_irda_rcv_ctrl(self, 1);
+        dev_kfree_skb(skb);
+        return ret;
 }
 static int sh_irda_ioctl(struct net_device *ndev, struct ifreq *ifreq, int cmd)
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index 3b8c92463617..12769b58c2e7 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -334,6 +334,10 @@ struct ixgbe_adapter {
        u16 bd_number;
        struct work_struct reset_task;
        struct ixgbe_q_vector *q_vector[MAX_MSIX_Q_VECTORS];
+        /* DCB parameters */
+        struct ieee_pfc *ixgbe_ieee_pfc;
+        struct ieee_ets *ixgbe_ieee_ets;
        struct ixgbe_dcb_config dcb_cfg;
        struct ixgbe_dcb_config temp_dcb_cfg;
        u8 dcb_set_bitmap;
@@ -521,7 +525,6 @@ extern void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *,
 extern void ixgbe_alloc_rx_buffers(struct ixgbe_ring *, u16);
 extern void ixgbe_write_eitr(struct ixgbe_q_vector *);
 extern int ethtool_ioctl(struct ifreq *ifr);
-extern u8 ixgbe_dcb_txq_to_tc(struct ixgbe_adapter *adapter, u8 index);
 extern s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw);
 extern s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc);
 extern s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc);
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index d5ede2df3e42..ebbda7d15254 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -1370,6 +1370,9 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw)
                hw_dbg(hw, " New MAC Addr =%pM\n", hw->mac.addr);
                hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV);
+                /*  clear VMDq pool/queue selection for RAR 0 */
+                hw->mac.ops.clear_vmdq(hw, 0, IXGBE_CLEAR_VMDQ_ALL);
        }
        hw->addr_ctrl.overflow_promisc = 0;
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h
index 66ed045a8cf0..90cceb4a6317 100644
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ixgbe/ixgbe_common.h
@@ -29,6 +29,7 @@
 #define _IXGBE_COMMON_H_
 #include "ixgbe_type.h"
+#include "ixgbe.h"
 u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw);
 s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);
@@ -110,9 +111,8 @@ void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf);
 #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)
-extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw);
 #define hw_dbg(hw, format, arg...) \
-        netdev_dbg(ixgbe_get_hw_dev(hw), format, ##arg)
+        netdev_dbg(((struct ixgbe_adapter *)(hw->back))->netdev, format, ##arg)
 #define e_dev_info(format, arg...) \
        dev_info(&adapter->pdev->dev, format, ## arg)
 #define e_dev_warn(format, arg...) \
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c
index d16c260c1f50..13c962efbfc9 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.c
+++ b/drivers/net/ixgbe/ixgbe_dcb.c
@@ -34,6 +34,42 @@
 #include "ixgbe_dcb_82599.h"
 /**
+ * ixgbe_ieee_credits - This calculates the ieee traffic class
+ * credits from the configured bandwidth percentages. Credits
+ * are the smallest unit programable into the underlying
+ * hardware. The IEEE 802.1Qaz specification do not use bandwidth
+ * groups so this is much simplified from the CEE case.
+ */
+s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill, __u16 *max, int max_frame)
+{
+        int min_percent = 100;
+        int min_credit, multiplier;
+        int i;
+        min_credit = ((max_frame / 2) + DCB_CREDIT_QUANTUM - 1) /
+                        DCB_CREDIT_QUANTUM;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                if (bw[i] < min_percent && bw[i])
+                        min_percent = bw[i];
+        }
+        multiplier = (min_credit / min_percent) + 1;
+        /* Find out the hw credits for each TC */
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                int val = min(bw[i] * multiplier, MAX_CREDIT_REFILL);
+                if (val < min_credit)
+                        val = min_credit;
+                refill[i] = val;
+                max[i] = (bw[i] * MAX_CREDIT)/100;
+        }
+        return 0;
+}
+/**
 * ixgbe_dcb_calculate_tc_credits - Calculates traffic class credits
 * @ixgbe_dcb_config: Struct containing DCB settings.
 * @direction: Configuring either Tx or Rx.
@@ -141,6 +177,59 @@ out:
        return ret_val;
 }
+void ixgbe_dcb_unpack_pfc(struct ixgbe_dcb_config *cfg, u8 *pfc_en)
+{
+        int i;
+        *pfc_en = 0;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+                *pfc_en |= (cfg->tc_config[i].dcb_pfc & 0xF) << i;
+}
+void ixgbe_dcb_unpack_refill(struct ixgbe_dcb_config *cfg, int direction,
+                             u16 *refill)
+{
+        struct tc_bw_alloc *p;
+        int i;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                p = &cfg->tc_config[i].path[direction];
+                refill[i] = p->data_credits_refill;
+        }
+}
+void ixgbe_dcb_unpack_max(struct ixgbe_dcb_config *cfg, u16 *max)
+{
+        int i;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+                max[i] = cfg->tc_config[i].desc_credits_max;
+}
+void ixgbe_dcb_unpack_bwgid(struct ixgbe_dcb_config *cfg, int direction,
+                            u8 *bwgid)
+{
+        struct tc_bw_alloc *p;
+        int i;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                p = &cfg->tc_config[i].path[direction];
+                bwgid[i] = p->bwg_id;
+        }
+}
+void ixgbe_dcb_unpack_prio(struct ixgbe_dcb_config *cfg, int direction,
+                            u8 *ptype)
+{
+        struct tc_bw_alloc *p;
+        int i;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                p = &cfg->tc_config[i].path[direction];
+                ptype[i] = p->prio_type;
+        }
+}
 /**
 * ixgbe_dcb_hw_config - Config and enable DCB
 * @hw: pointer to hardware structure
@@ -152,13 +241,30 @@ s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw,
                        struct ixgbe_dcb_config *dcb_config)
 {
        s32 ret = 0;
+        u8 pfc_en;
+        u8 ptype[MAX_TRAFFIC_CLASS];
+        u8 bwgid[MAX_TRAFFIC_CLASS];
+        u16 refill[MAX_TRAFFIC_CLASS];
+        u16 max[MAX_TRAFFIC_CLASS];
+        /* Unpack CEE standard containers */
+        ixgbe_dcb_unpack_pfc(dcb_config, &pfc_en);
+        ixgbe_dcb_unpack_refill(dcb_config, DCB_TX_CONFIG, refill);
+        ixgbe_dcb_unpack_max(dcb_config, max);
+        ixgbe_dcb_unpack_bwgid(dcb_config, DCB_TX_CONFIG, bwgid);
+        ixgbe_dcb_unpack_prio(dcb_config, DCB_TX_CONFIG, ptype);
        switch (hw->mac.type) {
        case ixgbe_mac_82598EB:
-                ret = ixgbe_dcb_hw_config_82598(hw, dcb_config);
+                ret = ixgbe_dcb_hw_config_82598(hw, dcb_config->rx_pba_cfg,
+                                                pfc_en, refill, max, bwgid,
+                                                ptype);
                break;
        case ixgbe_mac_82599EB:
        case ixgbe_mac_X540:
-                ret = ixgbe_dcb_hw_config_82599(hw, dcb_config);
+                ret = ixgbe_dcb_hw_config_82599(hw, dcb_config->rx_pba_cfg,
+                                                pfc_en, refill, max, bwgid,
+                                                ptype);
                break;
        default:
                break;
@@ -166,3 +272,70 @@ s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw,
        return ret;
 }
+/* Helper routines to abstract HW specifics from DCB netlink ops */
+s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en)
+{
+        int ret = -EINVAL;
+        switch (hw->mac.type) {
+        case ixgbe_mac_82598EB:
+                ret = ixgbe_dcb_config_pfc_82598(hw, pfc_en);
+                break;
+        case ixgbe_mac_82599EB:
+        case ixgbe_mac_X540:
+                ret = ixgbe_dcb_config_pfc_82599(hw, pfc_en);
+                break;
+        default:
+                break;
+        }
+        return ret;
+}
+s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw,
+                            u16 *refill, u16 *max, u8 *bwg_id, u8 *tsa)
+{
+        int i;
+        u8 prio_type[IEEE_8021QAZ_MAX_TCS];
+        /* Map TSA onto CEE prio type */
+        for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
+                switch (tsa[i]) {
+                case IEEE_8021QAZ_TSA_STRICT:
+                        prio_type[i] = 2;
+                        break;
+                case IEEE_8021QAZ_TSA_ETS:
+                        prio_type[i] = 0;
+                        break;
+                default:
+                        /* Hardware only supports priority strict or
+                         * ETS transmission selection algorithms if
+                         * we receive some other value from dcbnl
+                         * throw an error
+                         */
+                        return -EINVAL;
+                }
+        }
+        switch (hw->mac.type) {
+        case ixgbe_mac_82598EB:
+                ixgbe_dcb_config_rx_arbiter_82598(hw, refill, max,
+                                                        prio_type);
+                ixgbe_dcb_config_tx_desc_arbiter_82598(hw, refill, max,
+                                                             bwg_id, prio_type);
+                ixgbe_dcb_config_tx_data_arbiter_82598(hw, refill, max,
+                                                             bwg_id, prio_type);
+                break;
+        case ixgbe_mac_82599EB:
+        case ixgbe_mac_X540:
+                ixgbe_dcb_config_rx_arbiter_82599(hw, refill, max,
+                                                  bwg_id, prio_type);
+                ixgbe_dcb_config_tx_desc_arbiter_82599(hw, refill, max,
+                                                       bwg_id, prio_type);
+                ixgbe_dcb_config_tx_data_arbiter_82599(hw, refill, max,
+                                                       bwg_id, prio_type);
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ixgbe/ixgbe_dcb.h
index 1cfe38ee1644..e5935114815e 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.h
+++ b/drivers/net/ixgbe/ixgbe_dcb.h
@@ -139,7 +139,6 @@ struct ixgbe_dcb_config {
        struct tc_configuration tc_config[MAX_TRAFFIC_CLASS];
        u8     bw_percentage[2][MAX_BW_GROUP]; /* One each for Tx/Rx */
        bool   pfc_mode_enable;
-        bool   round_robin_enable;
        enum dcb_rx_pba_cfg rx_pba_cfg;
@@ -148,12 +147,21 @@ struct ixgbe_dcb_config {
 };
 /* DCB driver APIs */
+void ixgbe_dcb_unpack_pfc(struct ixgbe_dcb_config *cfg, u8 *pfc_en);
+void ixgbe_dcb_unpack_refill(struct ixgbe_dcb_config *, int, u16 *);
+void ixgbe_dcb_unpack_max(struct ixgbe_dcb_config *, u16 *);
+void ixgbe_dcb_unpack_bwgid(struct ixgbe_dcb_config *, int, u8 *);
+void ixgbe_dcb_unpack_prio(struct ixgbe_dcb_config *, int, u8 *);
 /* DCB credits calculation */
+s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill, __u16 *max, int max_frame);
 s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_hw *,
                                   struct ixgbe_dcb_config *, int, u8);
 /* DCB hw initialization */
+s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw,
+                            u16 *refill, u16 *max, u8 *bwg_id, u8 *prio_type);
+s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en);
 s32 ixgbe_dcb_hw_config(struct ixgbe_hw *, struct ixgbe_dcb_config *);
 /* DCB definitions for credit calculation */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ixgbe/ixgbe_dcb_82598.c
index 9a5e89c12e05..2965edcdac7b 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82598.c
@@ -38,15 +38,14 @@
 *
 * Configure packet buffers for DCB mode.
 */
-static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw,
+static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw, u8 rx_pba)
-                                                 struct ixgbe_dcb_config *dcb_config)
 {
        s32 ret_val = 0;
        u32 value = IXGBE_RXPBSIZE_64KB;
        u8  i = 0;
        /* Setup Rx packet buffer sizes */
-        switch (dcb_config->rx_pba_cfg) {
+        switch (rx_pba) {
        case pba_80_48:
                /* Setup the first four at 80KB */
                value = IXGBE_RXPBSIZE_80KB;
@@ -78,10 +77,11 @@ static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw,
 *
 * Configure Rx Data Arbiter and credits for each traffic class.
 */
-static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
+s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
-                                      struct ixgbe_dcb_config *dcb_config)
+                                        u16 *refill,
+                                        u16 *max,
+                                        u8 *prio_type)
 {
-        struct tc_bw_alloc    *p;
        u32    reg           = 0;
        u32    credit_refill = 0;
        u32    credit_max    = 0;
@@ -102,13 +102,12 @@ static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
        /* Configure traffic class credits and priority */
        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_RX_CONFIG];
+                credit_refill = refill[i];
-                credit_refill = p->data_credits_refill;
+                credit_max    = max[i];
-                credit_max    = p->data_credits_max;
                reg = credit_refill | (credit_max << IXGBE_RT2CR_MCL_SHIFT);
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                        reg |= IXGBE_RT2CR_LSP;
                IXGBE_WRITE_REG(hw, IXGBE_RT2CR(i), reg);
@@ -135,10 +134,12 @@ static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
 *
 * Configure Tx Descriptor Arbiter and credits for each traffic class.
 */
-static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
+s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
-                                           struct ixgbe_dcb_config *dcb_config)
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type)
 {
-        struct tc_bw_alloc *p;
        u32    reg, max_credits;
        u8     i;
@@ -146,10 +147,8 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
        /* Enable arbiter */
        reg &= ~IXGBE_DPMCS_ARBDIS;
-        if (!(dcb_config->round_robin_enable)) {
+        /* Enable DFP and Recycle mode */
-                /* Enable DFP and Recycle mode */
+        reg |= (IXGBE_DPMCS_TDPAC | IXGBE_DPMCS_TRM);
-                reg |= (IXGBE_DPMCS_TDPAC | IXGBE_DPMCS_TRM);
-        }
        reg |= IXGBE_DPMCS_TSOEF;
        /* Configure Max TSO packet size 34KB including payload and headers */
        reg |= (0x4 << IXGBE_DPMCS_MTSOS_SHIFT);
@@ -158,16 +157,15 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
        /* Configure traffic class credits and priority */
        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG];
+                max_credits = max[i];
-                max_credits = dcb_config->tc_config[i].desc_credits_max;
                reg = max_credits << IXGBE_TDTQ2TCCR_MCL_SHIFT;
-                reg |= p->data_credits_refill;
+                reg |= refill[i];
-                reg |= (u32)(p->bwg_id) << IXGBE_TDTQ2TCCR_BWG_SHIFT;
+                reg |= (u32)(bwg_id[i]) << IXGBE_TDTQ2TCCR_BWG_SHIFT;
-                if (p->prio_type == prio_group)
+                if (prio_type[i] == prio_group)
                        reg |= IXGBE_TDTQ2TCCR_GSP;
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                        reg |= IXGBE_TDTQ2TCCR_LSP;
                IXGBE_WRITE_REG(hw, IXGBE_TDTQ2TCCR(i), reg);
@@ -183,10 +181,12 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
 *
 * Configure Tx Data Arbiter and credits for each traffic class.
 */
-static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
+s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
-                                           struct ixgbe_dcb_config *dcb_config)
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type)
 {
-        struct tc_bw_alloc *p;
        u32 reg;
        u8 i;
@@ -200,15 +200,14 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
        /* Configure traffic class credits and priority */
        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG];
+                reg = refill[i];
-                reg = p->data_credits_refill;
+                reg |= (u32)(max[i]) << IXGBE_TDPT2TCCR_MCL_SHIFT;
-                reg |= (u32)(p->data_credits_max) << IXGBE_TDPT2TCCR_MCL_SHIFT;
+                reg |= (u32)(bwg_id[i]) << IXGBE_TDPT2TCCR_BWG_SHIFT;
-                reg |= (u32)(p->bwg_id) << IXGBE_TDPT2TCCR_BWG_SHIFT;
-                if (p->prio_type == prio_group)
+                if (prio_type[i] == prio_group)
                        reg |= IXGBE_TDPT2TCCR_GSP;
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                        reg |= IXGBE_TDPT2TCCR_LSP;
                IXGBE_WRITE_REG(hw, IXGBE_TDPT2TCCR(i), reg);
@@ -229,13 +228,12 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
 *
 * Configure Priority Flow Control for each traffic class.
 */
-s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw,
+s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw, u8 pfc_en)
-                               struct ixgbe_dcb_config *dcb_config)
 {
        u32 reg, rx_pba_size;
        u8  i;
-        if (!dcb_config->pfc_mode_enable)
+        if (!pfc_en)
                goto out;
        /* Enable Transmit Priority Flow Control */
@@ -256,19 +254,20 @@ s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw,
         * for each traffic class.
         */
        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                int enabled = pfc_en & (1 << i);
                rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
                rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
                reg = (rx_pba_size - hw->fc.low_water) << 10;
-                if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx ||
+                if (enabled == pfc_enabled_tx ||
-                    dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full)
+                    enabled == pfc_enabled_full)
                        reg |= IXGBE_FCRTL_XONE;
                IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), reg);
                reg = (rx_pba_size - hw->fc.high_water) << 10;
-                if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx ||
+                if (enabled == pfc_enabled_tx ||
-                    dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full)
+                    enabled == pfc_enabled_full)
                        reg |= IXGBE_FCRTH_FCEN;
                IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), reg);
@@ -292,7 +291,7 @@ out:
 * Configure queue statistics registers, all queues belonging to same traffic
 * class uses a single set of queue statistics counters.
 */
-static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
+s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
 {
        u32 reg = 0;
        u8  i   = 0;
@@ -325,13 +324,16 @@ static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
 * Configure dcb settings and enable dcb mode.
 */
 s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw,
-                              struct ixgbe_dcb_config *dcb_config)
+                              u8 rx_pba, u8 pfc_en, u16 *refill,
+                              u16 *max, u8 *bwg_id, u8 *prio_type)
 {
-        ixgbe_dcb_config_packet_buffers_82598(hw, dcb_config);
+        ixgbe_dcb_config_packet_buffers_82598(hw, rx_pba);
-        ixgbe_dcb_config_rx_arbiter_82598(hw, dcb_config);
+        ixgbe_dcb_config_rx_arbiter_82598(hw, refill, max, prio_type);
-        ixgbe_dcb_config_tx_desc_arbiter_82598(hw, dcb_config);
+        ixgbe_dcb_config_tx_desc_arbiter_82598(hw, refill, max,
-        ixgbe_dcb_config_tx_data_arbiter_82598(hw, dcb_config);
+                                               bwg_id, prio_type);
-        ixgbe_dcb_config_pfc_82598(hw, dcb_config);
+        ixgbe_dcb_config_tx_data_arbiter_82598(hw, refill, max,
+                                               bwg_id, prio_type);
+        ixgbe_dcb_config_pfc_82598(hw, pfc_en);
        ixgbe_dcb_config_tc_stats_82598(hw);
        return 0;
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ixgbe/ixgbe_dcb_82598.h
index abc03ccfa088..0d2a758effce 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.h
+++ b/drivers/net/ixgbe/ixgbe_dcb_82598.h
@@ -71,9 +71,28 @@
 /* DCB hardware-specific driver APIs */
 /* DCB PFC functions */
-s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);
+s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, u8 pfc_en);
 /* DCB hw initialization */
-s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);
+s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
+                                        u16 *refill,
+                                        u16 *max,
+                                        u8 *prio_type);
+s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type);
+s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type);
+s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw,
+                              u8 rx_pba, u8 pfc_en, u16 *refill,
+                              u16 *max, u8 *bwg_id, u8 *prio_type);
 #endif /* _DCB_82598_CONFIG_H */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/ixgbe_dcb_82599.c
index 374e1f74d0f5..b0d97a98c84d 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.c
@@ -33,19 +33,18 @@
 /**
 * ixgbe_dcb_config_packet_buffers_82599 - Configure DCB packet buffers
 * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @rx_pba: method to distribute packet buffer
 *
 * Configure packet buffers for DCB mode.
 */
-static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw,
+static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw, u8 rx_pba)
-                                          struct ixgbe_dcb_config *dcb_config)
 {
        s32 ret_val = 0;
        u32 value = IXGBE_RXPBSIZE_64KB;
        u8  i = 0;
        /* Setup Rx packet buffer sizes */
-        switch (dcb_config->rx_pba_cfg) {
+        switch (rx_pba) {
        case pba_80_48:
                /* Setup the first four at 80KB */
                value = IXGBE_RXPBSIZE_80KB;
@@ -75,14 +74,19 @@ static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw,
 /**
 * ixgbe_dcb_config_rx_arbiter_82599 - Config Rx Data arbiter
 * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
 *
 * Configure Rx Packet Arbiter and credits for each traffic class.
 */
-static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
+s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
-                                      struct ixgbe_dcb_config *dcb_config)
+                                      u16 *refill,
+                                      u16 *max,
+                                      u8 *bwg_id,
+                                      u8 *prio_type)
 {
-        struct tc_bw_alloc    *p;
        u32    reg           = 0;
        u32    credit_refill = 0;
        u32    credit_max    = 0;
@@ -103,15 +107,13 @@ static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
        /* Configure traffic class credits and priority */
        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_RX_CONFIG];
+                credit_refill = refill[i];
+                credit_max    = max[i];
-                credit_refill = p->data_credits_refill;
-                credit_max    = p->data_credits_max;
                reg = credit_refill | (credit_max << IXGBE_RTRPT4C_MCL_SHIFT);
-                reg |= (u32)(p->bwg_id) << IXGBE_RTRPT4C_BWG_SHIFT;
+                reg |= (u32)(bwg_id[i]) << IXGBE_RTRPT4C_BWG_SHIFT;
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                        reg |= IXGBE_RTRPT4C_LSP;
                IXGBE_WRITE_REG(hw, IXGBE_RTRPT4C(i), reg);
@@ -130,14 +132,19 @@ static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
 /**
 * ixgbe_dcb_config_tx_desc_arbiter_82599 - Config Tx Desc. arbiter
 * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
 *
 * Configure Tx Descriptor Arbiter and credits for each traffic class.
 */
-static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
+s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
-                                           struct ixgbe_dcb_config *dcb_config)
+                                           u16 *refill,
+                                           u16 *max,
+                                           u8 *bwg_id,
+                                           u8 *prio_type)
 {
-        struct tc_bw_alloc *p;
        u32    reg, max_credits;
        u8     i;
@@ -149,16 +156,15 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
        /* Configure traffic class credits and priority */
        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG];
+                max_credits = max[i];
-                max_credits = dcb_config->tc_config[i].desc_credits_max;
                reg = max_credits << IXGBE_RTTDT2C_MCL_SHIFT;
-                reg |= p->data_credits_refill;
+                reg |= refill[i];
-                reg |= (u32)(p->bwg_id) << IXGBE_RTTDT2C_BWG_SHIFT;
+                reg |= (u32)(bwg_id[i]) << IXGBE_RTTDT2C_BWG_SHIFT;
-                if (p->prio_type == prio_group)
+                if (prio_type[i] == prio_group)
                        reg |= IXGBE_RTTDT2C_GSP;
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                        reg |= IXGBE_RTTDT2C_LSP;
                IXGBE_WRITE_REG(hw, IXGBE_RTTDT2C(i), reg);
@@ -177,14 +183,19 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
 /**
 * ixgbe_dcb_config_tx_data_arbiter_82599 - Config Tx Data arbiter
 * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
 *
 * Configure Tx Packet Arbiter and credits for each traffic class.
 */
-static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
+s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
-                                           struct ixgbe_dcb_config *dcb_config)
+                                           u16 *refill,
+                                           u16 *max,
+                                           u8 *bwg_id,
+                                           u8 *prio_type)
 {
-        struct tc_bw_alloc *p;
        u32 reg;
        u8 i;
@@ -205,15 +216,14 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
        /* Configure traffic class credits and priority */
        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG];
+                reg = refill[i];
-                reg = p->data_credits_refill;
+                reg |= (u32)(max[i]) << IXGBE_RTTPT2C_MCL_SHIFT;
-                reg |= (u32)(p->data_credits_max) << IXGBE_RTTPT2C_MCL_SHIFT;
+                reg |= (u32)(bwg_id[i]) << IXGBE_RTTPT2C_BWG_SHIFT;
-                reg |= (u32)(p->bwg_id) << IXGBE_RTTPT2C_BWG_SHIFT;
-                if (p->prio_type == prio_group)
+                if (prio_type[i] == prio_group)
                        reg |= IXGBE_RTTPT2C_GSP;
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                        reg |= IXGBE_RTTPT2C_LSP;
                IXGBE_WRITE_REG(hw, IXGBE_RTTPT2C(i), reg);
@@ -233,17 +243,16 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
 /**
 * ixgbe_dcb_config_pfc_82599 - Configure priority flow control
 * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @pfc_en: enabled pfc bitmask
 *
 * Configure Priority Flow Control (PFC) for each traffic class.
 */
-s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw,
+s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en)
-                               struct ixgbe_dcb_config *dcb_config)
 {
        u32 i, reg, rx_pba_size;
        /* If PFC is disabled globally then fall back to LFC. */
-        if (!dcb_config->pfc_mode_enable) {
+        if (!pfc_en) {
                for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
                        hw->mac.ops.fc_enable(hw, i);
                goto out;
@@ -251,19 +260,18 @@ s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw,
        /* Configure PFC Tx thresholds per TC */
        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                int enabled = pfc_en & (1 << i);
                rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
                rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
                reg = (rx_pba_size - hw->fc.low_water) << 10;
-                if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full ||
+                if (enabled)
-                    dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx)
                        reg |= IXGBE_FCRTL_XONE;
                IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), reg);
                reg = (rx_pba_size - hw->fc.high_water) << 10;
-                if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full ||
+                if (enabled)
-                    dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx)
                        reg |= IXGBE_FCRTH_FCEN;
                IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), reg);
        }
@@ -349,7 +357,6 @@ static s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw)
 /**
 * ixgbe_dcb_config_82599 - Configure general DCB parameters
 * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
 *
 * Configure general DCB parameters.
 */
@@ -406,19 +413,27 @@ static s32 ixgbe_dcb_config_82599(struct ixgbe_hw *hw)
 /**
 * ixgbe_dcb_hw_config_82599 - Configure and enable DCB
 * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @rx_pba: method to distribute packet buffer
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
+ * @pfc_en: enabled pfc bitmask
 *
 * Configure dcb settings and enable dcb mode.
 */
 s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw,
-                              struct ixgbe_dcb_config *dcb_config)
+                              u8 rx_pba, u8 pfc_en, u16 *refill,
+                              u16 *max, u8 *bwg_id, u8 *prio_type)
 {
-        ixgbe_dcb_config_packet_buffers_82599(hw, dcb_config);
+        ixgbe_dcb_config_packet_buffers_82599(hw, rx_pba);
        ixgbe_dcb_config_82599(hw);
-        ixgbe_dcb_config_rx_arbiter_82599(hw, dcb_config);
+        ixgbe_dcb_config_rx_arbiter_82599(hw, refill, max, bwg_id, prio_type);
-        ixgbe_dcb_config_tx_desc_arbiter_82599(hw, dcb_config);
+        ixgbe_dcb_config_tx_desc_arbiter_82599(hw, refill, max,
-        ixgbe_dcb_config_tx_data_arbiter_82599(hw, dcb_config);
+                                               bwg_id, prio_type);
-        ixgbe_dcb_config_pfc_82599(hw, dcb_config);
+        ixgbe_dcb_config_tx_data_arbiter_82599(hw, refill, max,
+                                               bwg_id, prio_type);
+        ixgbe_dcb_config_pfc_82599(hw, pfc_en);
        ixgbe_dcb_config_tc_stats_82599(hw);
        return 0;
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ixgbe/ixgbe_dcb_82599.h
index 3841649fb954..5b0ca85614d1 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.h
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.h
@@ -102,11 +102,29 @@
 /* DCB hardware-specific driver APIs */
 /* DCB PFC functions */
-s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw,
+s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en);
-                               struct ixgbe_dcb_config *dcb_config);
 /* DCB hw initialization */
+s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
+                                        u16 *refill,
+                                        u16 *max,
+                                        u8 *bwg_id,
+                                        u8 *prio_type);
+s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type);
+s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type);
 s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw,
-                              struct ixgbe_dcb_config *config);
+                              u8 rx_pba, u8 pfc_en, u16 *refill,
+                              u16 *max, u8 *bwg_id, u8 *prio_type);
 #endif /* _DCB_82599_CONFIG_H */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index bf566e8a455e..a977df3fe81b 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -37,7 +37,6 @@
 #define BIT_PG_RX       0x04
 #define BIT_PG_TX       0x08
 #define BIT_APP_UPCHG   0x10
-#define BIT_RESETLINK   0x40
 #define BIT_LINKSPEED   0x80
 /* Responses for the DCB_C_SET_ALL command */
@@ -225,10 +224,8 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc,
            (adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_percent !=
             adapter->dcb_cfg.tc_config[tc].path[0].bwg_percent) ||
            (adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap)) {
+             adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap))
                adapter->dcb_set_bitmap |= BIT_PG_TX;
-                adapter->dcb_set_bitmap |= BIT_RESETLINK;
-        }
 }
 static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
@@ -239,10 +236,8 @@ static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
        adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] = bw_pct;
        if (adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] !=
-            adapter->dcb_cfg.bw_percentage[0][bwg_id]) {
+            adapter->dcb_cfg.bw_percentage[0][bwg_id])
                adapter->dcb_set_bitmap |= BIT_PG_TX;
-                adapter->dcb_set_bitmap |= BIT_RESETLINK;
-        }
 }
 static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
@@ -269,10 +264,8 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
            (adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_percent !=
             adapter->dcb_cfg.tc_config[tc].path[1].bwg_percent) ||
            (adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap)) {
+             adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap))
                adapter->dcb_set_bitmap |= BIT_PG_RX;
-                adapter->dcb_set_bitmap |= BIT_RESETLINK;
-        }
 }
 static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
@@ -283,10 +276,8 @@ static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
        adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] = bw_pct;
        if (adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] !=
-            adapter->dcb_cfg.bw_percentage[1][bwg_id]) {
+            adapter->dcb_cfg.bw_percentage[1][bwg_id])
                adapter->dcb_set_bitmap |= BIT_PG_RX;
-                adapter->dcb_set_bitmap |= BIT_RESETLINK;
-        }
 }
 static void ixgbe_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int tc,
@@ -365,21 +356,17 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
                return DCB_NO_HW_CHG;
        /*
-         * Only take down the adapter if the configuration change
+         * Only take down the adapter if an app change occured. FCoE
-         * requires a reset.
+         * may shuffle tx rings in this case and this can not be done
+         * without a reset currently.
         */
-        if (adapter->dcb_set_bitmap & BIT_RESETLINK) {
+        if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
                while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
                        msleep(1);
-                if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
+                if (netif_running(netdev))
-                        if (netif_running(netdev))
+                        netdev->netdev_ops->ndo_stop(netdev);
-                                netdev->netdev_ops->ndo_stop(netdev);
+                ixgbe_clear_interrupt_scheme(adapter);
-                        ixgbe_clear_interrupt_scheme(adapter);
-                } else {
-                        if (netif_running(netdev))
-                                ixgbe_down(adapter);
-                }
        }
        if (adapter->dcb_cfg.pfc_mode_enable) {
@@ -408,29 +395,51 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
                }
        }
-        if (adapter->dcb_set_bitmap & BIT_RESETLINK) {
+        if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
-                if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
+                ixgbe_init_interrupt_scheme(adapter);
-                        ixgbe_init_interrupt_scheme(adapter);
+                if (netif_running(netdev))
-                        if (netif_running(netdev))
+                        netdev->netdev_ops->ndo_open(netdev);
-                                netdev->netdev_ops->ndo_open(netdev);
-                } else {
-                        if (netif_running(netdev))
-                                ixgbe_up(adapter);
-                }
                ret = DCB_HW_CHG_RST;
-        } else if (adapter->dcb_set_bitmap & BIT_PFC) {
+        }
-                if (adapter->hw.mac.type == ixgbe_mac_82598EB)
-                        ixgbe_dcb_config_pfc_82598(&adapter->hw,
+        if (adapter->dcb_set_bitmap & BIT_PFC) {
-                                                   &adapter->dcb_cfg);
+                u8 pfc_en;
-                else if (adapter->hw.mac.type == ixgbe_mac_82599EB)
+                ixgbe_dcb_unpack_pfc(&adapter->dcb_cfg, &pfc_en);
-                        ixgbe_dcb_config_pfc_82599(&adapter->hw,
+                ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc_en);
-                                                   &adapter->dcb_cfg);
                ret = DCB_HW_CHG;
        }
+        if (adapter->dcb_set_bitmap & (BIT_PG_TX|BIT_PG_RX)) {
+                u16 refill[MAX_TRAFFIC_CLASS], max[MAX_TRAFFIC_CLASS];
+                u8 bwg_id[MAX_TRAFFIC_CLASS], prio_type[MAX_TRAFFIC_CLASS];
+                int max_frame = adapter->netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+#ifdef CONFIG_FCOE
+                if (adapter->netdev->features & NETIF_F_FCOE_MTU)
+                        max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
+#endif
+                ixgbe_dcb_calculate_tc_credits(&adapter->hw, &adapter->dcb_cfg,
+                                               max_frame, DCB_TX_CONFIG);
+                ixgbe_dcb_calculate_tc_credits(&adapter->hw, &adapter->dcb_cfg,
+                                               max_frame, DCB_RX_CONFIG);
+                ixgbe_dcb_unpack_refill(&adapter->dcb_cfg,
+                                        DCB_TX_CONFIG, refill);
+                ixgbe_dcb_unpack_max(&adapter->dcb_cfg, max);
+                ixgbe_dcb_unpack_bwgid(&adapter->dcb_cfg,
+                                       DCB_TX_CONFIG, bwg_id);
+                ixgbe_dcb_unpack_prio(&adapter->dcb_cfg,
+                                      DCB_TX_CONFIG, prio_type);
+                ixgbe_dcb_hw_ets_config(&adapter->hw, refill, max,
+                                        bwg_id, prio_type);
+        }
        if (adapter->dcb_cfg.pfc_mode_enable)
                adapter->hw.fc.current_mode = ixgbe_fc_pfc;
-        if (adapter->dcb_set_bitmap & BIT_RESETLINK)
+        if (adapter->dcb_set_bitmap & BIT_APP_UPCHG)
                clear_bit(__IXGBE_RESETTING, &adapter->state);
        adapter->dcb_set_bitmap = 0x00;
        return ret;
@@ -568,18 +577,29 @@ static u8 ixgbe_dcbnl_setapp(struct net_device *netdev,
        case DCB_APP_IDTYPE_ETHTYPE:
 #ifdef IXGBE_FCOE
                if (id == ETH_P_FCOE) {
-                        u8 tc;
+                        u8 old_tc;
-                        struct ixgbe_adapter *adapter;
+                        struct ixgbe_adapter *adapter = netdev_priv(netdev);
-                        adapter = netdev_priv(netdev);
+                        /* Get current programmed tc */
-                        tc = adapter->fcoe.tc;
+                        old_tc = adapter->fcoe.tc;
                        rval = ixgbe_fcoe_setapp(adapter, up);
-                        if ((!rval) && (tc != adapter->fcoe.tc) &&
-                            (adapter->flags & IXGBE_FLAG_DCB_ENABLED) &&
+                        if (rval ||
-                            (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)) {
+                           !(adapter->flags & IXGBE_FLAG_DCB_ENABLED) ||
+                           !(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
+                                break;
+                        /* The FCoE application priority may be changed multiple
+                         * times in quick sucession with switches that build up
+                         * TLVs. To avoid creating uneeded device resets this
+                         * checks the actual HW configuration and clears
+                         * BIT_APP_UPCHG if a HW configuration change is not
+                         * need
+                         */
+                        if (old_tc == adapter->fcoe.tc)
+                                adapter->dcb_set_bitmap &= ~BIT_APP_UPCHG;
+                        else
                                adapter->dcb_set_bitmap |= BIT_APP_UPCHG;
-                                adapter->dcb_set_bitmap |= BIT_RESETLINK;
-                        }
                }
 #endif
                break;
@@ -591,7 +611,98 @@ static u8 ixgbe_dcbnl_setapp(struct net_device *netdev,
        return rval;
 }
+static int ixgbe_dcbnl_ieee_getets(struct net_device *dev,
+                                   struct ieee_ets *ets)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        struct ieee_ets *my_ets = adapter->ixgbe_ieee_ets;
+        /* No IEEE PFC settings available */
+        if (!my_ets)
+                return -EINVAL;
+        ets->ets_cap = MAX_TRAFFIC_CLASS;
+        ets->cbs = my_ets->cbs;
+        memcpy(ets->tc_tx_bw, my_ets->tc_tx_bw, sizeof(ets->tc_tx_bw));
+        memcpy(ets->tc_rx_bw, my_ets->tc_rx_bw, sizeof(ets->tc_rx_bw));
+        memcpy(ets->tc_tsa, my_ets->tc_tsa, sizeof(ets->tc_tsa));
+        memcpy(ets->prio_tc, my_ets->prio_tc, sizeof(ets->prio_tc));
+        return 0;
+}
+static int ixgbe_dcbnl_ieee_setets(struct net_device *dev,
+                                   struct ieee_ets *ets)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        __u16 refill[IEEE_8021QAZ_MAX_TCS], max[IEEE_8021QAZ_MAX_TCS];
+        int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;
+        int err;
+        /* naively give each TC a bwg to map onto CEE hardware */
+        __u8 bwg_id[IEEE_8021QAZ_MAX_TCS] = {0, 1, 2, 3, 4, 5, 6, 7};
+        if (!adapter->ixgbe_ieee_ets) {
+                adapter->ixgbe_ieee_ets = kmalloc(sizeof(struct ieee_ets),
+                                                  GFP_KERNEL);
+                if (!adapter->ixgbe_ieee_ets)
+                        return -ENOMEM;
+        }
+        memcpy(adapter->ixgbe_ieee_ets, ets, sizeof(*adapter->ixgbe_ieee_ets));
+        ixgbe_ieee_credits(ets->tc_tx_bw, refill, max, max_frame);
+        err = ixgbe_dcb_hw_ets_config(&adapter->hw, refill, max,
+                                      bwg_id, ets->tc_tsa);
+        return err;
+}
+static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,
+                                   struct ieee_pfc *pfc)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        struct ieee_pfc *my_pfc = adapter->ixgbe_ieee_pfc;
+        int i;
+        /* No IEEE PFC settings available */
+        if (!my_pfc)
+                return -EINVAL;
+        pfc->pfc_cap = MAX_TRAFFIC_CLASS;
+        pfc->pfc_en = my_pfc->pfc_en;
+        pfc->mbc = my_pfc->mbc;
+        pfc->delay = my_pfc->delay;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                pfc->requests[i] = adapter->stats.pxoffrxc[i];
+                pfc->indications[i] = adapter->stats.pxofftxc[i];
+        }
+        return 0;
+}
+static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,
+                                   struct ieee_pfc *pfc)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        int err;
+        if (!adapter->ixgbe_ieee_pfc) {
+                adapter->ixgbe_ieee_pfc = kmalloc(sizeof(struct ieee_pfc),
+                                                  GFP_KERNEL);
+                if (!adapter->ixgbe_ieee_pfc)
+                        return -ENOMEM;
+        }
+        memcpy(adapter->ixgbe_ieee_pfc, pfc, sizeof(*adapter->ixgbe_ieee_pfc));
+        err = ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc->pfc_en);
+        return err;
+}
 const struct dcbnl_rtnl_ops dcbnl_ops = {
+        .ieee_getets    = ixgbe_dcbnl_ieee_getets,
+        .ieee_setets    = ixgbe_dcbnl_ieee_setets,
+        .ieee_getpfc    = ixgbe_dcbnl_ieee_getpfc,
+        .ieee_setpfc    = ixgbe_dcbnl_ieee_setpfc,
        .getstate       = ixgbe_dcbnl_get_state,
        .setstate       = ixgbe_dcbnl_set_state,
        .getpermhwaddr  = ixgbe_dcbnl_get_perm_hw_addr,
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 2002ea88ca2a..309272f8f103 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -152,7 +152,17 @@ static int ixgbe_get_settings(struct net_device *netdev,
                ecmd->supported |= (SUPPORTED_1000baseT_Full |
                                    SUPPORTED_Autoneg);
+                switch (hw->mac.type) {
+                case ixgbe_mac_X540:
+                        ecmd->supported |= SUPPORTED_100baseT_Full;
+                        break;
+                default:
+                        break;
+                }
                ecmd->advertising = ADVERTISED_Autoneg;
+                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
+                        ecmd->advertising |= ADVERTISED_100baseT_Full;
                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
                        ecmd->advertising |= ADVERTISED_10000baseT_Full;
                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
@@ -167,6 +177,15 @@ static int ixgbe_get_settings(struct net_device *netdev,
                        ecmd->advertising |= (ADVERTISED_10000baseT_Full |
                                              ADVERTISED_1000baseT_Full);
+                switch (hw->mac.type) {
+                case ixgbe_mac_X540:
+                        if (!(ecmd->advertising & ADVERTISED_100baseT_Full))
+                                ecmd->advertising |= (ADVERTISED_100baseT_Full);
+                        break;
+                default:
+                        break;
+                }
                if (hw->phy.media_type == ixgbe_media_type_copper) {
                        ecmd->supported |= SUPPORTED_TP;
                        ecmd->advertising |= ADVERTISED_TP;
@@ -271,8 +290,19 @@ static int ixgbe_get_settings(struct net_device *netdev,
        hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
        if (link_up) {
-                ecmd->speed = (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
+                switch (link_speed) {
-                               SPEED_10000 : SPEED_1000;
+                case IXGBE_LINK_SPEED_10GB_FULL:
+                        ecmd->speed = SPEED_10000;
+                        break;
+                case IXGBE_LINK_SPEED_1GB_FULL:
+                        ecmd->speed = SPEED_1000;
+                        break;
+                case IXGBE_LINK_SPEED_100_FULL:
+                        ecmd->speed = SPEED_100;
+                        break;
+                default:
+                        break;
+                }
                ecmd->duplex = DUPLEX_FULL;
        } else {
                ecmd->speed = -1;
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index 6342d4859790..c54a88274d51 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -159,13 +159,13 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
        struct scatterlist *sg;
        unsigned int i, j, dmacount;
        unsigned int len;
-        static const unsigned int bufflen = 4096;
+        static const unsigned int bufflen = IXGBE_FCBUFF_MIN;
        unsigned int firstoff = 0;
        unsigned int lastsize;
        unsigned int thisoff = 0;
        unsigned int thislen = 0;
        u32 fcbuff, fcdmarw, fcfltrw;
-        dma_addr_t addr;
+        dma_addr_t addr = 0;
        if (!netdev || !sgl)
                return 0;
@@ -254,6 +254,24 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
        /* only the last buffer may have non-full bufflen */
        lastsize = thisoff + thislen;
+        /*
+         * lastsize can not be buffer len.
+         * If it is then adding another buffer with lastsize = 1.
+         */
+        if (lastsize == bufflen) {
+                if (j >= IXGBE_BUFFCNT_MAX) {
+                        e_err(drv, "xid=%x:%d,%d,%d:addr=%llx "
+                                "not enough user buffers. We need an extra "
+                                "buffer because lastsize is bufflen.\n",
+                                xid, i, j, dmacount, (u64)addr);
+                        goto out_noddp_free;
+                }
+                ddp->udl[j] = (u64)(fcoe->extra_ddp_buffer_dma);
+                j++;
+                lastsize = 1;
+        }
        fcbuff = (IXGBE_FCBUFF_4KB << IXGBE_FCBUFF_BUFFSIZE_SHIFT);
        fcbuff |= ((j & 0xff) << IXGBE_FCBUFF_BUFFCNT_SHIFT);
        fcbuff |= (firstoff << IXGBE_FCBUFF_OFFSET_SHIFT);
@@ -532,6 +550,24 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
                        e_err(drv, "failed to allocated FCoE DDP pool\n");
                spin_lock_init(&fcoe->lock);
+                /* Extra buffer to be shared by all DDPs for HW work around */
+                fcoe->extra_ddp_buffer = kmalloc(IXGBE_FCBUFF_MIN, GFP_ATOMIC);
+                if (fcoe->extra_ddp_buffer == NULL) {
+                        e_err(drv, "failed to allocated extra DDP buffer\n");
+                        goto out_extra_ddp_buffer_alloc;
+                }
+                fcoe->extra_ddp_buffer_dma =
+                        dma_map_single(&adapter->pdev->dev,
+                                       fcoe->extra_ddp_buffer,
+                                       IXGBE_FCBUFF_MIN,
+                                       DMA_FROM_DEVICE);
+                if (dma_mapping_error(&adapter->pdev->dev,
+                                      fcoe->extra_ddp_buffer_dma)) {
+                        e_err(drv, "failed to map extra DDP buffer\n");
+                        goto out_extra_ddp_buffer_dma;
+                }
        }
        /* Enable L2 eth type filter for FCoE */
@@ -581,6 +617,14 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
                }
        }
 #endif
+        return;
+out_extra_ddp_buffer_dma:
+        kfree(fcoe->extra_ddp_buffer);
+out_extra_ddp_buffer_alloc:
+        pci_pool_destroy(fcoe->pool);
+        fcoe->pool = NULL;
 }
 /**
@@ -600,6 +644,11 @@ void ixgbe_cleanup_fcoe(struct ixgbe_adapter *adapter)
        if (fcoe->pool) {
                for (i = 0; i < IXGBE_FCOE_DDP_MAX; i++)
                        ixgbe_fcoe_ddp_put(adapter->netdev, i);
+                dma_unmap_single(&adapter->pdev->dev,
+                                 fcoe->extra_ddp_buffer_dma,
+                                 IXGBE_FCBUFF_MIN,
+                                 DMA_FROM_DEVICE);
+                kfree(fcoe->extra_ddp_buffer);
                pci_pool_destroy(fcoe->pool);
                fcoe->pool = NULL;
        }
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ixgbe/ixgbe_fcoe.h
index 4bc2c551c8db..65cc8fb14fe7 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.h
+++ b/drivers/net/ixgbe/ixgbe_fcoe.h
@@ -70,6 +70,8 @@ struct ixgbe_fcoe {
        spinlock_t lock;
        struct pci_pool *pool;
        struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX];
+        unsigned char *extra_ddp_buffer;
+        dma_addr_t extra_ddp_buffer_dma;
 };
 #endif /* _IXGBE_FCOE_H */
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 602078b84892..eca762d954c6 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -52,7 +52,7 @@ char ixgbe_driver_name[] = "ixgbe";
 static const char ixgbe_driver_string[] =
                              "Intel(R) 10 Gigabit PCI Express Network Driver";
-#define DRV_VERSION "3.0.12-k2"
+#define DRV_VERSION "3.2.9-k2"
 const char ixgbe_driver_version[] = DRV_VERSION;
 static char ixgbe_copyright[] = "Copyright (c) 1999-2010 Intel Corporation.";
@@ -648,7 +648,7 @@ void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *tx_ring,
 *
 * Returns : a tc index for use in range 0-7, or 0-3
 */
-u8 ixgbe_dcb_txq_to_tc(struct ixgbe_adapter *adapter, u8 reg_idx)
+static u8 ixgbe_dcb_txq_to_tc(struct ixgbe_adapter *adapter, u8 reg_idx)
 {
        int tc = -1;
        int dcb_i = adapter->ring_feature[RING_F_DCB].indices;
@@ -3176,9 +3176,16 @@ static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)
        u32 mhadd, hlreg0;
        /* Decide whether to use packet split mode or not */
+        /* On by default */
+        adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
        /* Do not use packet split if we're in SR-IOV Mode */
-        if (!adapter->num_vfs)
+        if (adapter->num_vfs)
-                adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
+                adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
+        /* Disable packet split due to 82599 erratum #45 */
+        if (hw->mac.type == ixgbe_mac_82599EB)
+                adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
        /* Set the RX buffer length according to the mode */
        if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
@@ -3721,7 +3728,8 @@ static void ixgbe_sfp_link_config(struct ixgbe_adapter *adapter)
                         * We need to try and force an autonegotiation
                         * session, then bring up link.
                         */
-                        hw->mac.ops.setup_sfp(hw);
+                        if (hw->mac.ops.setup_sfp)
+                                hw->mac.ops.setup_sfp(hw);
                        if (!(adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK))
                                schedule_work(&adapter->multispeed_fiber_task);
                } else {
@@ -4863,16 +4871,13 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter)
 {
        int q_idx, num_q_vectors;
        struct ixgbe_q_vector *q_vector;
-        int napi_vectors;
        int (*poll)(struct napi_struct *, int);
        if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
                num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-                napi_vectors = adapter->num_rx_queues;
                poll = &ixgbe_clean_rxtx_many;
        } else {
                num_q_vectors = 1;
-                napi_vectors = 1;
                poll = &ixgbe_poll;
        }
@@ -5169,7 +5174,6 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
        adapter->dcb_cfg.bw_percentage[DCB_RX_CONFIG][0] = 100;
        adapter->dcb_cfg.rx_pba_cfg = pba_equal;
        adapter->dcb_cfg.pfc_mode_enable = false;
-        adapter->dcb_cfg.round_robin_enable = false;
        adapter->dcb_set_bitmap = 0x00;
        ixgbe_copy_dcb_cfg(&adapter->dcb_cfg, &adapter->temp_dcb_cfg,
                           adapter->ring_feature[RING_F_DCB].indices);
@@ -5606,6 +5610,10 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
        }
        ixgbe_clear_interrupt_scheme(adapter);
+#ifdef CONFIG_DCB
+        kfree(adapter->ixgbe_ieee_pfc);
+        kfree(adapter->ixgbe_ieee_ets);
+#endif
 #ifdef CONFIG_PM
        retval = pci_save_state(pdev);
@@ -5964,7 +5972,8 @@ static void ixgbe_sfp_config_module_task(struct work_struct *work)
                unregister_netdev(adapter->netdev);
                return;
        }
-        hw->mac.ops.setup_sfp(hw);
+        if (hw->mac.ops.setup_sfp)
+                hw->mac.ops.setup_sfp(hw);
        if (!(adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK))
                /* This will also work for DA Twinax connections */
@@ -6095,7 +6104,10 @@ static void ixgbe_watchdog_task(struct work_struct *work)
                               (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
                               "10 Gbps" :
                               (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
-                               "1 Gbps" : "unknown speed")),
+                               "1 Gbps" :
+                               (link_speed == IXGBE_LINK_SPEED_100_FULL ?
+                               "100 Mbps" :
+                               "unknown speed"))),
                               ((flow_rx && flow_tx) ? "RX/TX" :
                               (flow_rx ? "RX" :
                               (flow_tx ? "TX" : "None"))));
@@ -7700,16 +7712,6 @@ static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
 #endif /* CONFIG_IXGBE_DCA */
-/**
- * ixgbe_get_hw_dev return device
- * used by hardware layer to print debugging information
- **/
-struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw)
-{
-        struct ixgbe_adapter *adapter = hw->back;
-        return adapter->netdev;
-}
 module_exit(ixgbe_exit_module);
 /* ixgbe_main.c */
diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/ixgbe_mbx.c
index ea82c5a1cd3e..f215c4c296c4 100644
--- a/drivers/net/ixgbe/ixgbe_mbx.c
+++ b/drivers/net/ixgbe/ixgbe_mbx.c
@@ -437,6 +437,7 @@ out_no_read:
        return ret_val;
 }
+#ifdef CONFIG_PCI_IOV
 /**
 *  ixgbe_init_mbx_params_pf - set initial values for pf mailbox
 *  @hw: pointer to the HW structure
@@ -465,6 +466,7 @@ void ixgbe_init_mbx_params_pf(struct ixgbe_hw *hw)
                break;
        }
 }
+#endif /* CONFIG_PCI_IOV */
 struct ixgbe_mbx_operations mbx_ops_generic = {
        .read                   = ixgbe_read_mbx_pf,
diff --git a/drivers/net/ixgbe/ixgbe_mbx.h b/drivers/net/ixgbe/ixgbe_mbx.h
index 3df9b1590218..ada0ce32a7a6 100644
--- a/drivers/net/ixgbe/ixgbe_mbx.h
+++ b/drivers/net/ixgbe/ixgbe_mbx.h
@@ -86,7 +86,9 @@ s32 ixgbe_write_mbx(struct ixgbe_hw *, u32 *, u16, u16);
 s32 ixgbe_check_for_msg(struct ixgbe_hw *, u16);
 s32 ixgbe_check_for_ack(struct ixgbe_hw *, u16);
 s32 ixgbe_check_for_rst(struct ixgbe_hw *, u16);
+#ifdef CONFIG_PCI_IOV
 void ixgbe_init_mbx_params_pf(struct ixgbe_hw *);
+#endif /* CONFIG_PCI_IOV */
 extern struct ixgbe_mbx_operations mbx_ops_generic;
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c
index 47b15738b009..187b3a16ec1f 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ixgbe/ixgbe_sriov.c
@@ -110,12 +110,10 @@ static int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid,
        return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add);
 }
 static void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe)
 {
        u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
        vmolr |= (IXGBE_VMOLR_ROMPE |
-                  IXGBE_VMOLR_ROPE |
                  IXGBE_VMOLR_BAM);
        if (aupe)
                vmolr |= IXGBE_VMOLR_AUPE;
diff --git a/drivers/net/ixgbe/ixgbe_x540.c b/drivers/net/ixgbe/ixgbe_x540.c
index 3a8923993ce3..f2518b01067d 100644
--- a/drivers/net/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ixgbe/ixgbe_x540.c
@@ -133,17 +133,17 @@ static s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
        }
        ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-        IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | IXGBE_CTRL_RST));
+        IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | reset_bit));
        IXGBE_WRITE_FLUSH(hw);
        /* Poll for reset bit to self-clear indicating reset is complete */
        for (i = 0; i < 10; i++) {
                udelay(1);
                ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-                if (!(ctrl & IXGBE_CTRL_RST))
+                if (!(ctrl & reset_bit))
                        break;
        }
-        if (ctrl & IXGBE_CTRL_RST) {
+        if (ctrl & reset_bit) {
                status = IXGBE_ERR_RESET_FAILED;
                hw_dbg(hw, "Reset polling failed to complete.\n");
        }
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index e97ebef3cf47..5b441b75e138 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -161,6 +161,67 @@ jme_setup_wakeup_frame(struct jme_adapter *jme,
 }
 static inline void
+jme_mac_rxclk_off(struct jme_adapter *jme)
+{
+        jme->reg_gpreg1 |= GPREG1_RXCLKOFF;
+        jwrite32f(jme, JME_GPREG1, jme->reg_gpreg1);
+}
+static inline void
+jme_mac_rxclk_on(struct jme_adapter *jme)
+{
+        jme->reg_gpreg1 &= ~GPREG1_RXCLKOFF;
+        jwrite32f(jme, JME_GPREG1, jme->reg_gpreg1);
+}
+static inline void
+jme_mac_txclk_off(struct jme_adapter *jme)
+{
+        jme->reg_ghc &= ~(GHC_TO_CLK_SRC | GHC_TXMAC_CLK_SRC);
+        jwrite32f(jme, JME_GHC, jme->reg_ghc);
+}
+static inline void
+jme_mac_txclk_on(struct jme_adapter *jme)
+{
+        u32 speed = jme->reg_ghc & GHC_SPEED;
+        if (speed == GHC_SPEED_1000M)
+                jme->reg_ghc |= GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY;
+        else
+                jme->reg_ghc |= GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE;
+        jwrite32f(jme, JME_GHC, jme->reg_ghc);
+}
+static inline void
+jme_reset_ghc_speed(struct jme_adapter *jme)
+{
+        jme->reg_ghc &= ~(GHC_SPEED | GHC_DPX);
+        jwrite32f(jme, JME_GHC, jme->reg_ghc);
+}
+static inline void
+jme_reset_250A2_workaround(struct jme_adapter *jme)
+{
+        jme->reg_gpreg1 &= ~(GPREG1_HALFMODEPATCH |
+                             GPREG1_RSSPATCH);
+        jwrite32(jme, JME_GPREG1, jme->reg_gpreg1);
+}
+static inline void
+jme_assert_ghc_reset(struct jme_adapter *jme)
+{
+        jme->reg_ghc |= GHC_SWRST;
+        jwrite32f(jme, JME_GHC, jme->reg_ghc);
+}
+static inline void
+jme_clear_ghc_reset(struct jme_adapter *jme)
+{
+        jme->reg_ghc &= ~GHC_SWRST;
+        jwrite32f(jme, JME_GHC, jme->reg_ghc);
+}
+static inline void
 jme_reset_mac_processor(struct jme_adapter *jme)
 {
        static const u32 mask[WAKEUP_FRAME_MASK_DWNR] = {0, 0, 0, 0};
@@ -168,9 +229,24 @@ jme_reset_mac_processor(struct jme_adapter *jme)
        u32 gpreg0;
        int i;
-        jwrite32(jme, JME_GHC, jme->reg_ghc | GHC_SWRST);
+        jme_reset_ghc_speed(jme);
-        udelay(2);
+        jme_reset_250A2_workaround(jme);
-        jwrite32(jme, JME_GHC, jme->reg_ghc);
+        jme_mac_rxclk_on(jme);
+        jme_mac_txclk_on(jme);
+        udelay(1);
+        jme_assert_ghc_reset(jme);
+        udelay(1);
+        jme_mac_rxclk_off(jme);
+        jme_mac_txclk_off(jme);
+        udelay(1);
+        jme_clear_ghc_reset(jme);
+        udelay(1);
+        jme_mac_rxclk_on(jme);
+        jme_mac_txclk_on(jme);
+        udelay(1);
+        jme_mac_rxclk_off(jme);
+        jme_mac_txclk_off(jme);
        jwrite32(jme, JME_RXDBA_LO, 0x00000000);
        jwrite32(jme, JME_RXDBA_HI, 0x00000000);
@@ -190,14 +266,6 @@ jme_reset_mac_processor(struct jme_adapter *jme)
        else
                gpreg0 = GPREG0_DEFAULT;
        jwrite32(jme, JME_GPREG0, gpreg0);
-        jwrite32(jme, JME_GPREG1, GPREG1_DEFAULT);
-}
-static inline void
-jme_reset_ghc_speed(struct jme_adapter *jme)
-{
-        jme->reg_ghc &= ~(GHC_SPEED_1000M | GHC_DPX);
-        jwrite32(jme, JME_GHC, jme->reg_ghc);
 }
 static inline void
@@ -336,13 +404,13 @@ jme_linkstat_from_phy(struct jme_adapter *jme)
 }
 static inline void
-jme_set_phyfifoa(struct jme_adapter *jme)
+jme_set_phyfifo_5level(struct jme_adapter *jme)
 {
        jme_mdio_write(jme->dev, jme->mii_if.phy_id, 27, 0x0004);
 }
 static inline void
-jme_set_phyfifob(struct jme_adapter *jme)
+jme_set_phyfifo_8level(struct jme_adapter *jme)
 {
        jme_mdio_write(jme->dev, jme->mii_if.phy_id, 27, 0x0000);
 }
@@ -351,7 +419,7 @@ static int
 jme_check_link(struct net_device *netdev, int testonly)
 {
        struct jme_adapter *jme = netdev_priv(netdev);
-        u32 phylink, ghc, cnt = JME_SPDRSV_TIMEOUT, bmcr, gpreg1;
+        u32 phylink, cnt = JME_SPDRSV_TIMEOUT, bmcr;
        char linkmsg[64];
        int rc = 0;
@@ -414,23 +482,21 @@ jme_check_link(struct net_device *netdev, int testonly)
                jme->phylink = phylink;
-                ghc = jme->reg_ghc & ~(GHC_SPEED | GHC_DPX |
+                /*
-                                GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE |
+                 * The speed/duplex setting of jme->reg_ghc already cleared
-                                GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY);
+                 * by jme_reset_mac_processor()
+                 */
                switch (phylink & PHY_LINK_SPEED_MASK) {
                case PHY_LINK_SPEED_10M:
-                        ghc |= GHC_SPEED_10M |
+                        jme->reg_ghc |= GHC_SPEED_10M;
-                                GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE;
                        strcat(linkmsg, "10 Mbps, ");
                        break;
                case PHY_LINK_SPEED_100M:
-                        ghc |= GHC_SPEED_100M |
+                        jme->reg_ghc |= GHC_SPEED_100M;
-                                GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE;
                        strcat(linkmsg, "100 Mbps, ");
                        break;
                case PHY_LINK_SPEED_1000M:
-                        ghc |= GHC_SPEED_1000M |
+                        jme->reg_ghc |= GHC_SPEED_1000M;
-                                GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY;
                        strcat(linkmsg, "1000 Mbps, ");
                        break;
                default:
@@ -439,42 +505,40 @@ jme_check_link(struct net_device *netdev, int testonly)
                if (phylink & PHY_LINK_DUPLEX) {
                        jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT);
-                        ghc |= GHC_DPX;
+                        jwrite32(jme, JME_TXTRHD, TXTRHD_FULLDUPLEX);
+                        jme->reg_ghc |= GHC_DPX;
                } else {
                        jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT |
                                                TXMCS_BACKOFF |
                                                TXMCS_CARRIERSENSE |
                                                TXMCS_COLLISION);
-                        jwrite32(jme, JME_TXTRHD, TXTRHD_TXPEN |
+                        jwrite32(jme, JME_TXTRHD, TXTRHD_HALFDUPLEX);
-                                ((0x2000 << TXTRHD_TXP_SHIFT) & TXTRHD_TXP) |
-                                TXTRHD_TXREN |
-                                ((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL));
                }
-                gpreg1 = GPREG1_DEFAULT;
+                jwrite32(jme, JME_GHC, jme->reg_ghc);
                if (is_buggy250(jme->pdev->device, jme->chiprev)) {
+                        jme->reg_gpreg1 &= ~(GPREG1_HALFMODEPATCH |
+                                             GPREG1_RSSPATCH);
                        if (!(phylink & PHY_LINK_DUPLEX))
-                                gpreg1 |= GPREG1_HALFMODEPATCH;
+                                jme->reg_gpreg1 |= GPREG1_HALFMODEPATCH;
                        switch (phylink & PHY_LINK_SPEED_MASK) {
                        case PHY_LINK_SPEED_10M:
-                                jme_set_phyfifoa(jme);
+                                jme_set_phyfifo_8level(jme);
-                                gpreg1 |= GPREG1_RSSPATCH;
+                                jme->reg_gpreg1 |= GPREG1_RSSPATCH;
                                break;
                        case PHY_LINK_SPEED_100M:
-                                jme_set_phyfifob(jme);
+                                jme_set_phyfifo_5level(jme);
-                                gpreg1 |= GPREG1_RSSPATCH;
+                                jme->reg_gpreg1 |= GPREG1_RSSPATCH;
                                break;
                        case PHY_LINK_SPEED_1000M:
-                                jme_set_phyfifoa(jme);
+                                jme_set_phyfifo_8level(jme);
                                break;
                        default:
                                break;
                        }
                }
+                jwrite32(jme, JME_GPREG1, jme->reg_gpreg1);
-                jwrite32(jme, JME_GPREG1, gpreg1);
-                jwrite32(jme, JME_GHC, ghc);
-                jme->reg_ghc = ghc;
                strcat(linkmsg, (phylink & PHY_LINK_DUPLEX) ?
                                        "Full-Duplex, " :
@@ -613,10 +677,14 @@ jme_enable_tx_engine(struct jme_adapter *jme)
         * Enable TX Engine
         */
        wmb();
-        jwrite32(jme, JME_TXCS, jme->reg_txcs |
+        jwrite32f(jme, JME_TXCS, jme->reg_txcs |
                                TXCS_SELECT_QUEUE0 |
                                TXCS_ENABLE);
+        /*
+         * Start clock for TX MAC Processor
+         */
+        jme_mac_txclk_on(jme);
 }
 static inline void
@@ -651,6 +719,11 @@ jme_disable_tx_engine(struct jme_adapter *jme)
        if (!i)
                pr_err("Disable TX engine timeout\n");
+        /*
+         * Stop clock for TX MAC Processor
+         */
+        jme_mac_txclk_off(jme);
 }
 static void
@@ -825,16 +898,22 @@ jme_enable_rx_engine(struct jme_adapter *jme)
        /*
         * Setup Unicast Filter
         */
+        jme_set_unicastaddr(jme->dev);
        jme_set_multi(jme->dev);
        /*
         * Enable RX Engine
         */
        wmb();
-        jwrite32(jme, JME_RXCS, jme->reg_rxcs |
+        jwrite32f(jme, JME_RXCS, jme->reg_rxcs |
                                RXCS_QUEUESEL_Q0 |
                                RXCS_ENABLE |
                                RXCS_QST);
+        /*
+         * Start clock for RX MAC Processor
+         */
+        jme_mac_rxclk_on(jme);
 }
 static inline void
@@ -871,10 +950,40 @@ jme_disable_rx_engine(struct jme_adapter *jme)
        if (!i)
                pr_err("Disable RX engine timeout\n");
+        /*
+         * Stop clock for RX MAC Processor
+         */
+        jme_mac_rxclk_off(jme);
+}
+static u16
+jme_udpsum(struct sk_buff *skb)
+{
+        u16 csum = 0xFFFFu;
+        if (skb->len < (ETH_HLEN + sizeof(struct iphdr)))
+                return csum;
+        if (skb->protocol != htons(ETH_P_IP))
+                return csum;
+        skb_set_network_header(skb, ETH_HLEN);
+        if ((ip_hdr(skb)->protocol != IPPROTO_UDP) ||
+            (skb->len < (ETH_HLEN +
+                        (ip_hdr(skb)->ihl << 2) +
+                        sizeof(struct udphdr)))) {
+                skb_reset_network_header(skb);
+                return csum;
+        }
+        skb_set_transport_header(skb,
+                        ETH_HLEN + (ip_hdr(skb)->ihl << 2));
+        csum = udp_hdr(skb)->check;
+        skb_reset_transport_header(skb);
+        skb_reset_network_header(skb);
+        return csum;
 }
 static int
-jme_rxsum_ok(struct jme_adapter *jme, u16 flags)
+jme_rxsum_ok(struct jme_adapter *jme, u16 flags, struct sk_buff *skb)
 {
        if (!(flags & (RXWBFLAG_TCPON | RXWBFLAG_UDPON | RXWBFLAG_IPV4)))
                return false;
@@ -887,7 +996,7 @@ jme_rxsum_ok(struct jme_adapter *jme, u16 flags)
        }
        if (unlikely((flags & (RXWBFLAG_MF | RXWBFLAG_UDPON | RXWBFLAG_UDPCS))
-                        == RXWBFLAG_UDPON)) {
+                        == RXWBFLAG_UDPON) && jme_udpsum(skb)) {
                if (flags & RXWBFLAG_IPV4)
                        netif_err(jme, rx_err, jme->dev, "UDP Checksum error\n");
                return false;
@@ -935,7 +1044,7 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
                skb_put(skb, framesize);
                skb->protocol = eth_type_trans(skb, jme->dev);
-                if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags)))
+                if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags), skb))
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                else
                        skb_checksum_none_assert(skb);
@@ -1207,7 +1316,6 @@ jme_link_change_tasklet(unsigned long arg)
        tasklet_disable(&jme->rxempty_task);
        if (netif_carrier_ok(netdev)) {
-                jme_reset_ghc_speed(jme);
                jme_disable_rx_engine(jme);
                jme_disable_tx_engine(jme);
                jme_reset_mac_processor(jme);
@@ -1577,6 +1685,38 @@ jme_free_irq(struct jme_adapter *jme)
 }
 static inline void
+jme_new_phy_on(struct jme_adapter *jme)
+{
+        u32 reg;
+        reg = jread32(jme, JME_PHY_PWR);
+        reg &= ~(PHY_PWR_DWN1SEL | PHY_PWR_DWN1SW |
+                 PHY_PWR_DWN2 | PHY_PWR_CLKSEL);
+        jwrite32(jme, JME_PHY_PWR, reg);
+        pci_read_config_dword(jme->pdev, PCI_PRIV_PE1, &reg);
+        reg &= ~PE1_GPREG0_PBG;
+        reg |= PE1_GPREG0_ENBG;
+        pci_write_config_dword(jme->pdev, PCI_PRIV_PE1, reg);
+}
+static inline void
+jme_new_phy_off(struct jme_adapter *jme)
+{
+        u32 reg;
+        reg = jread32(jme, JME_PHY_PWR);
+        reg |= PHY_PWR_DWN1SEL | PHY_PWR_DWN1SW |
+               PHY_PWR_DWN2 | PHY_PWR_CLKSEL;
+        jwrite32(jme, JME_PHY_PWR, reg);
+        pci_read_config_dword(jme->pdev, PCI_PRIV_PE1, &reg);
+        reg &= ~PE1_GPREG0_PBG;
+        reg |= PE1_GPREG0_PDD3COLD;
+        pci_write_config_dword(jme->pdev, PCI_PRIV_PE1, reg);
+}
+static inline void
 jme_phy_on(struct jme_adapter *jme)
 {
        u32 bmcr;
@@ -1584,6 +1724,22 @@ jme_phy_on(struct jme_adapter *jme)
        bmcr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMCR);
        bmcr &= ~BMCR_PDOWN;
        jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, bmcr);
+        if (new_phy_power_ctrl(jme->chip_main_rev))
+                jme_new_phy_on(jme);
+}
+static inline void
+jme_phy_off(struct jme_adapter *jme)
+{
+        u32 bmcr;
+        bmcr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMCR);
+        bmcr |= BMCR_PDOWN;
+        jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, bmcr);
+        if (new_phy_power_ctrl(jme->chip_main_rev))
+                jme_new_phy_off(jme);
 }
 static int
@@ -1606,12 +1762,11 @@ jme_open(struct net_device *netdev)
        jme_start_irq(jme);
-        if (test_bit(JME_FLAG_SSET, &jme->flags)) {
+        jme_phy_on(jme);
-                jme_phy_on(jme);
+        if (test_bit(JME_FLAG_SSET, &jme->flags))
                jme_set_settings(netdev, &jme->old_ecmd);
-        } else {
+        else
                jme_reset_phy_processor(jme);
-        }
        jme_reset_link(jme);
@@ -1657,12 +1812,6 @@ jme_wait_link(struct jme_adapter *jme)
        }
 }
-static inline void
-jme_phy_off(struct jme_adapter *jme)
-{
-        jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, BMCR_PDOWN);
-}
 static void
 jme_powersave_phy(struct jme_adapter *jme)
 {
@@ -1696,7 +1845,6 @@ jme_close(struct net_device *netdev)
        tasklet_disable(&jme->rxclean_task);
        tasklet_disable(&jme->rxempty_task);
-        jme_reset_ghc_speed(jme);
        jme_disable_rx_engine(jme);
        jme_disable_tx_engine(jme);
        jme_reset_mac_processor(jme);
@@ -1993,27 +2141,34 @@ jme_start_xmit(struct sk_buff *skb, struct net_device *netdev)
        return NETDEV_TX_OK;
 }
+static void
+jme_set_unicastaddr(struct net_device *netdev)
+{
+        struct jme_adapter *jme = netdev_priv(netdev);
+        u32 val;
+        val = (netdev->dev_addr[3] & 0xff) << 24 |
+              (netdev->dev_addr[2] & 0xff) << 16 |
+              (netdev->dev_addr[1] & 0xff) <<  8 |
+              (netdev->dev_addr[0] & 0xff);
+        jwrite32(jme, JME_RXUMA_LO, val);
+        val = (netdev->dev_addr[5] & 0xff) << 8 |
+              (netdev->dev_addr[4] & 0xff);
+        jwrite32(jme, JME_RXUMA_HI, val);
+}
 static int
 jme_set_macaddr(struct net_device *netdev, void *p)
 {
        struct jme_adapter *jme = netdev_priv(netdev);
        struct sockaddr *addr = p;
-        u32 val;
        if (netif_running(netdev))
                return -EBUSY;
        spin_lock_bh(&jme->macaddr_lock);
        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+        jme_set_unicastaddr(netdev);
-        val = (addr->sa_data[3] & 0xff) << 24 |
-              (addr->sa_data[2] & 0xff) << 16 |
-              (addr->sa_data[1] & 0xff) <<  8 |
-              (addr->sa_data[0] & 0xff);
-        jwrite32(jme, JME_RXUMA_LO, val);
-        val = (addr->sa_data[5] & 0xff) << 8 |
-              (addr->sa_data[4] & 0xff);
-        jwrite32(jme, JME_RXUMA_HI, val);
        spin_unlock_bh(&jme->macaddr_lock);
        return 0;
@@ -2731,6 +2886,8 @@ jme_check_hw_ver(struct jme_adapter *jme)
        jme->fpgaver = (chipmode & CM_FPGAVER_MASK) >> CM_FPGAVER_SHIFT;
        jme->chiprev = (chipmode & CM_CHIPREV_MASK) >> CM_CHIPREV_SHIFT;
+        jme->chip_main_rev = jme->chiprev & 0xF;
+        jme->chip_sub_rev = (jme->chiprev >> 4) & 0xF;
 }
 static const struct net_device_ops jme_netdev_ops = {
@@ -2880,6 +3037,7 @@ jme_init_one(struct pci_dev *pdev,
        jme->reg_rxmcs = RXMCS_DEFAULT;
        jme->reg_txpfc = 0;
        jme->reg_pmcs = PMCS_MFEN;
+        jme->reg_gpreg1 = GPREG1_DEFAULT;
        set_bit(JME_FLAG_TXCSUM, &jme->flags);
        set_bit(JME_FLAG_TSO, &jme->flags);
@@ -2936,8 +3094,8 @@ jme_init_one(struct pci_dev *pdev,
        jme->mii_if.mdio_write = jme_mdio_write;
        jme_clear_pm(jme);
-        jme_set_phyfifoa(jme);
+        jme_set_phyfifo_5level(jme);
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->rev);
+        pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev);
        if (!jme->fpgaver)
                jme_phy_init(jme);
        jme_phy_off(jme);
@@ -2964,14 +3122,14 @@ jme_init_one(struct pci_dev *pdev,
                goto err_out_unmap;
        }
-        netif_info(jme, probe, jme->dev, "%s%s ver:%x rev:%x macaddr:%pM\n",
+        netif_info(jme, probe, jme->dev, "%s%s chiprev:%x pcirev:%x macaddr:%pM\n",
                   (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC250) ?
                   "JMC250 Gigabit Ethernet" :
                   (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC260) ?
                   "JMC260 Fast Ethernet" : "Unknown",
                   (jme->fpgaver != 0) ? " (FPGA)" : "",
                   (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev,
-                   jme->rev, netdev->dev_addr);
+                   jme->pcirev, netdev->dev_addr);
        return 0;
@@ -3035,7 +3193,6 @@ jme_suspend(struct pci_dev *pdev, pm_message_t state)
                        jme_polling_mode(jme);
                jme_stop_pcc_timer(jme);
-                jme_reset_ghc_speed(jme);
                jme_disable_rx_engine(jme);
                jme_disable_tx_engine(jme);
                jme_reset_mac_processor(jme);
@@ -3066,12 +3223,11 @@ jme_resume(struct pci_dev *pdev)
        jme_clear_pm(jme);
        pci_restore_state(pdev);
-        if (test_bit(JME_FLAG_SSET, &jme->flags)) {
+        jme_phy_on(jme);
-                jme_phy_on(jme);
+        if (test_bit(JME_FLAG_SSET, &jme->flags))
                jme_set_settings(netdev, &jme->old_ecmd);
-        } else {
+        else
                jme_reset_phy_processor(jme);
-        }
        jme_start_irq(jme);
        netif_device_attach(netdev);
diff --git a/drivers/net/jme.h b/drivers/net/jme.h
index eac09264bf2a..8bf30451e821 100644
--- a/drivers/net/jme.h
+++ b/drivers/net/jme.h
@@ -26,7 +26,7 @@
 #define __JME_H_INCLUDED__
 #define DRV_NAME        "jme"
-#define DRV_VERSION     "1.0.7"
+#define DRV_VERSION     "1.0.8"
 #define PFX             DRV_NAME ": "
 #define PCI_DEVICE_ID_JMICRON_JMC250    0x0250
@@ -103,6 +103,37 @@ enum jme_spi_op_bits {
 #define HALF_US 500     /* 500 ns */
 #define JMESPIIOCTL     SIOCDEVPRIVATE
+#define PCI_PRIV_PE1            0xE4
+enum pci_priv_pe1_bit_masks {
+        PE1_ASPMSUPRT   = 0x00000003, /*
+                                       * RW:
+                                       * Aspm_support[1:0]
+                                       * (R/W Port of 5C[11:10])
+                                       */
+        PE1_MULTIFUN    = 0x00000004, /* RW: Multi_fun_bit */
+        PE1_RDYDMA      = 0x00000008, /* RO: ~link.rdy_for_dma */
+        PE1_ASPMOPTL    = 0x00000030, /* RW: link.rx10s_option[1:0] */
+        PE1_ASPMOPTH    = 0x000000C0, /* RW: 10_req=[3]?HW:[2] */
+        PE1_GPREG0      = 0x0000FF00, /*
+                                       * SRW:
+                                       * Cfg_gp_reg0
+                                       * [7:6] phy_giga BG control
+                                       * [5] CREQ_N as CREQ_N1 (CPPE# as CREQ#)
+                                       * [4:0] Reserved
+                                       */
+        PE1_GPREG0_PBG  = 0x0000C000, /* phy_giga BG control */
+        PE1_GPREG1      = 0x00FF0000, /* RW: Cfg_gp_reg1 */
+        PE1_REVID       = 0xFF000000, /* RO: Rev ID */
+};
+enum pci_priv_pe1_values {
+        PE1_GPREG0_ENBG         = 0x00000000, /* en BG */
+        PE1_GPREG0_PDD3COLD     = 0x00004000, /* giga_PD + d3cold */
+        PE1_GPREG0_PDPCIESD     = 0x00008000, /* giga_PD + pcie_shutdown */
+        PE1_GPREG0_PDPCIEIDDQ   = 0x0000C000, /* giga_PD + pcie_iddq */
+};
 /*
 * Dynamic(adaptive)/Static PCC values
 */
@@ -403,6 +434,7 @@ struct jme_adapter {
        u32                     reg_rxmcs;
        u32                     reg_ghc;
        u32                     reg_pmcs;
+        u32                     reg_gpreg1;
        u32                     phylink;
        u32                     tx_ring_size;
        u32                     tx_ring_mask;
@@ -411,8 +443,10 @@ struct jme_adapter {
        u32                     rx_ring_mask;
        u8                      mrrs;
        unsigned int            fpgaver;
-        unsigned int            chiprev;
+        u8                      chiprev;
-        u8                      rev;
+        u8                      chip_main_rev;
+        u8                      chip_sub_rev;
+        u8                      pcirev;
        u32                     msg_enable;
        struct ethtool_cmd      old_ecmd;
        unsigned int            old_mtu;
@@ -497,6 +531,7 @@ enum jme_iomap_regs {
        JME_PMCS        = JME_MAC | 0x60, /* Power Management Control/Stat */
+        JME_PHY_PWR     = JME_PHY | 0x24, /* New PHY Power Ctrl Register */
        JME_PHY_CS      = JME_PHY | 0x28, /* PHY Ctrl and Status Register */
        JME_PHY_LINK    = JME_PHY | 0x30, /* PHY Link Status Register */
        JME_SMBCSR      = JME_PHY | 0x40, /* SMB Control and Status */
@@ -624,6 +659,14 @@ enum jme_txtrhd_shifts {
        TXTRHD_TXRL_SHIFT       = 0,
 };
+enum jme_txtrhd_values {
+        TXTRHD_FULLDUPLEX       = 0x00000000,
+        TXTRHD_HALFDUPLEX       = TXTRHD_TXPEN |
+                                  ((0x2000 << TXTRHD_TXP_SHIFT) & TXTRHD_TXP) |
+                                  TXTRHD_TXREN |
+                                  ((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL),
+};
 /*
 * RX Control/Status Bits
 */
@@ -779,6 +822,8 @@ static inline u32 smi_phy_addr(int x)
 */
 enum jme_ghc_bit_mask {
        GHC_SWRST               = 0x40000000,
+        GHC_TO_CLK_SRC          = 0x00C00000,
+        GHC_TXMAC_CLK_SRC       = 0x00300000,
        GHC_DPX                 = 0x00000040,
        GHC_SPEED               = 0x00000030,
        GHC_LINK_POLL           = 0x00000001,
@@ -833,6 +878,21 @@ enum jme_pmcs_bit_masks {
 };
 /*
+ * New PHY Power Control Register
+ */
+enum jme_phy_pwr_bit_masks {
+        PHY_PWR_DWN1SEL = 0x01000000, /* Phy_giga.p_PWR_DOWN1_SEL */
+        PHY_PWR_DWN1SW  = 0x02000000, /* Phy_giga.p_PWR_DOWN1_SW */
+        PHY_PWR_DWN2    = 0x04000000, /* Phy_giga.p_PWR_DOWN2 */
+        PHY_PWR_CLKSEL  = 0x08000000, /*
+                                       * XTL_OUT Clock select
+                                       * (an internal free-running clock)
+                                       * 0: xtl_out = phy_giga.A_XTL25_O
+                                       * 1: xtl_out = phy_giga.PD_OSC
+                                       */
+};
+/*
 * Giga PHY Status Registers
 */
 enum jme_phy_link_bit_mask {
@@ -942,18 +1002,17 @@ enum jme_gpreg0_vals {
 /*
 * General Purpose REG-1
- * Note: All theses bits defined here are for
- *       Chip mode revision 0x11 only
 */
-enum jme_gpreg1_masks {
+enum jme_gpreg1_bit_masks {
+        GPREG1_RXCLKOFF         = 0x04000000,
+        GPREG1_PCREQN           = 0x00020000,
+        GPREG1_HALFMODEPATCH    = 0x00000040, /* For Chip revision 0x11 only */
+        GPREG1_RSSPATCH         = 0x00000020, /* For Chip revision 0x11 only */
        GPREG1_INTRDELAYUNIT    = 0x00000018,
        GPREG1_INTRDELAYENABLE  = 0x00000007,
 };
 enum jme_gpreg1_vals {
-        GPREG1_RSSPATCH         = 0x00000040,
-        GPREG1_HALFMODEPATCH    = 0x00000020,
        GPREG1_INTDLYUNIT_16NS  = 0x00000000,
        GPREG1_INTDLYUNIT_256NS = 0x00000008,
        GPREG1_INTDLYUNIT_1US   = 0x00000010,
@@ -967,7 +1026,7 @@ enum jme_gpreg1_vals {
        GPREG1_INTDLYEN_6U      = 0x00000006,
        GPREG1_INTDLYEN_7U      = 0x00000007,
-        GPREG1_DEFAULT          = 0x00000000,
+        GPREG1_DEFAULT          = GPREG1_PCREQN,
 };
 /*
@@ -1184,16 +1243,22 @@ enum jme_phy_reg17_vals {
 /*
 * Workaround
 */
-static inline int is_buggy250(unsigned short device, unsigned int chiprev)
+static inline int is_buggy250(unsigned short device, u8 chiprev)
 {
        return device == PCI_DEVICE_ID_JMICRON_JMC250 && chiprev == 0x11;
 }
+static inline int new_phy_power_ctrl(u8 chip_main_rev)
+{
+        return chip_main_rev >= 5;
+}
 /*
 * Function prototypes
 */
 static int jme_set_settings(struct net_device *netdev,
                                struct ethtool_cmd *ecmd);
+static void jme_set_unicastaddr(struct net_device *netdev);
 static void jme_set_multi(struct net_device *netdev);
 #endif
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 2d9663a1c54d..ea0dc451da9c 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -129,10 +129,6 @@ static u32 always_on(struct net_device *dev)
 static const struct ethtool_ops loopback_ethtool_ops = {
        .get_link               = always_on,
-        .set_tso                = ethtool_op_set_tso,
-        .get_tx_csum            = always_on,
-        .get_sg                 = always_on,
-        .get_rx_csum            = always_on,
 };
 static int loopback_dev_init(struct net_device *dev)
@@ -169,9 +165,12 @@ static void loopback_setup(struct net_device *dev)
        dev->type               = ARPHRD_LOOPBACK;      /* 0x0001*/
        dev->flags              = IFF_LOOPBACK;
        dev->priv_flags        &= ~IFF_XMIT_DST_RELEASE;
+        dev->hw_features        = NETIF_F_ALL_TSO | NETIF_F_UFO;
        dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST
-                | NETIF_F_TSO
+                | NETIF_F_ALL_TSO
+                | NETIF_F_UFO
                | NETIF_F_NO_CSUM
+                | NETIF_F_RXCSUM
                | NETIF_F_HIGHDMA
                | NETIF_F_LLTX
                | NETIF_F_NETNS_LOCAL;
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 5933621ac3ff..2300e4599520 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -39,7 +39,7 @@ struct macvtap_queue {
        struct socket sock;
        struct socket_wq wq;
        int vnet_hdr_sz;
-        struct macvlan_dev *vlan;
+        struct macvlan_dev __rcu *vlan;
        struct file *file;
        unsigned int flags;
 };
@@ -141,7 +141,8 @@ static void macvtap_put_queue(struct macvtap_queue *q)
        struct macvlan_dev *vlan;
        spin_lock(&macvtap_lock);
-        vlan = rcu_dereference(q->vlan);
+        vlan = rcu_dereference_protected(q->vlan,
+                                         lockdep_is_held(&macvtap_lock));
        if (vlan) {
                int index = get_slot(vlan, q);
@@ -219,7 +220,8 @@ static void macvtap_del_queues(struct net_device *dev)
        /* macvtap_put_queue can free some slots, so go through all slots */
        spin_lock(&macvtap_lock);
        for (i = 0; i < MAX_MACVTAP_QUEUES && vlan->numvtaps; i++) {
-                q = rcu_dereference(vlan->taps[i]);
+                q = rcu_dereference_protected(vlan->taps[i],
+                                              lockdep_is_held(&macvtap_lock));
                if (q) {
                        qlist[j++] = q;
                        rcu_assign_pointer(vlan->taps[i], NULL);
@@ -569,7 +571,7 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q,
        }
        rcu_read_lock_bh();
-        vlan = rcu_dereference(q->vlan);
+        vlan = rcu_dereference_bh(q->vlan);
        if (vlan)
                macvlan_start_xmit(skb, vlan->dev);
        else
@@ -583,7 +585,7 @@ err_kfree:
 err:
        rcu_read_lock_bh();
-        vlan = rcu_dereference(q->vlan);
+        vlan = rcu_dereference_bh(q->vlan);
        if (vlan)
                vlan->dev->stats.tx_dropped++;
        rcu_read_unlock_bh();
@@ -631,7 +633,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
        ret = skb_copy_datagram_const_iovec(skb, 0, iv, vnet_hdr_len, len);
        rcu_read_lock_bh();
-        vlan = rcu_dereference(q->vlan);
+        vlan = rcu_dereference_bh(q->vlan);
        if (vlan)
                macvlan_count_rx(vlan, len, ret == 0, 0);
        rcu_read_unlock_bh();
@@ -727,7 +729,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
        case TUNGETIFF:
                rcu_read_lock_bh();
-                vlan = rcu_dereference(q->vlan);
+                vlan = rcu_dereference_bh(q->vlan);
                if (vlan)
                        dev_hold(vlan->dev);
                rcu_read_unlock_bh();
@@ -736,7 +738,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
                        return -ENOLINK;
                ret = 0;
-                if (copy_to_user(&ifr->ifr_name, q->vlan->dev->name, IFNAMSIZ) ||
+                if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
                    put_user(q->flags, &ifr->ifr_flags))
                        ret = -EFAULT;
                dev_put(vlan->dev);
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 4ffdc18fcb8a..2765a3ce9c24 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1286,6 +1286,21 @@ static DEFINE_PCI_DEVICE_TABLE(mlx4_pci_table) = {
        { PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 ConnectX EN 10GigE PCIe gen2*/
        { PCI_VDEVICE(MELLANOX, 0x6746) }, /* MT26438 ConnectX EN 40GigE PCIe gen2 5GT/s */
        { PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX2 40GigE PCIe gen2 */
+        { PCI_VDEVICE(MELLANOX, 0x1002) }, /* MT25400 Family [ConnectX-2 Virtual Function] */
+        { PCI_VDEVICE(MELLANOX, 0x1003) }, /* MT27500 Family [ConnectX-3] */
+        { PCI_VDEVICE(MELLANOX, 0x1004) }, /* MT27500 Family [ConnectX-3 Virtual Function] */
+        { PCI_VDEVICE(MELLANOX, 0x1005) }, /* MT27510 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1006) }, /* MT27511 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1007) }, /* MT27520 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1008) }, /* MT27521 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1009) }, /* MT27530 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100a) }, /* MT27531 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100b) }, /* MT27540 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100c) }, /* MT27541 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100d) }, /* MT27550 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100e) }, /* MT27551 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100f) }, /* MT27560 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1010) }, /* MT27561 Family */
        { 0, }
 };
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index ea5cfe2c3a04..a7f2eed9a08a 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -253,7 +253,7 @@ struct myri10ge_priv {
        unsigned long serial_number;
        int vendor_specific_offset;
        int fw_multicast_support;
-        unsigned long features;
+        u32 features;
        u32 max_tso6;
        u32 read_dma;
        u32 write_dma;
@@ -1776,7 +1776,7 @@ static int myri10ge_set_rx_csum(struct net_device *netdev, u32 csum_enabled)
 static int myri10ge_set_tso(struct net_device *netdev, u32 tso_enabled)
 {
        struct myri10ge_priv *mgp = netdev_priv(netdev);
-        unsigned long flags = mgp->features & (NETIF_F_TSO6 | NETIF_F_TSO);
+        u32 flags = mgp->features & (NETIF_F_TSO6 | NETIF_F_TSO);
        if (tso_enabled)
                netdev->features |= flags;
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 2541321bad82..9fb59d3f9c92 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -4489,6 +4489,9 @@ static int niu_alloc_channels(struct niu *np)
 {
        struct niu_parent *parent = np->parent;
        int first_rx_channel, first_tx_channel;
+        int num_rx_rings, num_tx_rings;
+        struct rx_ring_info *rx_rings;
+        struct tx_ring_info *tx_rings;
        int i, port, err;
        port = np->port;
@@ -4498,18 +4501,21 @@ static int niu_alloc_channels(struct niu *np)
                first_tx_channel += parent->txchan_per_port[i];
        }
-        np->num_rx_rings = parent->rxchan_per_port[port];
+        num_rx_rings = parent->rxchan_per_port[port];
-        np->num_tx_rings = parent->txchan_per_port[port];
+        num_tx_rings = parent->txchan_per_port[port];
-        netif_set_real_num_rx_queues(np->dev, np->num_rx_rings);
+        rx_rings = kcalloc(num_rx_rings, sizeof(struct rx_ring_info),
-        netif_set_real_num_tx_queues(np->dev, np->num_tx_rings);
+                           GFP_KERNEL);
-        np->rx_rings = kcalloc(np->num_rx_rings, sizeof(struct rx_ring_info),
-                               GFP_KERNEL);
        err = -ENOMEM;
-        if (!np->rx_rings)
+        if (!rx_rings)
                goto out_err;
+        np->num_rx_rings = num_rx_rings;
+        smp_wmb();
+        np->rx_rings = rx_rings;
+        netif_set_real_num_rx_queues(np->dev, num_rx_rings);
        for (i = 0; i < np->num_rx_rings; i++) {
                struct rx_ring_info *rp = &np->rx_rings[i];
@@ -4538,12 +4544,18 @@ static int niu_alloc_channels(struct niu *np)
                        return err;
        }
-        np->tx_rings = kcalloc(np->num_tx_rings, sizeof(struct tx_ring_info),
+        tx_rings = kcalloc(num_tx_rings, sizeof(struct tx_ring_info),
-                               GFP_KERNEL);
+                           GFP_KERNEL);
        err = -ENOMEM;
-        if (!np->tx_rings)
+        if (!tx_rings)
                goto out_err;
+        np->num_tx_rings = num_tx_rings;
+        smp_wmb();
+        np->tx_rings = tx_rings;
+        netif_set_real_num_tx_queues(np->dev, num_tx_rings);
        for (i = 0; i < np->num_tx_rings; i++) {
                struct tx_ring_info *rp = &np->tx_rings[i];
@@ -6246,11 +6258,17 @@ static void niu_sync_mac_stats(struct niu *np)
 static void niu_get_rx_stats(struct niu *np)
 {
        unsigned long pkts, dropped, errors, bytes;
+        struct rx_ring_info *rx_rings;
        int i;
        pkts = dropped = errors = bytes = 0;
+        rx_rings = ACCESS_ONCE(np->rx_rings);
+        if (!rx_rings)
+                goto no_rings;
        for (i = 0; i < np->num_rx_rings; i++) {
-                struct rx_ring_info *rp = &np->rx_rings[i];
+                struct rx_ring_info *rp = &rx_rings[i];
                niu_sync_rx_discard_stats(np, rp, 0);
@@ -6259,6 +6277,8 @@ static void niu_get_rx_stats(struct niu *np)
                dropped += rp->rx_dropped;
                errors += rp->rx_errors;
        }
+no_rings:
        np->dev->stats.rx_packets = pkts;
        np->dev->stats.rx_bytes = bytes;
        np->dev->stats.rx_dropped = dropped;
@@ -6268,16 +6288,24 @@ static void niu_get_rx_stats(struct niu *np)
 static void niu_get_tx_stats(struct niu *np)
 {
        unsigned long pkts, errors, bytes;
+        struct tx_ring_info *tx_rings;
        int i;
        pkts = errors = bytes = 0;
+        tx_rings = ACCESS_ONCE(np->tx_rings);
+        if (!tx_rings)
+                goto no_rings;
        for (i = 0; i < np->num_tx_rings; i++) {
-                struct tx_ring_info *rp = &np->tx_rings[i];
+                struct tx_ring_info *rp = &tx_rings[i];
                pkts += rp->tx_packets;
                bytes += rp->tx_bytes;
                errors += rp->tx_errors;
        }
+no_rings:
        np->dev->stats.tx_packets = pkts;
        np->dev->stats.tx_bytes = bytes;
        np->dev->stats.tx_errors = errors;
@@ -6287,9 +6315,10 @@ static struct net_device_stats *niu_get_stats(struct net_device *dev)
 {
        struct niu *np = netdev_priv(dev);
-        niu_get_rx_stats(np);
+        if (netif_running(dev)) {
-        niu_get_tx_stats(np);
+                niu_get_rx_stats(np);
+                niu_get_tx_stats(np);
+        }
        return &dev->stats;
 }
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 84134c766f3a..a41b2cf4d917 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1988,12 +1988,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
        }
        ndev = alloc_etherdev(sizeof(struct ns83820));
-        dev = PRIV(ndev);
        err = -ENOMEM;
-        if (!dev)
+        if (!ndev)
                goto out;
+        dev = PRIV(ndev);
        dev->ndev = ndev;
        spin_lock_init(&dev->rx_info.lock);
diff --git a/drivers/net/pch_gbe/pch_gbe.h b/drivers/net/pch_gbe/pch_gbe.h
index a0c26a99520f..e1e33c80fb25 100644
--- a/drivers/net/pch_gbe/pch_gbe.h
+++ b/drivers/net/pch_gbe/pch_gbe.h
@@ -73,7 +73,7 @@ struct pch_gbe_regs {
        struct pch_gbe_regs_mac_adr mac_adr[16];
        u32 ADDR_MASK;
        u32 MIIM;
-        u32 reserve2;
+        u32 MAC_ADDR_LOAD;
        u32 RGMII_ST;
        u32 RGMII_CTRL;
        u32 reserve3[3];
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c
index d7355306a738..b99e90aca37d 100644
--- a/drivers/net/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/pch_gbe/pch_gbe_main.c
@@ -29,6 +29,7 @@ const char pch_driver_version[] = DRV_VERSION;
 #define PCH_GBE_SHORT_PKT               64
 #define DSC_INIT16                      0xC000
 #define PCH_GBE_DMA_ALIGN               0
+#define PCH_GBE_DMA_PADDING             2
 #define PCH_GBE_WATCHDOG_PERIOD         (1 * HZ)        /* watchdog time */
 #define PCH_GBE_COPYBREAK_DEFAULT       256
 #define PCH_GBE_PCI_BAR                 1
@@ -88,6 +89,12 @@ static unsigned int copybreak __read_mostly = PCH_GBE_COPYBREAK_DEFAULT;
 static int pch_gbe_mdio_read(struct net_device *netdev, int addr, int reg);
 static void pch_gbe_mdio_write(struct net_device *netdev, int addr, int reg,
                               int data);
+inline void pch_gbe_mac_load_mac_addr(struct pch_gbe_hw *hw)
+{
+        iowrite32(0x01, &hw->reg->MAC_ADDR_LOAD);
+}
 /**
 * pch_gbe_mac_read_mac_addr - Read MAC address
 * @hw:             Pointer to the HW structure
@@ -519,7 +526,9 @@ static void pch_gbe_reset_task(struct work_struct *work)
        struct pch_gbe_adapter *adapter;
        adapter = container_of(work, struct pch_gbe_adapter, reset_task);
+        rtnl_lock();
        pch_gbe_reinit_locked(adapter);
+        rtnl_unlock();
 }
 /**
@@ -528,14 +537,8 @@ static void pch_gbe_reset_task(struct work_struct *work)
 */
 void pch_gbe_reinit_locked(struct pch_gbe_adapter *adapter)
 {
-        struct net_device *netdev = adapter->netdev;
+        pch_gbe_down(adapter);
+        pch_gbe_up(adapter);
-        rtnl_lock();
-        if (netif_running(netdev)) {
-                pch_gbe_down(adapter);
-                pch_gbe_up(adapter);
-        }
-        rtnl_unlock();
 }
 /**
@@ -1369,16 +1372,13 @@ pch_gbe_clean_rx(struct pch_gbe_adapter *adapter,
        struct pch_gbe_buffer *buffer_info;
        struct pch_gbe_rx_desc *rx_desc;
        u32 length;
-        unsigned char tmp_packet[ETH_HLEN];
        unsigned int i;
        unsigned int cleaned_count = 0;
        bool cleaned = false;
-        struct sk_buff *skb;
+        struct sk_buff *skb, *new_skb;
        u8 dma_status;
        u16 gbec_status;
        u32 tcp_ip_status;
-        u8 skb_copy_flag = 0;
-        u8 skb_padding_flag = 0;
        i = rx_ring->next_to_clean;
@@ -1422,55 +1422,70 @@ pch_gbe_clean_rx(struct pch_gbe_adapter *adapter,
                        pr_err("Receive CRC Error\n");
                } else {
                        /* get receive length */
-                        /* length convert[-3], padding[-2] */
+                        /* length convert[-3] */
-                        length = (rx_desc->rx_words_eob) - 3 - 2;
+                        length = (rx_desc->rx_words_eob) - 3;
                        /* Decide the data conversion method */
                        if (!adapter->rx_csum) {
                                /* [Header:14][payload] */
-                                skb_padding_flag = 0;
+                                if (NET_IP_ALIGN) {
-                                skb_copy_flag = 1;
+                                        /* Because alignment differs,
+                                         * the new_skb is newly allocated,
+                                         * and data is copied to new_skb.*/
+                                        new_skb = netdev_alloc_skb(netdev,
+                                                         length + NET_IP_ALIGN);
+                                        if (!new_skb) {
+                                                /* dorrop error */
+                                                pr_err("New skb allocation "
+                                                        "Error\n");
+                                                goto dorrop;
+                                        }
+                                        skb_reserve(new_skb, NET_IP_ALIGN);
+                                        memcpy(new_skb->data, skb->data,
+                                               length);
+                                        skb = new_skb;
+                                } else {
+                                        /* DMA buffer is used as SKB as it is.*/
+                                        buffer_info->skb = NULL;
+                                }
                        } else {
                                /* [Header:14][padding:2][payload] */
-                                skb_padding_flag = 1;
+                                /* The length includes padding length */
-                                if (length < copybreak)
+                                length = length - PCH_GBE_DMA_PADDING;
-                                        skb_copy_flag = 1;
+                                if ((length < copybreak) ||
-                                else
+                                    (NET_IP_ALIGN != PCH_GBE_DMA_PADDING)) {
-                                        skb_copy_flag = 0;
+                                        /* Because alignment differs,
-                        }
+                                         * the new_skb is newly allocated,
+                                         * and data is copied to new_skb.
-                        /* Data conversion */
+                                         * Padding data is deleted
-                        if (skb_copy_flag) {    /* recycle  skb */
+                                         * at the time of a copy.*/
-                                struct sk_buff *new_skb;
+                                        new_skb = netdev_alloc_skb(netdev,
-                                new_skb =
+                                                         length + NET_IP_ALIGN);
-                                    netdev_alloc_skb(netdev,
+                                        if (!new_skb) {
-                                                     length + NET_IP_ALIGN);
+                                                /* dorrop error */
-                                if (new_skb) {
+                                                pr_err("New skb allocation "
-                                        if (!skb_padding_flag) {
+                                                        "Error\n");
-                                                skb_reserve(new_skb,
+                                                goto dorrop;
-                                                                NET_IP_ALIGN);
                                        }
+                                        skb_reserve(new_skb, NET_IP_ALIGN);
                                        memcpy(new_skb->data, skb->data,
-                                                length);
+                                               ETH_HLEN);
-                                        /* save the skb
+                                        memcpy(&new_skb->data[ETH_HLEN],
-                                         * in buffer_info as good */
+                                               &skb->data[ETH_HLEN +
+                                               PCH_GBE_DMA_PADDING],
+                                               length - ETH_HLEN);
                                        skb = new_skb;
-                                } else if (!skb_padding_flag) {
+                                } else {
-                                        /* dorrop error */
+                                        /* Padding data is deleted
-                                        pr_err("New skb allocation Error\n");
+                                         * by moving header data.*/
-                                        goto dorrop;
+                                        memmove(&skb->data[PCH_GBE_DMA_PADDING],
+                                                &skb->data[0], ETH_HLEN);
+                                        skb_reserve(skb, NET_IP_ALIGN);
+                                        buffer_info->skb = NULL;
                                }
-                        } else {
-                                buffer_info->skb = NULL;
                        }
-                        if (skb_padding_flag) {
+                        /* The length includes FCS length */
-                                memcpy(&tmp_packet[0], &skb->data[0], ETH_HLEN);
+                        length = length - ETH_FCS_LEN;
-                                memcpy(&skb->data[NET_IP_ALIGN], &tmp_packet[0],
-                                        ETH_HLEN);
-                                skb_reserve(skb, NET_IP_ALIGN);
-                        }
                        /* update status of driver */
                        adapter->stats.rx_bytes += length;
                        adapter->stats.rx_packets++;
@@ -2247,7 +2262,7 @@ static void pch_gbe_remove(struct pci_dev *pdev)
        struct net_device *netdev = pci_get_drvdata(pdev);
        struct pch_gbe_adapter *adapter = netdev_priv(netdev);
-        flush_scheduled_work();
+        cancel_work_sync(&adapter->reset_task);
        unregister_netdev(netdev);
        pch_gbe_hal_phy_hw_reset(&adapter->hw);
@@ -2322,6 +2337,7 @@ static int pch_gbe_probe(struct pci_dev *pdev,
        netdev->features = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_GRO;
        pch_gbe_set_ethtool_ops(netdev);
+        pch_gbe_mac_load_mac_addr(&adapter->hw);
        pch_gbe_mac_reset_hw(&adapter->hw);
        /* setup the private structure */
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 1f42f6ac8551..d3cb77205863 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1488,12 +1488,10 @@ static void ei_rx_overrun(struct net_device *dev)
    
        /* 
         * Wait a full Tx time (1.2ms) + some guard time, NS says 1.6ms total.
-         * Early datasheets said to poll the reset bit, but now they say that
+         * We wait at least 2ms.
-         * it "is not a reliable indicator and subsequently should be ignored."
-         * We wait at least 10ms.
         */
-        mdelay(10);
+        mdelay(2);
        /*
         * Reset RBCR[01] back to zero as per magic incantation.
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 35fda5ac8120..392a6c4b72e5 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -77,7 +77,6 @@ config NATIONAL_PHY
          Currently supports the DP83865 PHY.
 config STE10XP
-        depends on PHYLIB
        tristate "Driver for STMicroelectronics STe10Xp PHYs"
        ---help---
          This is the driver for the STe100p and STe101p PHYs.
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 0fd1678bc5a9..590f902deb6b 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -19,13 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/phy.h>
+#include <linux/micrel_phy.h>
-#define PHY_ID_KSZ9021                  0x00221611
-#define PHY_ID_KS8737                   0x00221720
-#define PHY_ID_KS8041                   0x00221510
-#define PHY_ID_KS8051                   0x00221550
-/* both for ks8001 Rev. A/B, and for ks8721 Rev 3. */
-#define PHY_ID_KS8001                   0x0022161A
 /* general Interrupt control/status reg in vendor specific block. */
 #define MII_KSZPHY_INTCS                        0x1B
@@ -46,6 +40,7 @@
 #define KSZPHY_CTRL_INT_ACTIVE_HIGH             (1 << 9)
 #define KSZ9021_CTRL_INT_ACTIVE_HIGH            (1 << 14)
 #define KS8737_CTRL_INT_ACTIVE_HIGH             (1 << 14)
+#define KSZ8051_RMII_50MHZ_CLK                  (1 << 7)
 static int kszphy_ack_interrupt(struct phy_device *phydev)
 {
@@ -106,6 +101,19 @@ static int kszphy_config_init(struct phy_device *phydev)
        return 0;
 }
+static int ks8051_config_init(struct phy_device *phydev)
+{
+        int regval;
+        if (phydev->dev_flags & MICREL_PHY_50MHZ_CLK) {
+                regval = phy_read(phydev, MII_KSZPHY_CTRL);
+                regval |= KSZ8051_RMII_50MHZ_CLK;
+                phy_write(phydev, MII_KSZPHY_CTRL, regval);
+        }
+        return 0;
+}
 static struct phy_driver ks8737_driver = {
        .phy_id         = PHY_ID_KS8737,
        .phy_id_mask    = 0x00fffff0,
@@ -142,7 +150,7 @@ static struct phy_driver ks8051_driver = {
        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause
                                | SUPPORTED_Asym_Pause),
        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
-        .config_init    = kszphy_config_init,
+        .config_init    = ks8051_config_init,
        .config_aneg    = genphy_config_aneg,
        .read_status    = genphy_read_status,
        .ack_interrupt  = kszphy_ack_interrupt,
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index c7a6c4466978..9f6d670748d1 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -592,8 +592,8 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                        ppp_release(NULL, file);
                        err = 0;
                } else
-                        printk(KERN_DEBUG "PPPIOCDETACH file->f_count=%ld\n",
+                        pr_warn("PPPIOCDETACH file->f_count=%ld\n",
-                               atomic_long_read(&file->f_count));
+                                atomic_long_read(&file->f_count));
                mutex_unlock(&ppp_mutex);
                return err;
        }
@@ -630,7 +630,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        if (pf->kind != INTERFACE) {
                /* can't happen */
-                printk(KERN_ERR "PPP: not interface or channel??\n");
+                pr_err("PPP: not interface or channel??\n");
                return -EINVAL;
        }
@@ -704,7 +704,8 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                }
                vj = slhc_init(val2+1, val+1);
                if (!vj) {
-                        printk(KERN_ERR "PPP: no memory (VJ compressor)\n");
+                        netdev_err(ppp->dev,
+                                   "PPP: no memory (VJ compressor)\n");
                        err = -ENOMEM;
                        break;
                }
@@ -898,17 +899,17 @@ static int __init ppp_init(void)
 {
        int err;
-        printk(KERN_INFO "PPP generic driver version " PPP_VERSION "\n");
+        pr_info("PPP generic driver version " PPP_VERSION "\n");
        err = register_pernet_device(&ppp_net_ops);
        if (err) {
-                printk(KERN_ERR "failed to register PPP pernet device (%d)\n", err);
+                pr_err("failed to register PPP pernet device (%d)\n", err);
                goto out;
        }
        err = register_chrdev(PPP_MAJOR, "ppp", &ppp_device_fops);
        if (err) {
-                printk(KERN_ERR "failed to register PPP device (%d)\n", err);
+                pr_err("failed to register PPP device (%d)\n", err);
                goto out_net;
        }
@@ -1078,7 +1079,7 @@ pad_compress_skb(struct ppp *ppp, struct sk_buff *skb)
        new_skb = alloc_skb(new_skb_size, GFP_ATOMIC);
        if (!new_skb) {
                if (net_ratelimit())
-                        printk(KERN_ERR "PPP: no memory (comp pkt)\n");
+                        netdev_err(ppp->dev, "PPP: no memory (comp pkt)\n");
                return NULL;
        }
        if (ppp->dev->hard_header_len > PPP_HDRLEN)
@@ -1108,7 +1109,7 @@ pad_compress_skb(struct ppp *ppp, struct sk_buff *skb)
                 * the same number.
                 */
                if (net_ratelimit())
-                        printk(KERN_ERR "ppp: compressor dropped pkt\n");
+                        netdev_err(ppp->dev, "ppp: compressor dropped pkt\n");
                kfree_skb(skb);
                kfree_skb(new_skb);
                new_skb = NULL;
@@ -1138,7 +1139,9 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
                if (ppp->pass_filter &&
                    sk_run_filter(skb, ppp->pass_filter) == 0) {
                        if (ppp->debug & 1)
-                                printk(KERN_DEBUG "PPP: outbound frame not passed\n");
+                                netdev_printk(KERN_DEBUG, ppp->dev,
+                                              "PPP: outbound frame "
+                                              "not passed\n");
                        kfree_skb(skb);
                        return;
                }
@@ -1164,7 +1167,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
                new_skb = alloc_skb(skb->len + ppp->dev->hard_header_len - 2,
                                    GFP_ATOMIC);
                if (!new_skb) {
-                        printk(KERN_ERR "PPP: no memory (VJ comp pkt)\n");
+                        netdev_err(ppp->dev, "PPP: no memory (VJ comp pkt)\n");
                        goto drop;
                }
                skb_reserve(new_skb, ppp->dev->hard_header_len - 2);
@@ -1202,7 +1205,9 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
            proto != PPP_LCP && proto != PPP_CCP) {
                if (!(ppp->flags & SC_CCP_UP) && (ppp->flags & SC_MUST_COMP)) {
                        if (net_ratelimit())
-                                printk(KERN_ERR "ppp: compression required but down - pkt dropped.\n");
+                                netdev_err(ppp->dev,
+                                           "ppp: compression required but "
+                                           "down - pkt dropped.\n");
                        goto drop;
                }
                skb = pad_compress_skb(ppp, skb);
@@ -1505,7 +1510,7 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
 noskb:
        spin_unlock_bh(&pch->downl);
        if (ppp->debug & 1)
-                printk(KERN_ERR "PPP: no memory (fragment)\n");
+                netdev_err(ppp->dev, "PPP: no memory (fragment)\n");
        ++ppp->dev->stats.tx_errors;
        ++ppp->nxseq;
        return 1;       /* abandon the frame */
@@ -1686,7 +1691,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                        /* copy to a new sk_buff with more tailroom */
                        ns = dev_alloc_skb(skb->len + 128);
                        if (!ns) {
-                                printk(KERN_ERR"PPP: no memory (VJ decomp)\n");
+                                netdev_err(ppp->dev, "PPP: no memory "
+                                           "(VJ decomp)\n");
                                goto err;
                        }
                        skb_reserve(ns, 2);
@@ -1699,7 +1705,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                len = slhc_uncompress(ppp->vj, skb->data + 2, skb->len - 2);
                if (len <= 0) {
-                        printk(KERN_DEBUG "PPP: VJ decompression error\n");
+                        netdev_printk(KERN_DEBUG, ppp->dev,
+                                      "PPP: VJ decompression error\n");
                        goto err;
                }
                len += 2;
@@ -1721,7 +1728,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                        goto err;
                if (slhc_remember(ppp->vj, skb->data + 2, skb->len - 2) <= 0) {
-                        printk(KERN_ERR "PPP: VJ uncompressed error\n");
+                        netdev_err(ppp->dev, "PPP: VJ uncompressed error\n");
                        goto err;
                }
                proto = PPP_IP;
@@ -1762,8 +1769,9 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                        if (ppp->pass_filter &&
                            sk_run_filter(skb, ppp->pass_filter) == 0) {
                                if (ppp->debug & 1)
-                                        printk(KERN_DEBUG "PPP: inbound frame "
+                                        netdev_printk(KERN_DEBUG, ppp->dev,
-                                               "not passed\n");
+                                                      "PPP: inbound frame "
+                                                      "not passed\n");
                                kfree_skb(skb);
                                return;
                        }
@@ -1821,7 +1829,8 @@ ppp_decompress_frame(struct ppp *ppp, struct sk_buff *skb)
                ns = dev_alloc_skb(obuff_size);
                if (!ns) {
-                        printk(KERN_ERR "ppp_decompress_frame: no memory\n");
+                        netdev_err(ppp->dev, "ppp_decompress_frame: "
+                                   "no memory\n");
                        goto err;
                }
                /* the decompressor still expects the A/C bytes in the hdr */
@@ -1989,7 +1998,7 @@ ppp_mp_reconstruct(struct ppp *ppp)
        u32 seq = ppp->nextseq;
        u32 minseq = ppp->minseq;
        struct sk_buff_head *list = &ppp->mrq;
-        struct sk_buff *p, *next;
+        struct sk_buff *p, *tmp;
        struct sk_buff *head, *tail;
        struct sk_buff *skb = NULL;
        int lost = 0, len = 0;
@@ -1998,13 +2007,15 @@ ppp_mp_reconstruct(struct ppp *ppp)
                return NULL;
        head = list->next;
        tail = NULL;
-        for (p = head; p != (struct sk_buff *) list; p = next) {
+        skb_queue_walk_safe(list, p, tmp) {
-                next = p->next;
+        again:
                if (seq_before(PPP_MP_CB(p)->sequence, seq)) {
                        /* this can't happen, anyway ignore the skb */
-                        printk(KERN_ERR "ppp_mp_reconstruct bad seq %u < %u\n",
+                        netdev_err(ppp->dev, "ppp_mp_reconstruct bad "
-                               PPP_MP_CB(p)->sequence, seq);
+                                   "seq %u < %u\n",
-                        head = next;
+                                   PPP_MP_CB(p)->sequence, seq);
+                        __skb_unlink(p, list);
+                        kfree_skb(p);
                        continue;
                }
                if (PPP_MP_CB(p)->sequence != seq) {
@@ -2016,8 +2027,7 @@ ppp_mp_reconstruct(struct ppp *ppp)
                        lost = 1;
                        seq = seq_before(minseq, PPP_MP_CB(p)->sequence)?
                                minseq + 1: PPP_MP_CB(p)->sequence;
-                        next = p;
+                        goto again;
-                        continue;
                }
                /*
@@ -2042,17 +2052,9 @@ ppp_mp_reconstruct(struct ppp *ppp)
                    (PPP_MP_CB(head)->BEbits & B)) {
                        if (len > ppp->mrru + 2) {
                                ++ppp->dev->stats.rx_length_errors;
-                                printk(KERN_DEBUG "PPP: reconstructed packet"
+                                netdev_printk(KERN_DEBUG, ppp->dev,
-                                       " is too long (%d)\n", len);
+                                              "PPP: reconstructed packet"
-                        } else if (p == head) {
+                                              " is too long (%d)\n", len);
-                                /* fragment is complete packet - reuse skb */
-                                tail = p;
-                                skb = skb_get(p);
-                                break;
-                        } else if ((skb = dev_alloc_skb(len)) == NULL) {
-                                ++ppp->dev->stats.rx_missed_errors;
-                                printk(KERN_DEBUG "PPP: no memory for "
-                                       "reconstructed packet");
                        } else {
                                tail = p;
                                break;
@@ -2065,9 +2067,17 @@ ppp_mp_reconstruct(struct ppp *ppp)
                 * and we haven't found a complete valid packet yet,
                 * we can discard up to and including this fragment.
                 */
-                if (PPP_MP_CB(p)->BEbits & E)
+                if (PPP_MP_CB(p)->BEbits & E) {
-                        head = next;
+                        struct sk_buff *tmp2;
+                        skb_queue_reverse_walk_from_safe(list, p, tmp2) {
+                                __skb_unlink(p, list);
+                                kfree_skb(p);
+                        }
+                        head = skb_peek(list);
+                        if (!head)
+                                break;
+                }
                ++seq;
        }
@@ -2077,26 +2087,37 @@ ppp_mp_reconstruct(struct ppp *ppp)
                   signal a receive error. */
                if (PPP_MP_CB(head)->sequence != ppp->nextseq) {
                        if (ppp->debug & 1)
-                                printk(KERN_DEBUG "  missed pkts %u..%u\n",
+                                netdev_printk(KERN_DEBUG, ppp->dev,
-                                       ppp->nextseq,
+                                              "  missed pkts %u..%u\n",
-                                       PPP_MP_CB(head)->sequence-1);
+                                              ppp->nextseq,
+                                              PPP_MP_CB(head)->sequence-1);
                        ++ppp->dev->stats.rx_dropped;
                        ppp_receive_error(ppp);
                }
-                if (head != tail)
+                skb = head;
-                        /* copy to a single skb */
+                if (head != tail) {
-                        for (p = head; p != tail->next; p = p->next)
+                        struct sk_buff **fragpp = &skb_shinfo(skb)->frag_list;
-                                skb_copy_bits(p, 0, skb_put(skb, p->len), p->len);
+                        p = skb_queue_next(list, head);
-                ppp->nextseq = PPP_MP_CB(tail)->sequence + 1;
+                        __skb_unlink(skb, list);
-                head = tail->next;
+                        skb_queue_walk_from_safe(list, p, tmp) {
-        }
+                                __skb_unlink(p, list);
+                                *fragpp = p;
+                                p->next = NULL;
+                                fragpp = &p->next;
+                                skb->len += p->len;
+                                skb->data_len += p->len;
+                                skb->truesize += p->len;
+                                if (p == tail)
+                                        break;
+                        }
+                } else {
+                        __skb_unlink(skb, list);
+                }
-        /* Discard all the skbuffs that we have copied the data out of
+                ppp->nextseq = PPP_MP_CB(tail)->sequence + 1;
-           or that we can't use. */
-        while ((p = list->next) != head) {
-                __skb_unlink(p, list);
-                kfree_skb(p);
        }
        return skb;
@@ -2617,8 +2638,8 @@ ppp_create_interface(struct net *net, int unit, int *retp)
        ret = register_netdev(dev);
        if (ret != 0) {
                unit_put(&pn->units_idr, unit);
-                printk(KERN_ERR "PPP: couldn't register device %s (%d)\n",
+                netdev_err(ppp->dev, "PPP: couldn't register device %s (%d)\n",
-                       dev->name, ret);
+                           dev->name, ret);
                goto out2;
        }
@@ -2690,9 +2711,9 @@ static void ppp_destroy_interface(struct ppp *ppp)
        if (!ppp->file.dead || ppp->n_channels) {
                /* "can't happen" */
-                printk(KERN_ERR "ppp: destroying ppp struct %p but dead=%d "
+                netdev_err(ppp->dev, "ppp: destroying ppp struct %p "
-                       "n_channels=%d !\n", ppp, ppp->file.dead,
+                           "but dead=%d n_channels=%d !\n",
-                       ppp->n_channels);
+                           ppp, ppp->file.dead, ppp->n_channels);
                return;
        }
@@ -2834,8 +2855,7 @@ static void ppp_destroy_channel(struct channel *pch)
        if (!pch->file.dead) {
                /* "can't happen" */
-                printk(KERN_ERR "ppp: destroying undead channel %p !\n",
+                pr_err("ppp: destroying undead channel %p !\n", pch);
-                       pch);
                return;
        }
        skb_queue_purge(&pch->file.xq);
@@ -2847,7 +2867,7 @@ static void __exit ppp_cleanup(void)
 {
        /* should never happen */
        if (atomic_read(&ppp_unit_count) || atomic_read(&channel_count))
-                printk(KERN_ERR "PPP: removing module but units remain!\n");
+                pr_err("PPP: removing module but units remain!\n");
        unregister_chrdev(PPP_MAJOR, "ppp");
        device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));
        class_destroy(ppp_class);
@@ -2865,7 +2885,7 @@ static int __unit_alloc(struct idr *p, void *ptr, int n)
 again:
        if (!idr_pre_get(p, GFP_KERNEL)) {
-                printk(KERN_ERR "PPP: No free memory for idr\n");
+                pr_err("PPP: No free memory for idr\n");
                return -ENOMEM;
        }
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index bde7d61f1930..469ab0b7ce31 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -973,7 +973,8 @@ static void __rtl8169_check_link_status(struct net_device *dev,
                if (pm)
                        pm_request_resume(&tp->pci_dev->dev);
                netif_carrier_on(dev);
-                netif_info(tp, ifup, dev, "link up\n");
+                if (net_ratelimit())
+                        netif_info(tp, ifup, dev, "link up\n");
        } else {
                netif_carrier_off(dev);
                netif_info(tp, ifdown, dev, "link down\n");
@@ -3189,6 +3190,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (pci_dev_run_wake(pdev))
                pm_runtime_put_noidle(&pdev->dev);
+        netif_carrier_off(dev);
 out:
        return rc;
@@ -3757,7 +3760,8 @@ static void rtl_hw_start_8168(struct net_device *dev)
        RTL_W16(IntrMitigate, 0x5151);
        /* Work around for RxFIFO overflow. */
-        if (tp->mac_version == RTL_GIGA_MAC_VER_11) {
+        if (tp->mac_version == RTL_GIGA_MAC_VER_11 ||
+            tp->mac_version == RTL_GIGA_MAC_VER_22) {
                tp->intr_event |= RxFIFOOver | PCSTimeout;
                tp->intr_event &= ~RxOverflow;
        }
@@ -4639,12 +4643,33 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
                        break;
                }
-                /* Work around for rx fifo overflow */
+                if (unlikely(status & RxFIFOOver)) {
-                if (unlikely(status & RxFIFOOver) &&
+                        switch (tp->mac_version) {
-                (tp->mac_version == RTL_GIGA_MAC_VER_11)) {
+                        /* Work around for rx fifo overflow */
-                        netif_stop_queue(dev);
+                        case RTL_GIGA_MAC_VER_11:
-                        rtl8169_tx_timeout(dev);
+                        case RTL_GIGA_MAC_VER_22:
-                        break;
+                        case RTL_GIGA_MAC_VER_26:
+                                netif_stop_queue(dev);
+                                rtl8169_tx_timeout(dev);
+                                goto done;
+                        /* Testers needed. */
+                        case RTL_GIGA_MAC_VER_17:
+                        case RTL_GIGA_MAC_VER_19:
+                        case RTL_GIGA_MAC_VER_20:
+                        case RTL_GIGA_MAC_VER_21:
+                        case RTL_GIGA_MAC_VER_23:
+                        case RTL_GIGA_MAC_VER_24:
+                        case RTL_GIGA_MAC_VER_27:
+                        case RTL_GIGA_MAC_VER_28:
+                        /* Experimental science. Pktgen proof. */
+                        case RTL_GIGA_MAC_VER_12:
+                        case RTL_GIGA_MAC_VER_25:
+                                if (status == RxFIFOOver)
+                                        goto done;
+                                break;
+                        default:
+                                break;
+                        }
                }
                if (unlikely(status & SYSErr)) {
@@ -4680,7 +4705,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
                        (status & RxFIFOOver) ? (status | RxOverflow) : status);
                status = RTL_R16(IntrStatus);
        }
+done:
        return IRQ_RETVAL(handled);
 }
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 002bac743843..35b7bc52a2d1 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -21,6 +21,7 @@
 #include <linux/ethtool.h>
 #include <linux/topology.h>
 #include <linux/gfp.h>
+#include <linux/cpu_rmap.h>
 #include "net_driver.h"
 #include "efx.h"
 #include "nic.h"
@@ -307,6 +308,8 @@ static int efx_poll(struct napi_struct *napi, int budget)
                        channel->irq_mod_score = 0;
                }
+                efx_filter_rfs_expire(channel);
                /* There is no race here; although napi_disable() will
                 * only wait for napi_complete(), this isn't a problem
                 * since efx_channel_processed() will have no effect if
@@ -673,7 +676,7 @@ static void efx_fini_channels(struct efx_nic *efx)
                efx_for_each_channel_rx_queue(rx_queue, channel)
                        efx_fini_rx_queue(rx_queue);
-                efx_for_each_channel_tx_queue(tx_queue, channel)
+                efx_for_each_possible_channel_tx_queue(tx_queue, channel)
                        efx_fini_tx_queue(tx_queue);
                efx_fini_eventq(channel);
        }
@@ -689,7 +692,7 @@ static void efx_remove_channel(struct efx_channel *channel)
        efx_for_each_channel_rx_queue(rx_queue, channel)
                efx_remove_rx_queue(rx_queue);
-        efx_for_each_channel_tx_queue(tx_queue, channel)
+        efx_for_each_possible_channel_tx_queue(tx_queue, channel)
                efx_remove_tx_queue(tx_queue);
        efx_remove_eventq(channel);
 }
@@ -1175,10 +1178,32 @@ static int efx_wanted_channels(void)
        return count;
 }
+static int
+efx_init_rx_cpu_rmap(struct efx_nic *efx, struct msix_entry *xentries)
+{
+#ifdef CONFIG_RFS_ACCEL
+        int i, rc;
+        efx->net_dev->rx_cpu_rmap = alloc_irq_cpu_rmap(efx->n_rx_channels);
+        if (!efx->net_dev->rx_cpu_rmap)
+                return -ENOMEM;
+        for (i = 0; i < efx->n_rx_channels; i++) {
+                rc = irq_cpu_rmap_add(efx->net_dev->rx_cpu_rmap,
+                                      xentries[i].vector);
+                if (rc) {
+                        free_irq_cpu_rmap(efx->net_dev->rx_cpu_rmap);
+                        efx->net_dev->rx_cpu_rmap = NULL;
+                        return rc;
+                }
+        }
+#endif
+        return 0;
+}
 /* Probe the number and type of interrupts we are able to obtain, and
 * the resulting numbers of channels and RX queues.
 */
-static void efx_probe_interrupts(struct efx_nic *efx)
+static int efx_probe_interrupts(struct efx_nic *efx)
 {
        int max_channels =
                min_t(int, efx->type->phys_addr_channels, EFX_MAX_CHANNELS);
@@ -1220,6 +1245,11 @@ static void efx_probe_interrupts(struct efx_nic *efx)
                                efx->n_tx_channels = efx->n_channels;
                                efx->n_rx_channels = efx->n_channels;
                        }
+                        rc = efx_init_rx_cpu_rmap(efx, xentries);
+                        if (rc) {
+                                pci_disable_msix(efx->pci_dev);
+                                return rc;
+                        }
                        for (i = 0; i < n_channels; i++)
                                efx_get_channel(efx, i)->irq =
                                        xentries[i].vector;
@@ -1253,6 +1283,8 @@ static void efx_probe_interrupts(struct efx_nic *efx)
                efx->n_tx_channels = 1;
                efx->legacy_irq = efx->pci_dev->irq;
        }
+        return 0;
 }
 static void efx_remove_interrupts(struct efx_nic *efx)
@@ -1271,21 +1303,8 @@ static void efx_remove_interrupts(struct efx_nic *efx)
 static void efx_set_channels(struct efx_nic *efx)
 {
-        struct efx_channel *channel;
-        struct efx_tx_queue *tx_queue;
        efx->tx_channel_offset =
                separate_tx_channels ? efx->n_channels - efx->n_tx_channels : 0;
-        /* Channel pointers were set in efx_init_struct() but we now
-         * need to clear them for TX queues in any RX-only channels. */
-        efx_for_each_channel(channel, efx) {
-                if (channel->channel - efx->tx_channel_offset >=
-                    efx->n_tx_channels) {
-                        efx_for_each_channel_tx_queue(tx_queue, channel)
-                                tx_queue->channel = NULL;
-                }
-        }
 }
 static int efx_probe_nic(struct efx_nic *efx)
@@ -1302,7 +1321,9 @@ static int efx_probe_nic(struct efx_nic *efx)
        /* Determine the number of channels and queues by trying to hook
         * in MSI-X interrupts. */
-        efx_probe_interrupts(efx);
+        rc = efx_probe_interrupts(efx);
+        if (rc)
+                goto fail;
        if (efx->n_channels > 1)
                get_random_bytes(&efx->rx_hash_key, sizeof(efx->rx_hash_key));
@@ -1317,6 +1338,10 @@ static int efx_probe_nic(struct efx_nic *efx)
        efx_init_irq_moderation(efx, tx_irq_mod_usec, rx_irq_mod_usec, true);
        return 0;
+fail:
+        efx->type->remove(efx);
+        return rc;
 }
 static void efx_remove_nic(struct efx_nic *efx)
@@ -1531,9 +1556,9 @@ void efx_init_irq_moderation(struct efx_nic *efx, int tx_usecs, int rx_usecs,
        efx->irq_rx_adaptive = rx_adaptive;
        efx->irq_rx_moderation = rx_ticks;
        efx_for_each_channel(channel, efx) {
-                if (efx_channel_get_rx_queue(channel))
+                if (efx_channel_has_rx_queue(channel))
                        channel->irq_moderation = rx_ticks;
-                else if (efx_channel_get_tx_queue(channel, 0))
+                else if (efx_channel_has_tx_queues(channel))
                        channel->irq_moderation = tx_ticks;
        }
 }
@@ -1849,6 +1874,10 @@ static const struct net_device_ops efx_netdev_ops = {
 #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller = efx_netpoll,
 #endif
+        .ndo_setup_tc           = efx_setup_tc,
+#ifdef CONFIG_RFS_ACCEL
+        .ndo_rx_flow_steer      = efx_filter_rfs,
+#endif
 };
 static void efx_update_name(struct efx_nic *efx)
@@ -1910,10 +1939,8 @@ static int efx_register_netdev(struct efx_nic *efx)
        efx_for_each_channel(channel, efx) {
                struct efx_tx_queue *tx_queue;
-                efx_for_each_channel_tx_queue(tx_queue, channel) {
+                efx_for_each_channel_tx_queue(tx_queue, channel)
-                        tx_queue->core_txq = netdev_get_tx_queue(
+                        efx_init_tx_queue_core_txq(tx_queue);
-                                efx->net_dev, tx_queue->queue / EFX_TXQ_TYPES);
-                }
        }
        /* Always start with carrier off; PHY events will detect the link */
@@ -2288,6 +2315,10 @@ static void efx_fini_struct(struct efx_nic *efx)
 */
 static void efx_pci_remove_main(struct efx_nic *efx)
 {
+#ifdef CONFIG_RFS_ACCEL
+        free_irq_cpu_rmap(efx->net_dev->rx_cpu_rmap);
+        efx->net_dev->rx_cpu_rmap = NULL;
+#endif
        efx_nic_fini_interrupt(efx);
        efx_fini_channels(efx);
        efx_fini_port(efx);
@@ -2401,7 +2432,8 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
        int i, rc;
        /* Allocate and initialise a struct net_device and struct efx_nic */
-        net_dev = alloc_etherdev_mq(sizeof(*efx), EFX_MAX_CORE_TX_QUEUES);
+        net_dev = alloc_etherdev_mqs(sizeof(*efx), EFX_MAX_CORE_TX_QUEUES,
+                                     EFX_MAX_RX_QUEUES);
        if (!net_dev)
                return -ENOMEM;
        net_dev->features |= (type->offload_features | NETIF_F_SG |
diff --git a/drivers/net/sfc/efx.h b/drivers/net/sfc/efx.h
index d43a7e5212b1..cbce62b9c996 100644
--- a/drivers/net/sfc/efx.h
+++ b/drivers/net/sfc/efx.h
@@ -29,6 +29,7 @@
 extern int efx_probe_tx_queue(struct efx_tx_queue *tx_queue);
 extern void efx_remove_tx_queue(struct efx_tx_queue *tx_queue);
 extern void efx_init_tx_queue(struct efx_tx_queue *tx_queue);
+extern void efx_init_tx_queue_core_txq(struct efx_tx_queue *tx_queue);
 extern void efx_fini_tx_queue(struct efx_tx_queue *tx_queue);
 extern void efx_release_tx_buffers(struct efx_tx_queue *tx_queue);
 extern netdev_tx_t
@@ -36,6 +37,7 @@ efx_hard_start_xmit(struct sk_buff *skb, struct net_device *net_dev);
 extern netdev_tx_t
 efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb);
 extern void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index);
+extern int efx_setup_tc(struct net_device *net_dev, u8 num_tc);
 /* RX */
 extern int efx_probe_rx_queue(struct efx_rx_queue *rx_queue);
@@ -74,6 +76,21 @@ extern int efx_filter_remove_filter(struct efx_nic *efx,
                                    struct efx_filter_spec *spec);
 extern void efx_filter_clear_rx(struct efx_nic *efx,
                                enum efx_filter_priority priority);
+#ifdef CONFIG_RFS_ACCEL
+extern int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
+                          u16 rxq_index, u32 flow_id);
+extern bool __efx_filter_rfs_expire(struct efx_nic *efx, unsigned quota);
+static inline void efx_filter_rfs_expire(struct efx_channel *channel)
+{
+        if (channel->rfs_filters_added >= 60 &&
+            __efx_filter_rfs_expire(channel->efx, 100))
+                channel->rfs_filters_added -= 60;
+}
+#define efx_filter_rfs_enabled() 1
+#else
+static inline void efx_filter_rfs_expire(struct efx_channel *channel) {}
+#define efx_filter_rfs_enabled() 0
+#endif
 /* Channels */
 extern void efx_process_channel_now(struct efx_channel *channel);
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index 0e8bb19ed60d..272cfe724e1b 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -502,7 +502,7 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,
 static int efx_ethtool_set_tso(struct net_device *net_dev, u32 enable)
 {
        struct efx_nic *efx __attribute__ ((unused)) = netdev_priv(net_dev);
-        unsigned long features;
+        u32 features;
        features = NETIF_F_TSO;
        if (efx->type->offload_features & NETIF_F_V6_CSUM)
@@ -519,7 +519,7 @@ static int efx_ethtool_set_tso(struct net_device *net_dev, u32 enable)
 static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable)
 {
        struct efx_nic *efx = netdev_priv(net_dev);
-        unsigned long features = efx->type->offload_features & NETIF_F_ALL_CSUM;
+        u32 features = efx->type->offload_features & NETIF_F_ALL_CSUM;
        if (enable)
                net_dev->features |= features;
@@ -631,7 +631,7 @@ static int efx_ethtool_get_coalesce(struct net_device *net_dev,
        /* Find lowest IRQ moderation across all used TX queues */
        coalesce->tx_coalesce_usecs_irq = ~((u32) 0);
        efx_for_each_channel(channel, efx) {
-                if (!efx_channel_get_tx_queue(channel, 0))
+                if (!efx_channel_has_tx_queues(channel))
                        continue;
                if (channel->irq_moderation < coalesce->tx_coalesce_usecs_irq) {
                        if (channel->channel < efx->n_rx_channels)
@@ -676,8 +676,8 @@ static int efx_ethtool_set_coalesce(struct net_device *net_dev,
        /* If the channel is shared only allow RX parameters to be set */
        efx_for_each_channel(channel, efx) {
-                if (efx_channel_get_rx_queue(channel) &&
+                if (efx_channel_has_rx_queue(channel) &&
-                    efx_channel_get_tx_queue(channel, 0) &&
+                    efx_channel_has_tx_queues(channel) &&
                    tx_usecs) {
                        netif_err(efx, drv, efx->net_dev, "Channel is shared. "
                                  "Only RX coalescing may be set\n");
diff --git a/drivers/net/sfc/filter.c b/drivers/net/sfc/filter.c
index d4722c41c4ce..95a980fd63d5 100644
--- a/drivers/net/sfc/filter.c
+++ b/drivers/net/sfc/filter.c
@@ -8,6 +8,7 @@
 */
 #include <linux/in.h>
+#include <net/ip.h>
 #include "efx.h"
 #include "filter.h"
 #include "io.h"
@@ -27,6 +28,10 @@
 */
 #define FILTER_CTL_SRCH_MAX 200
+/* Don't try very hard to find space for performance hints, as this is
+ * counter-productive. */
+#define FILTER_CTL_SRCH_HINT_MAX 5
 enum efx_filter_table_id {
        EFX_FILTER_TABLE_RX_IP = 0,
        EFX_FILTER_TABLE_RX_MAC,
@@ -47,6 +52,10 @@ struct efx_filter_table {
 struct efx_filter_state {
        spinlock_t      lock;
        struct efx_filter_table table[EFX_FILTER_TABLE_COUNT];
+#ifdef CONFIG_RFS_ACCEL
+        u32             *rps_flow_id;
+        unsigned        rps_expire_index;
+#endif
 };
 /* The filter hash function is LFSR polynomial x^16 + x^3 + 1 of a 32-bit
@@ -325,15 +334,16 @@ static int efx_filter_search(struct efx_filter_table *table,
                             struct efx_filter_spec *spec, u32 key,
                             bool for_insert, int *depth_required)
 {
-        unsigned hash, incr, filter_idx, depth;
+        unsigned hash, incr, filter_idx, depth, depth_max;
        struct efx_filter_spec *cmp;
        hash = efx_filter_hash(key);
        incr = efx_filter_increment(key);
+        depth_max = (spec->priority <= EFX_FILTER_PRI_HINT ?
+                     FILTER_CTL_SRCH_HINT_MAX : FILTER_CTL_SRCH_MAX);
        for (depth = 1, filter_idx = hash & (table->size - 1);
-             depth <= FILTER_CTL_SRCH_MAX &&
+             depth <= depth_max && test_bit(filter_idx, table->used_bitmap);
-                     test_bit(filter_idx, table->used_bitmap);
             ++depth) {
                cmp = &table->spec[filter_idx];
                if (efx_filter_equal(spec, cmp))
@@ -342,7 +352,7 @@ static int efx_filter_search(struct efx_filter_table *table,
        }
        if (!for_insert)
                return -ENOENT;
-        if (depth > FILTER_CTL_SRCH_MAX)
+        if (depth > depth_max)
                return -EBUSY;
 found:
        *depth_required = depth;
@@ -562,6 +572,13 @@ int efx_probe_filters(struct efx_nic *efx)
        spin_lock_init(&state->lock);
        if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
+#ifdef CONFIG_RFS_ACCEL
+                state->rps_flow_id = kcalloc(FR_BZ_RX_FILTER_TBL0_ROWS,
+                                             sizeof(*state->rps_flow_id),
+                                             GFP_KERNEL);
+                if (!state->rps_flow_id)
+                        goto fail;
+#endif
                table = &state->table[EFX_FILTER_TABLE_RX_IP];
                table->id = EFX_FILTER_TABLE_RX_IP;
                table->offset = FR_BZ_RX_FILTER_TBL0;
@@ -607,5 +624,97 @@ void efx_remove_filters(struct efx_nic *efx)
                kfree(state->table[table_id].used_bitmap);
                vfree(state->table[table_id].spec);
        }
+#ifdef CONFIG_RFS_ACCEL
+        kfree(state->rps_flow_id);
+#endif
        kfree(state);
 }
+#ifdef CONFIG_RFS_ACCEL
+int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
+                   u16 rxq_index, u32 flow_id)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        struct efx_channel *channel;
+        struct efx_filter_state *state = efx->filter_state;
+        struct efx_filter_spec spec;
+        const struct iphdr *ip;
+        const __be16 *ports;
+        int nhoff;
+        int rc;
+        nhoff = skb_network_offset(skb);
+        if (skb->protocol != htons(ETH_P_IP))
+                return -EPROTONOSUPPORT;
+        /* RFS must validate the IP header length before calling us */
+        EFX_BUG_ON_PARANOID(!pskb_may_pull(skb, nhoff + sizeof(*ip)));
+        ip = (const struct iphdr *)(skb->data + nhoff);
+        if (ip->frag_off & htons(IP_MF | IP_OFFSET))
+                return -EPROTONOSUPPORT;
+        EFX_BUG_ON_PARANOID(!pskb_may_pull(skb, nhoff + 4 * ip->ihl + 4));
+        ports = (const __be16 *)(skb->data + nhoff + 4 * ip->ihl);
+        efx_filter_init_rx(&spec, EFX_FILTER_PRI_HINT, 0, rxq_index);
+        rc = efx_filter_set_ipv4_full(&spec, ip->protocol,
+                                      ip->daddr, ports[1], ip->saddr, ports[0]);
+        if (rc)
+                return rc;
+        rc = efx_filter_insert_filter(efx, &spec, true);
+        if (rc < 0)
+                return rc;
+        /* Remember this so we can check whether to expire the filter later */
+        state->rps_flow_id[rc] = flow_id;
+        channel = efx_get_channel(efx, skb_get_rx_queue(skb));
+        ++channel->rfs_filters_added;
+        netif_info(efx, rx_status, efx->net_dev,
+                   "steering %s %pI4:%u:%pI4:%u to queue %u [flow %u filter %d]\n",
+                   (ip->protocol == IPPROTO_TCP) ? "TCP" : "UDP",
+                   &ip->saddr, ntohs(ports[0]), &ip->daddr, ntohs(ports[1]),
+                   rxq_index, flow_id, rc);
+        return rc;
+}
+bool __efx_filter_rfs_expire(struct efx_nic *efx, unsigned quota)
+{
+        struct efx_filter_state *state = efx->filter_state;
+        struct efx_filter_table *table = &state->table[EFX_FILTER_TABLE_RX_IP];
+        unsigned mask = table->size - 1;
+        unsigned index;
+        unsigned stop;
+        if (!spin_trylock_bh(&state->lock))
+                return false;
+        index = state->rps_expire_index;
+        stop = (index + quota) & mask;
+        while (index != stop) {
+                if (test_bit(index, table->used_bitmap) &&
+                    table->spec[index].priority == EFX_FILTER_PRI_HINT &&
+                    rps_may_expire_flow(efx->net_dev,
+                                        table->spec[index].dmaq_id,
+                                        state->rps_flow_id[index], index)) {
+                        netif_info(efx, rx_status, efx->net_dev,
+                                   "expiring filter %d [flow %u]\n",
+                                   index, state->rps_flow_id[index]);
+                        efx_filter_table_clear_entry(efx, table, index);
+                }
+                index = (index + 1) & mask;
+        }
+        state->rps_expire_index = stop;
+        if (table->used == 0)
+                efx_filter_table_reset_search_depth(table);
+        spin_unlock_bh(&state->lock);
+        return true;
+}
+#endif /* CONFIG_RFS_ACCEL */
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 28df8665256a..15b9068e5b87 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -63,10 +63,12 @@
 /* Checksum generation is a per-queue option in hardware, so each
 * queue visible to the networking core is backed by two hardware TX
 * queues. */
-#define EFX_MAX_CORE_TX_QUEUES  EFX_MAX_CHANNELS
+#define EFX_MAX_TX_TC           2
-#define EFX_TXQ_TYPE_OFFLOAD    1
+#define EFX_MAX_CORE_TX_QUEUES  (EFX_MAX_TX_TC * EFX_MAX_CHANNELS)
-#define EFX_TXQ_TYPES           2
+#define EFX_TXQ_TYPE_OFFLOAD    1       /* flag */
-#define EFX_MAX_TX_QUEUES       (EFX_TXQ_TYPES * EFX_MAX_CORE_TX_QUEUES)
+#define EFX_TXQ_TYPE_HIGHPRI    2       /* flag */
+#define EFX_TXQ_TYPES           4
+#define EFX_MAX_TX_QUEUES       (EFX_TXQ_TYPES * EFX_MAX_CHANNELS)
 /**
 * struct efx_special_buffer - An Efx special buffer
@@ -140,6 +142,7 @@ struct efx_tx_buffer {
 * @buffer: The software buffer ring
 * @txd: The hardware descriptor ring
 * @ptr_mask: The size of the ring minus 1.
+ * @initialised: Has hardware queue been initialised?
 * @flushed: Used when handling queue flushing
 * @read_count: Current read pointer.
 *      This is the number of buffers that have been removed from both rings.
@@ -182,6 +185,7 @@ struct efx_tx_queue {
        struct efx_tx_buffer *buffer;
        struct efx_special_buffer txd;
        unsigned int ptr_mask;
+        bool initialised;
        enum efx_flush_state flushed;
        /* Members used mainly on the completion path */
@@ -358,6 +362,9 @@ struct efx_channel {
        unsigned int irq_count;
        unsigned int irq_mod_score;
+#ifdef CONFIG_RFS_ACCEL
+        unsigned int rfs_filters_added;
+#endif
        int rx_alloc_level;
        int rx_alloc_push_pages;
@@ -377,7 +384,7 @@ struct efx_channel {
        bool rx_pkt_csummed;
        struct efx_rx_queue rx_queue;
-        struct efx_tx_queue tx_queue[2];
+        struct efx_tx_queue tx_queue[EFX_TXQ_TYPES];
 };
 enum efx_led_mode {
@@ -906,7 +913,7 @@ struct efx_nic_type {
        unsigned int phys_addr_channels;
        unsigned int tx_dc_base;
        unsigned int rx_dc_base;
-        unsigned long offload_features;
+        u32 offload_features;
        u32 reset_world_flags;
 };
@@ -938,18 +945,40 @@ efx_get_tx_queue(struct efx_nic *efx, unsigned index, unsigned type)
        return &efx->channel[efx->tx_channel_offset + index]->tx_queue[type];
 }
+static inline bool efx_channel_has_tx_queues(struct efx_channel *channel)
+{
+        return channel->channel - channel->efx->tx_channel_offset <
+                channel->efx->n_tx_channels;
+}
 static inline struct efx_tx_queue *
 efx_channel_get_tx_queue(struct efx_channel *channel, unsigned type)
 {
-        struct efx_tx_queue *tx_queue = channel->tx_queue;
+        EFX_BUG_ON_PARANOID(!efx_channel_has_tx_queues(channel) ||
-        EFX_BUG_ON_PARANOID(type >= EFX_TXQ_TYPES);
+                            type >= EFX_TXQ_TYPES);
-        return tx_queue->channel ? tx_queue + type : NULL;
+        return &channel->tx_queue[type];
+}
+static inline bool efx_tx_queue_used(struct efx_tx_queue *tx_queue)
+{
+        return !(tx_queue->efx->net_dev->num_tc < 2 &&
+                 tx_queue->queue & EFX_TXQ_TYPE_HIGHPRI);
 }
 /* Iterate over all TX queues belonging to a channel */
 #define efx_for_each_channel_tx_queue(_tx_queue, _channel)              \
-        for (_tx_queue = efx_channel_get_tx_queue(channel, 0);          \
+        if (!efx_channel_has_tx_queues(_channel))                       \
-             _tx_queue && _tx_queue < (_channel)->tx_queue + EFX_TXQ_TYPES; \
+                ;                                                       \
+        else                                                            \
+                for (_tx_queue = (_channel)->tx_queue;                  \
+                     _tx_queue < (_channel)->tx_queue + EFX_TXQ_TYPES && \
+                             efx_tx_queue_used(_tx_queue);              \
+                     _tx_queue++)
+/* Iterate over all possible TX queues belonging to a channel */
+#define efx_for_each_possible_channel_tx_queue(_tx_queue, _channel)     \
+        for (_tx_queue = (_channel)->tx_queue;                          \
+             _tx_queue < (_channel)->tx_queue + EFX_TXQ_TYPES;          \
             _tx_queue++)
 static inline struct efx_rx_queue *
@@ -959,18 +988,26 @@ efx_get_rx_queue(struct efx_nic *efx, unsigned index)
        return &efx->channel[index]->rx_queue;
 }
+static inline bool efx_channel_has_rx_queue(struct efx_channel *channel)
+{
+        return channel->channel < channel->efx->n_rx_channels;
+}
 static inline struct efx_rx_queue *
 efx_channel_get_rx_queue(struct efx_channel *channel)
 {
-        return channel->channel < channel->efx->n_rx_channels ?
+        EFX_BUG_ON_PARANOID(!efx_channel_has_rx_queue(channel));
-                &channel->rx_queue : NULL;
+        return &channel->rx_queue;
 }
 /* Iterate over all RX queues belonging to a channel */
 #define efx_for_each_channel_rx_queue(_rx_queue, _channel)              \
-        for (_rx_queue = efx_channel_get_rx_queue(channel);             \
+        if (!efx_channel_has_rx_queue(_channel))                        \
-             _rx_queue;                                                 \
+                ;                                                       \
-             _rx_queue = NULL)
+        else                                                            \
+                for (_rx_queue = &(_channel)->rx_queue;                 \
+                     _rx_queue;                                         \
+                     _rx_queue = NULL)
 static inline struct efx_channel *
 efx_rx_queue_channel(struct efx_rx_queue *rx_queue)
diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c
index da386599ab68..1d0b8b6f25c4 100644
--- a/drivers/net/sfc/nic.c
+++ b/drivers/net/sfc/nic.c
@@ -445,8 +445,8 @@ int efx_nic_probe_tx(struct efx_tx_queue *tx_queue)
 void efx_nic_init_tx(struct efx_tx_queue *tx_queue)
 {
-        efx_oword_t tx_desc_ptr;
        struct efx_nic *efx = tx_queue->efx;
+        efx_oword_t reg;
        tx_queue->flushed = FLUSH_NONE;
@@ -454,7 +454,7 @@ void efx_nic_init_tx(struct efx_tx_queue *tx_queue)
        efx_init_special_buffer(efx, &tx_queue->txd);
        /* Push TX descriptor ring to card */
-        EFX_POPULATE_OWORD_10(tx_desc_ptr,
+        EFX_POPULATE_OWORD_10(reg,
                              FRF_AZ_TX_DESCQ_EN, 1,
                              FRF_AZ_TX_ISCSI_DDIG_EN, 0,
                              FRF_AZ_TX_ISCSI_HDIG_EN, 0,
@@ -470,17 +470,15 @@ void efx_nic_init_tx(struct efx_tx_queue *tx_queue)
        if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
                int csum = tx_queue->queue & EFX_TXQ_TYPE_OFFLOAD;
-                EFX_SET_OWORD_FIELD(tx_desc_ptr, FRF_BZ_TX_IP_CHKSM_DIS, !csum);
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_TX_IP_CHKSM_DIS, !csum);
-                EFX_SET_OWORD_FIELD(tx_desc_ptr, FRF_BZ_TX_TCP_CHKSM_DIS,
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_TX_TCP_CHKSM_DIS,
                                    !csum);
        }
-        efx_writeo_table(efx, &tx_desc_ptr, efx->type->txd_ptr_tbl_base,
+        efx_writeo_table(efx, &reg, efx->type->txd_ptr_tbl_base,
                         tx_queue->queue);
        if (efx_nic_rev(efx) < EFX_REV_FALCON_B0) {
-                efx_oword_t reg;
                /* Only 128 bits in this register */
                BUILD_BUG_ON(EFX_MAX_TX_QUEUES > 128);
@@ -491,6 +489,16 @@ void efx_nic_init_tx(struct efx_tx_queue *tx_queue)
                        set_bit_le(tx_queue->queue, (void *)&reg);
                efx_writeo(efx, &reg, FR_AA_TX_CHKSM_CFG);
        }
+        if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
+                EFX_POPULATE_OWORD_1(reg,
+                                     FRF_BZ_TX_PACE,
+                                     (tx_queue->queue & EFX_TXQ_TYPE_HIGHPRI) ?
+                                     FFE_BZ_TX_PACE_OFF :
+                                     FFE_BZ_TX_PACE_RESERVED);
+                efx_writeo_table(efx, &reg, FR_BZ_TX_PACE_TBL,
+                                 tx_queue->queue);
+        }
 }
 static void efx_flush_tx_queue(struct efx_tx_queue *tx_queue)
@@ -1238,8 +1246,10 @@ int efx_nic_flush_queues(struct efx_nic *efx)
        /* Flush all tx queues in parallel */
        efx_for_each_channel(channel, efx) {
-                efx_for_each_channel_tx_queue(tx_queue, channel)
+                efx_for_each_possible_channel_tx_queue(tx_queue, channel) {
-                        efx_flush_tx_queue(tx_queue);
+                        if (tx_queue->initialised)
+                                efx_flush_tx_queue(tx_queue);
+                }
        }
        /* The hardware supports four concurrent rx flushes, each of which may
@@ -1262,8 +1272,9 @@ int efx_nic_flush_queues(struct efx_nic *efx)
                                        ++rx_pending;
                                }
                        }
-                        efx_for_each_channel_tx_queue(tx_queue, channel) {
+                        efx_for_each_possible_channel_tx_queue(tx_queue, channel) {
-                                if (tx_queue->flushed != FLUSH_DONE)
+                                if (tx_queue->initialised &&
+                                    tx_queue->flushed != FLUSH_DONE)
                                        ++tx_pending;
                        }
                }
@@ -1278,8 +1289,9 @@ int efx_nic_flush_queues(struct efx_nic *efx)
        /* Mark the queues as all flushed. We're going to return failure
         * leading to a reset, or fake up success anyway */
        efx_for_each_channel(channel, efx) {
-                efx_for_each_channel_tx_queue(tx_queue, channel) {
+                efx_for_each_possible_channel_tx_queue(tx_queue, channel) {
-                        if (tx_queue->flushed != FLUSH_DONE)
+                        if (tx_queue->initialised &&
+                            tx_queue->flushed != FLUSH_DONE)
                                netif_err(efx, hw, efx->net_dev,
                                          "tx queue %d flush command timed out\n",
                                          tx_queue->queue);
@@ -1682,6 +1694,19 @@ void efx_nic_init_common(struct efx_nic *efx)
        if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0)
                EFX_SET_OWORD_FIELD(temp, FRF_BZ_TX_FLUSH_MIN_LEN_EN, 1);
        efx_writeo(efx, &temp, FR_AZ_TX_RESERVED);
+        if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
+                EFX_POPULATE_OWORD_4(temp,
+                                     /* Default values */
+                                     FRF_BZ_TX_PACE_SB_NOT_AF, 0x15,
+                                     FRF_BZ_TX_PACE_SB_AF, 0xb,
+                                     FRF_BZ_TX_PACE_FB_BASE, 0,
+                                     /* Allow large pace values in the
+                                      * fast bin. */
+                                     FRF_BZ_TX_PACE_BIN_TH,
+                                     FFE_BZ_TX_PACE_RESERVED);
+                efx_writeo(efx, &temp, FR_BZ_TX_PACE);
+        }
 }
 /* Register dump */
diff --git a/drivers/net/sfc/regs.h b/drivers/net/sfc/regs.h
index 96430ed81c36..8227de62014f 100644
--- a/drivers/net/sfc/regs.h
+++ b/drivers/net/sfc/regs.h
@@ -2907,6 +2907,12 @@
 #define FRF_CZ_TMFT_SRC_MAC_HI_LBN 44
 #define FRF_CZ_TMFT_SRC_MAC_HI_WIDTH 16
+/* TX_PACE_TBL */
+/* Values >20 are documented as reserved, but will result in a queue going
+ * into the fast bin with a pace value of zero. */
+#define FFE_BZ_TX_PACE_OFF 0
+#define FFE_BZ_TX_PACE_RESERVED 21
 /* DRIVER_EV */
 /* Sub-fields of an RX flush completion event */
 #define FSF_AZ_DRIVER_EV_RX_FLUSH_FAIL_LBN 12
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 0ebfb99f1299..f936892aa423 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -644,7 +644,7 @@ static int efx_test_loopbacks(struct efx_nic *efx, struct efx_self_tests *tests,
                        goto out;
                }
-                /* Test both types of TX queue */
+                /* Test all enabled types of TX queue */
                efx_for_each_channel_tx_queue(tx_queue, channel) {
                        state->offload_csum = (tx_queue->queue &
                                               EFX_TXQ_TYPE_OFFLOAD);
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index 2f5e9da657bf..1a51653bb92b 100644
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -336,17 +336,91 @@ netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb,
 {
        struct efx_nic *efx = netdev_priv(net_dev);
        struct efx_tx_queue *tx_queue;
+        unsigned index, type;
        if (unlikely(efx->port_inhibited))
                return NETDEV_TX_BUSY;
-        tx_queue = efx_get_tx_queue(efx, skb_get_queue_mapping(skb),
+        index = skb_get_queue_mapping(skb);
-                                    skb->ip_summed == CHECKSUM_PARTIAL ?
+        type = skb->ip_summed == CHECKSUM_PARTIAL ? EFX_TXQ_TYPE_OFFLOAD : 0;
-                                    EFX_TXQ_TYPE_OFFLOAD : 0);
+        if (index >= efx->n_tx_channels) {
+                index -= efx->n_tx_channels;
+                type |= EFX_TXQ_TYPE_HIGHPRI;
+        }
+        tx_queue = efx_get_tx_queue(efx, index, type);
        return efx_enqueue_skb(tx_queue, skb);
 }
+void efx_init_tx_queue_core_txq(struct efx_tx_queue *tx_queue)
+{
+        struct efx_nic *efx = tx_queue->efx;
+        /* Must be inverse of queue lookup in efx_hard_start_xmit() */
+        tx_queue->core_txq =
+                netdev_get_tx_queue(efx->net_dev,
+                                    tx_queue->queue / EFX_TXQ_TYPES +
+                                    ((tx_queue->queue & EFX_TXQ_TYPE_HIGHPRI) ?
+                                     efx->n_tx_channels : 0));
+}
+int efx_setup_tc(struct net_device *net_dev, u8 num_tc)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        struct efx_channel *channel;
+        struct efx_tx_queue *tx_queue;
+        unsigned tc;
+        int rc;
+        if (efx_nic_rev(efx) < EFX_REV_FALCON_B0 || num_tc > EFX_MAX_TX_TC)
+                return -EINVAL;
+        if (num_tc == net_dev->num_tc)
+                return 0;
+        for (tc = 0; tc < num_tc; tc++) {
+                net_dev->tc_to_txq[tc].offset = tc * efx->n_tx_channels;
+                net_dev->tc_to_txq[tc].count = efx->n_tx_channels;
+        }
+        if (num_tc > net_dev->num_tc) {
+                /* Initialise high-priority queues as necessary */
+                efx_for_each_channel(channel, efx) {
+                        efx_for_each_possible_channel_tx_queue(tx_queue,
+                                                               channel) {
+                                if (!(tx_queue->queue & EFX_TXQ_TYPE_HIGHPRI))
+                                        continue;
+                                if (!tx_queue->buffer) {
+                                        rc = efx_probe_tx_queue(tx_queue);
+                                        if (rc)
+                                                return rc;
+                                }
+                                if (!tx_queue->initialised)
+                                        efx_init_tx_queue(tx_queue);
+                                efx_init_tx_queue_core_txq(tx_queue);
+                        }
+                }
+        } else {
+                /* Reduce number of classes before number of queues */
+                net_dev->num_tc = num_tc;
+        }
+        rc = netif_set_real_num_tx_queues(net_dev,
+                                          max_t(int, num_tc, 1) *
+                                          efx->n_tx_channels);
+        if (rc)
+                return rc;
+        /* Do not destroy high-priority queues when they become
+         * unused.  We would have to flush them first, and it is
+         * fairly difficult to flush a subset of TX queues.  Leave
+         * it to efx_fini_channels().
+         */
+        net_dev->num_tc = num_tc;
+        return 0;
+}
 void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index)
 {
        unsigned fill_level;
@@ -430,6 +504,8 @@ void efx_init_tx_queue(struct efx_tx_queue *tx_queue)
        /* Set up TX descriptor ring */
        efx_nic_init_tx(tx_queue);
+        tx_queue->initialised = true;
 }
 void efx_release_tx_buffers(struct efx_tx_queue *tx_queue)
@@ -452,9 +528,14 @@ void efx_release_tx_buffers(struct efx_tx_queue *tx_queue)
 void efx_fini_tx_queue(struct efx_tx_queue *tx_queue)
 {
+        if (!tx_queue->initialised)
+                return;
        netif_dbg(tx_queue->efx, drv, tx_queue->efx->net_dev,
                  "shutting down TX queue %d\n", tx_queue->queue);
+        tx_queue->initialised = false;
        /* Flush TX queue, remove descriptor ring */
        efx_nic_fini_tx(tx_queue);
@@ -466,6 +547,9 @@ void efx_fini_tx_queue(struct efx_tx_queue *tx_queue)
 void efx_remove_tx_queue(struct efx_tx_queue *tx_queue)
 {
+        if (!tx_queue->buffer)
+                return;
        netif_dbg(tx_queue->efx, drv, tx_queue->efx->net_dev,
                  "destroying TX queue %d\n", tx_queue->queue);
        efx_nic_remove_tx(tx_queue);
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 819c1750e2ab..095e52580884 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -32,10 +32,17 @@
 #include <linux/io.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
+#include <linux/ethtool.h>
 #include <asm/cacheflush.h>
 #include "sh_eth.h"
+#define SH_ETH_DEF_MSG_ENABLE \
+                (NETIF_MSG_LINK | \
+                NETIF_MSG_TIMER | \
+                NETIF_MSG_RX_ERR| \
+                NETIF_MSG_TX_ERR)
 /* There is CPU dependent code */
 #if defined(CONFIG_CPU_SUBTYPE_SH7724)
 #define SH_ETH_RESET_DEFAULT    1
@@ -817,6 +824,20 @@ static int sh_eth_rx(struct net_device *ndev)
        return 0;
 }
+static void sh_eth_rcv_snd_disable(u32 ioaddr)
+{
+        /* disable tx and rx */
+        writel(readl(ioaddr + ECMR) &
+                ~(ECMR_RE | ECMR_TE), ioaddr + ECMR);
+}
+static void sh_eth_rcv_snd_enable(u32 ioaddr)
+{
+        /* enable tx and rx */
+        writel(readl(ioaddr + ECMR) |
+                (ECMR_RE | ECMR_TE), ioaddr + ECMR);
+}
 /* error control function */
 static void sh_eth_error(struct net_device *ndev, int intr_status)
 {
@@ -843,11 +864,9 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                                if (mdp->ether_link_active_low)
                                        link_stat = ~link_stat;
                        }
-                        if (!(link_stat & PHY_ST_LINK)) {
+                        if (!(link_stat & PHY_ST_LINK))
-                                /* Link Down : disable tx and rx */
+                                sh_eth_rcv_snd_disable(ioaddr);
-                                writel(readl(ioaddr + ECMR) &
+                        else {
-                                          ~(ECMR_RE | ECMR_TE), ioaddr + ECMR);
-                        } else {
                                /* Link Up */
                                writel(readl(ioaddr + EESIPR) &
                                          ~DMAC_M_ECI, ioaddr + EESIPR);
@@ -857,8 +876,7 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                                writel(readl(ioaddr + EESIPR) |
                                          DMAC_M_ECI, ioaddr + EESIPR);
                                /* enable tx and rx */
-                                writel(readl(ioaddr + ECMR) |
+                                sh_eth_rcv_snd_enable(ioaddr);
-                                          (ECMR_RE | ECMR_TE), ioaddr + ECMR);
                        }
                }
        }
@@ -867,6 +885,8 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                /* Write buck end. unused write back interrupt */
                if (intr_status & EESR_TABT)    /* Transmit Abort int */
                        mdp->stats.tx_aborted_errors++;
+                        if (netif_msg_tx_err(mdp))
+                                dev_err(&ndev->dev, "Transmit Abort\n");
        }
        if (intr_status & EESR_RABT) {
@@ -874,14 +894,23 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                if (intr_status & EESR_RFRMER) {
                        /* Receive Frame Overflow int */
                        mdp->stats.rx_frame_errors++;
-                        dev_err(&ndev->dev, "Receive Frame Overflow\n");
+                        if (netif_msg_rx_err(mdp))
+                                dev_err(&ndev->dev, "Receive Abort\n");
                }
        }
-        if (!mdp->cd->no_ade) {
+        if (intr_status & EESR_TDE) {
-                if (intr_status & EESR_ADE && intr_status & EESR_TDE &&
+                /* Transmit Descriptor Empty int */
-                    intr_status & EESR_TFE)
+                mdp->stats.tx_fifo_errors++;
-                        mdp->stats.tx_fifo_errors++;
+                if (netif_msg_tx_err(mdp))
+                        dev_err(&ndev->dev, "Transmit Descriptor Empty\n");
+        }
+        if (intr_status & EESR_TFE) {
+                /* FIFO under flow */
+                mdp->stats.tx_fifo_errors++;
+                if (netif_msg_tx_err(mdp))
+                        dev_err(&ndev->dev, "Transmit FIFO Under flow\n");
        }
        if (intr_status & EESR_RDE) {
@@ -890,12 +919,22 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                if (readl(ioaddr + EDRRR) ^ EDRRR_R)
                        writel(EDRRR_R, ioaddr + EDRRR);
-                dev_err(&ndev->dev, "Receive Descriptor Empty\n");
+                if (netif_msg_rx_err(mdp))
+                        dev_err(&ndev->dev, "Receive Descriptor Empty\n");
        }
        if (intr_status & EESR_RFE) {
                /* Receive FIFO Overflow int */
                mdp->stats.rx_fifo_errors++;
-                dev_err(&ndev->dev, "Receive FIFO Overflow\n");
+                if (netif_msg_rx_err(mdp))
+                        dev_err(&ndev->dev, "Receive FIFO Overflow\n");
+        }
+        if (!mdp->cd->no_ade && (intr_status & EESR_ADE)) {
+                /* Address Error */
+                mdp->stats.tx_fifo_errors++;
+                if (netif_msg_tx_err(mdp))
+                        dev_err(&ndev->dev, "Address Error\n");
        }
        mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE;
@@ -1012,7 +1051,7 @@ static void sh_eth_adjust_link(struct net_device *ndev)
                mdp->duplex = -1;
        }
-        if (new_state)
+        if (new_state && netif_msg_link(mdp))
                phy_print_status(phydev);
 }
@@ -1063,6 +1102,132 @@ static int sh_eth_phy_start(struct net_device *ndev)
        return 0;
 }
+static int sh_eth_get_settings(struct net_device *ndev,
+                        struct ethtool_cmd *ecmd)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        unsigned long flags;
+        int ret;
+        spin_lock_irqsave(&mdp->lock, flags);
+        ret = phy_ethtool_gset(mdp->phydev, ecmd);
+        spin_unlock_irqrestore(&mdp->lock, flags);
+        return ret;
+}
+static int sh_eth_set_settings(struct net_device *ndev,
+                struct ethtool_cmd *ecmd)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        unsigned long flags;
+        int ret;
+        u32 ioaddr = ndev->base_addr;
+        spin_lock_irqsave(&mdp->lock, flags);
+        /* disable tx and rx */
+        sh_eth_rcv_snd_disable(ioaddr);
+        ret = phy_ethtool_sset(mdp->phydev, ecmd);
+        if (ret)
+                goto error_exit;
+        if (ecmd->duplex == DUPLEX_FULL)
+                mdp->duplex = 1;
+        else
+                mdp->duplex = 0;
+        if (mdp->cd->set_duplex)
+                mdp->cd->set_duplex(ndev);
+error_exit:
+        mdelay(1);
+        /* enable tx and rx */
+        sh_eth_rcv_snd_enable(ioaddr);
+        spin_unlock_irqrestore(&mdp->lock, flags);
+        return ret;
+}
+static int sh_eth_nway_reset(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        unsigned long flags;
+        int ret;
+        spin_lock_irqsave(&mdp->lock, flags);
+        ret = phy_start_aneg(mdp->phydev);
+        spin_unlock_irqrestore(&mdp->lock, flags);
+        return ret;
+}
+static u32 sh_eth_get_msglevel(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        return mdp->msg_enable;
+}
+static void sh_eth_set_msglevel(struct net_device *ndev, u32 value)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        mdp->msg_enable = value;
+}
+static const char sh_eth_gstrings_stats[][ETH_GSTRING_LEN] = {
+        "rx_current", "tx_current",
+        "rx_dirty", "tx_dirty",
+};
+#define SH_ETH_STATS_LEN  ARRAY_SIZE(sh_eth_gstrings_stats)
+static int sh_eth_get_sset_count(struct net_device *netdev, int sset)
+{
+        switch (sset) {
+        case ETH_SS_STATS:
+                return SH_ETH_STATS_LEN;
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+static void sh_eth_get_ethtool_stats(struct net_device *ndev,
+                        struct ethtool_stats *stats, u64 *data)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        int i = 0;
+        /* device-specific stats */
+        data[i++] = mdp->cur_rx;
+        data[i++] = mdp->cur_tx;
+        data[i++] = mdp->dirty_rx;
+        data[i++] = mdp->dirty_tx;
+}
+static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
+{
+        switch (stringset) {
+        case ETH_SS_STATS:
+                memcpy(data, *sh_eth_gstrings_stats,
+                                        sizeof(sh_eth_gstrings_stats));
+                break;
+        }
+}
+static struct ethtool_ops sh_eth_ethtool_ops = {
+        .get_settings   = sh_eth_get_settings,
+        .set_settings   = sh_eth_set_settings,
+        .nway_reset             = sh_eth_nway_reset,
+        .get_msglevel   = sh_eth_get_msglevel,
+        .set_msglevel   = sh_eth_set_msglevel,
+        .get_link               = ethtool_op_get_link,
+        .get_strings    = sh_eth_get_strings,
+        .get_ethtool_stats  = sh_eth_get_ethtool_stats,
+        .get_sset_count     = sh_eth_get_sset_count,
+};
 /* network device open function */
 static int sh_eth_open(struct net_device *ndev)
 {
@@ -1073,8 +1238,8 @@ static int sh_eth_open(struct net_device *ndev)
        ret = request_irq(ndev->irq, sh_eth_interrupt,
 #if defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7764) || \
+        defined(CONFIG_CPU_SUBTYPE_SH7764) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7757)
+        defined(CONFIG_CPU_SUBTYPE_SH7757)
                                IRQF_SHARED,
 #else
                                0,
@@ -1123,8 +1288,8 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
        netif_stop_queue(ndev);
-        /* worning message out. */
+        if (netif_msg_timer(mdp))
-        printk(KERN_WARNING "%s: transmit timed out, status %8.8x,"
+                dev_err(&ndev->dev, "%s: transmit timed out, status %8.8x,"
               " resetting...\n", ndev->name, (int)readl(ioaddr + EESR));
        /* tx_errors count up */
@@ -1167,6 +1332,8 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
        spin_lock_irqsave(&mdp->lock, flags);
        if ((mdp->cur_tx - mdp->dirty_tx) >= (TX_RING_SIZE - 4)) {
                if (!sh_eth_txfree(ndev)) {
+                        if (netif_msg_tx_queued(mdp))
+                                dev_warn(&ndev->dev, "TxFD exhausted.\n");
                        netif_stop_queue(ndev);
                        spin_unlock_irqrestore(&mdp->lock, flags);
                        return NETDEV_TX_BUSY;
@@ -1497,8 +1664,11 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
        /* set function */
        ndev->netdev_ops = &sh_eth_netdev_ops;
+        SET_ETHTOOL_OPS(ndev, &sh_eth_ethtool_ops);
        ndev->watchdog_timeo = TX_TIMEOUT;
+        /* debug message level */
+        mdp->msg_enable = SH_ETH_DEF_MSG_ENABLE;
        mdp->post_rx = POST_RX >> (devno << 1);
        mdp->post_fw = POST_FW >> (devno << 1);
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 5976d1d51df1..640e368ebeee 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1777,6 +1777,7 @@ static int sis900_rx(struct net_device *net_dev)
                                              "cur_rx:%4.4d, dirty_rx:%4.4d\n",
                                              net_dev->name, sis_priv->cur_rx,
                                              sis_priv->dirty_rx);
+                                dev_kfree_skb(skb);
                                break;
                        }
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 726df611ee17..43654a3bb0ec 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -81,6 +81,7 @@ static const char version[] =
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/workqueue.h>
+#include <linux/of.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -2394,6 +2395,15 @@ static int smc_drv_resume(struct device *dev)
        return 0;
 }
+#ifdef CONFIG_OF
+static const struct of_device_id smc91x_match[] = {
+        { .compatible = "smsc,lan91c94", },
+        { .compatible = "smsc,lan91c111", },
+        {},
+}
+MODULE_DEVICE_TABLE(of, smc91x_match);
+#endif
 static struct dev_pm_ops smc_drv_pm_ops = {
        .suspend        = smc_drv_suspend,
        .resume         = smc_drv_resume,
@@ -2406,6 +2416,9 @@ static struct platform_driver smc_driver = {
                .name   = CARDNAME,
                .owner  = THIS_MODULE,
                .pm     = &smc_drv_pm_ops,
+#ifdef CONFIG_OF
+                .of_match_table = smc91x_match,
+#endif
        },
 };
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index 34a0af3837f9..0e5f03135b50 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -1560,8 +1560,10 @@ static int stmmac_mac_device_setup(struct net_device *dev)
        priv->hw = device;
-        if (device_can_wakeup(priv->device))
+        if (device_can_wakeup(priv->device)) {
                priv->wolopts = WAKE_MAGIC; /* Magic Frame as default */
+                enable_irq_wake(dev->irq);
+        }
        return 0;
 }
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 1c5408f83937..c1a344829b54 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -320,28 +320,28 @@ static int gem_txmac_interrupt(struct net_device *dev, struct gem *gp, u32 gem_s
        if (txmac_stat & MAC_TXSTAT_URUN) {
                netdev_err(dev, "TX MAC xmit underrun\n");
-                gp->net_stats.tx_fifo_errors++;
+                dev->stats.tx_fifo_errors++;
        }
        if (txmac_stat & MAC_TXSTAT_MPE) {
                netdev_err(dev, "TX MAC max packet size error\n");
-                gp->net_stats.tx_errors++;
+                dev->stats.tx_errors++;
        }
        /* The rest are all cases of one of the 16-bit TX
         * counters expiring.
         */
        if (txmac_stat & MAC_TXSTAT_NCE)
-                gp->net_stats.collisions += 0x10000;
+                dev->stats.collisions += 0x10000;
        if (txmac_stat & MAC_TXSTAT_ECE) {
-                gp->net_stats.tx_aborted_errors += 0x10000;
+                dev->stats.tx_aborted_errors += 0x10000;
-                gp->net_stats.collisions += 0x10000;
+                dev->stats.collisions += 0x10000;
        }
        if (txmac_stat & MAC_TXSTAT_LCE) {
-                gp->net_stats.tx_aborted_errors += 0x10000;
+                dev->stats.tx_aborted_errors += 0x10000;
-                gp->net_stats.collisions += 0x10000;
+                dev->stats.collisions += 0x10000;
        }
        /* We do not keep track of MAC_TXSTAT_FCE and
@@ -469,20 +469,20 @@ static int gem_rxmac_interrupt(struct net_device *dev, struct gem *gp, u32 gem_s
                u32 smac = readl(gp->regs + MAC_SMACHINE);
                netdev_err(dev, "RX MAC fifo overflow smac[%08x]\n", smac);
-                gp->net_stats.rx_over_errors++;
+                dev->stats.rx_over_errors++;
-                gp->net_stats.rx_fifo_errors++;
+                dev->stats.rx_fifo_errors++;
                ret = gem_rxmac_reset(gp);
        }
        if (rxmac_stat & MAC_RXSTAT_ACE)
-                gp->net_stats.rx_frame_errors += 0x10000;
+                dev->stats.rx_frame_errors += 0x10000;
        if (rxmac_stat & MAC_RXSTAT_CCE)
-                gp->net_stats.rx_crc_errors += 0x10000;
+                dev->stats.rx_crc_errors += 0x10000;
        if (rxmac_stat & MAC_RXSTAT_LCE)
-                gp->net_stats.rx_length_errors += 0x10000;
+                dev->stats.rx_length_errors += 0x10000;
        /* We do not track MAC_RXSTAT_FCE and MAC_RXSTAT_VCE
         * events.
@@ -594,7 +594,7 @@ static int gem_abnormal_irq(struct net_device *dev, struct gem *gp, u32 gem_stat
                if (netif_msg_rx_err(gp))
                        printk(KERN_DEBUG "%s: no buffer for rx frame\n",
                                gp->dev->name);
-                gp->net_stats.rx_dropped++;
+                dev->stats.rx_dropped++;
        }
        if (gem_status & GREG_STAT_RXTAGERR) {
@@ -602,7 +602,7 @@ static int gem_abnormal_irq(struct net_device *dev, struct gem *gp, u32 gem_stat
                if (netif_msg_rx_err(gp))
                        printk(KERN_DEBUG "%s: corrupt rx tag framing\n",
                                gp->dev->name);
-                gp->net_stats.rx_errors++;
+                dev->stats.rx_errors++;
                goto do_reset;
        }
@@ -684,7 +684,7 @@ static __inline__ void gem_tx(struct net_device *dev, struct gem *gp, u32 gem_st
                                break;
                }
                gp->tx_skbs[entry] = NULL;
-                gp->net_stats.tx_bytes += skb->len;
+                dev->stats.tx_bytes += skb->len;
                for (frag = 0; frag <= skb_shinfo(skb)->nr_frags; frag++) {
                        txd = &gp->init_block->txd[entry];
@@ -696,7 +696,7 @@ static __inline__ void gem_tx(struct net_device *dev, struct gem *gp, u32 gem_st
                        entry = NEXT_TX(entry);
                }
-                gp->net_stats.tx_packets++;
+                dev->stats.tx_packets++;
                dev_kfree_skb_irq(skb);
        }
        gp->tx_old = entry;
@@ -738,6 +738,7 @@ static __inline__ void gem_post_rxds(struct gem *gp, int limit)
 static int gem_rx(struct gem *gp, int work_to_do)
 {
+        struct net_device *dev = gp->dev;
        int entry, drops, work_done = 0;
        u32 done;
        __sum16 csum;
@@ -782,15 +783,15 @@ static int gem_rx(struct gem *gp, int work_to_do)
                len = (status & RXDCTRL_BUFSZ) >> 16;
                if ((len < ETH_ZLEN) || (status & RXDCTRL_BAD)) {
-                        gp->net_stats.rx_errors++;
+                        dev->stats.rx_errors++;
                        if (len < ETH_ZLEN)
-                                gp->net_stats.rx_length_errors++;
+                                dev->stats.rx_length_errors++;
                        if (len & RXDCTRL_BAD)
-                                gp->net_stats.rx_crc_errors++;
+                                dev->stats.rx_crc_errors++;
                        /* We'll just return it to GEM. */
                drop_it:
-                        gp->net_stats.rx_dropped++;
+                        dev->stats.rx_dropped++;
                        goto next;
                }
@@ -843,8 +844,8 @@ static int gem_rx(struct gem *gp, int work_to_do)
                netif_receive_skb(skb);
-                gp->net_stats.rx_packets++;
+                dev->stats.rx_packets++;
-                gp->net_stats.rx_bytes += len;
+                dev->stats.rx_bytes += len;
        next:
                entry = NEXT_RX(entry);
@@ -2472,7 +2473,6 @@ static int gem_resume(struct pci_dev *pdev)
 static struct net_device_stats *gem_get_stats(struct net_device *dev)
 {
        struct gem *gp = netdev_priv(dev);
-        struct net_device_stats *stats = &gp->net_stats;
        spin_lock_irq(&gp->lock);
        spin_lock(&gp->tx_lock);
@@ -2481,17 +2481,17 @@ static struct net_device_stats *gem_get_stats(struct net_device *dev)
         * so we shield against this
         */
        if (gp->running) {
-                stats->rx_crc_errors += readl(gp->regs + MAC_FCSERR);
+                dev->stats.rx_crc_errors += readl(gp->regs + MAC_FCSERR);
                writel(0, gp->regs + MAC_FCSERR);
-                stats->rx_frame_errors += readl(gp->regs + MAC_AERR);
+                dev->stats.rx_frame_errors += readl(gp->regs + MAC_AERR);
                writel(0, gp->regs + MAC_AERR);
-                stats->rx_length_errors += readl(gp->regs + MAC_LERR);
+                dev->stats.rx_length_errors += readl(gp->regs + MAC_LERR);
                writel(0, gp->regs + MAC_LERR);
-                stats->tx_aborted_errors += readl(gp->regs + MAC_ECOLL);
+                dev->stats.tx_aborted_errors += readl(gp->regs + MAC_ECOLL);
-                stats->collisions +=
+                dev->stats.collisions +=
                        (readl(gp->regs + MAC_ECOLL) +
                         readl(gp->regs + MAC_LCOLL));
                writel(0, gp->regs + MAC_ECOLL);
@@ -2501,7 +2501,7 @@ static struct net_device_stats *gem_get_stats(struct net_device *dev)
        spin_unlock(&gp->tx_lock);
        spin_unlock_irq(&gp->lock);
-        return &gp->net_stats;
+        return &dev->stats;
 }
 static int gem_set_mac_address(struct net_device *dev, void *addr)
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h
index 19905460def6..ede017872367 100644
--- a/drivers/net/sungem.h
+++ b/drivers/net/sungem.h
@@ -994,7 +994,6 @@ struct gem {
        u32                     status;
        struct napi_struct      napi;
-        struct net_device_stats net_stats;
        int                     tx_fifo_sz;
        int                     rx_fifo_sz;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 7841a8f69998..6be418591df9 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4,7 +4,7 @@
 * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
 * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
 * Copyright (C) 2004 Sun Microsystems Inc.
- * Copyright (C) 2005-2010 Broadcom Corporation.
+ * Copyright (C) 2005-2011 Broadcom Corporation.
 *
 * Firmware is:
 *      Derived from proprietary unpublished source code,
@@ -60,20 +60,14 @@
 #define BAR_0   0
 #define BAR_2   2
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-#define TG3_VLAN_TAG_USED 1
-#else
-#define TG3_VLAN_TAG_USED 0
-#endif
 #include "tg3.h"
 #define DRV_MODULE_NAME         "tg3"
 #define TG3_MAJ_NUM                     3
-#define TG3_MIN_NUM                     116
+#define TG3_MIN_NUM                     117
 #define DRV_MODULE_VERSION      \
        __stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
-#define DRV_MODULE_RELDATE      "December 3, 2010"
+#define DRV_MODULE_RELDATE      "January 25, 2011"
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -134,9 +128,6 @@
                                 TG3_TX_RING_SIZE)
 #define NEXT_TX(N)              (((N) + 1) & (TG3_TX_RING_SIZE - 1))
-#define TG3_RX_DMA_ALIGN                16
-#define TG3_RX_HEADROOM                 ALIGN(VLAN_HLEN, TG3_RX_DMA_ALIGN)
 #define TG3_DMA_BYTE_ENAB               64
 #define TG3_RX_STD_DMA_SZ               1536
@@ -1785,9 +1776,29 @@ static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)
                tg3_phy_cl45_read(tp, MDIO_MMD_AN,
                                  TG3_CL45_D7_EEERES_STAT, &val);
-                if (val == TG3_CL45_D7_EEERES_STAT_LP_1000T ||
+                switch (val) {
-                    val == TG3_CL45_D7_EEERES_STAT_LP_100TX)
+                case TG3_CL45_D7_EEERES_STAT_LP_1000T:
+                        switch (GET_ASIC_REV(tp->pci_chip_rev_id)) {
+                        case ASIC_REV_5717:
+                        case ASIC_REV_5719:
+                        case ASIC_REV_57765:
+                                /* Enable SM_DSP clock and tx 6dB coding. */
+                                val = MII_TG3_AUXCTL_SHDWSEL_AUXCTL |
+                                      MII_TG3_AUXCTL_ACTL_SMDSP_ENA |
+                                      MII_TG3_AUXCTL_ACTL_TX_6DB;
+                                tg3_writephy(tp, MII_TG3_AUX_CTRL, val);
+                                tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, 0x0000);
+                                /* Turn off SM_DSP clock. */
+                                val = MII_TG3_AUXCTL_SHDWSEL_AUXCTL |
+                                      MII_TG3_AUXCTL_ACTL_TX_6DB;
+                                tg3_writephy(tp, MII_TG3_AUX_CTRL, val);
+                        }
+                        /* Fallthrough */
+                case TG3_CL45_D7_EEERES_STAT_LP_100TX:
                        tp->setlpicnt = 2;
+                }
        }
        if (!tp->setlpicnt) {
@@ -2977,11 +2988,19 @@ static void tg3_phy_copper_begin(struct tg3 *tp)
                      MII_TG3_AUXCTL_ACTL_TX_6DB;
                tg3_writephy(tp, MII_TG3_AUX_CTRL, val);
-                if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+                switch (GET_ASIC_REV(tp->pci_chip_rev_id)) {
-                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) &&
+                case ASIC_REV_5717:
-                    !tg3_phydsp_read(tp, MII_TG3_DSP_CH34TP2, &val))
+                case ASIC_REV_57765:
-                        tg3_phydsp_write(tp, MII_TG3_DSP_CH34TP2,
+                        if (!tg3_phydsp_read(tp, MII_TG3_DSP_CH34TP2, &val))
-                                         val | MII_TG3_DSP_CH34TP2_HIBW01);
+                                tg3_phydsp_write(tp, MII_TG3_DSP_CH34TP2, val |
+                                                 MII_TG3_DSP_CH34TP2_HIBW01);
+                        /* Fall through */
+                case ASIC_REV_5719:
+                        val = MII_TG3_DSP_TAP26_ALNOKO |
+                              MII_TG3_DSP_TAP26_RMRXSTO |
+                              MII_TG3_DSP_TAP26_OPCSINPT;
+                        tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, val);
+                }
                val = 0;
                if (tp->link_config.autoneg == AUTONEG_ENABLE) {
@@ -4722,8 +4741,6 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                struct sk_buff *skb;
                dma_addr_t dma_addr;
                u32 opaque_key, desc_idx, *post_ptr;
-                bool hw_vlan __maybe_unused = false;
-                u16 vtag __maybe_unused = 0;
                desc_idx = desc->opaque & RXD_OPAQUE_INDEX_MASK;
                opaque_key = desc->opaque & RXD_OPAQUE_RING_MASK;
@@ -4782,12 +4799,12 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                        tg3_recycle_rx(tnapi, tpr, opaque_key,
                                       desc_idx, *post_ptr);
-                        copy_skb = netdev_alloc_skb(tp->dev, len + VLAN_HLEN +
+                        copy_skb = netdev_alloc_skb(tp->dev, len +
                                                    TG3_RAW_IP_ALIGN);
                        if (copy_skb == NULL)
                                goto drop_it_no_recycle;
-                        skb_reserve(copy_skb, TG3_RAW_IP_ALIGN + VLAN_HLEN);
+                        skb_reserve(copy_skb, TG3_RAW_IP_ALIGN);
                        skb_put(copy_skb, len);
                        pci_dma_sync_single_for_cpu(tp->pdev, dma_addr, len, PCI_DMA_FROMDEVICE);
                        skb_copy_from_linear_data(skb, copy_skb->data, len);
@@ -4814,30 +4831,11 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                }
                if (desc->type_flags & RXD_FLAG_VLAN &&
-                    !(tp->rx_mode & RX_MODE_KEEP_VLAN_TAG)) {
+                    !(tp->rx_mode & RX_MODE_KEEP_VLAN_TAG))
-                        vtag = desc->err_vlan & RXD_VLAN_MASK;
+                        __vlan_hwaccel_put_tag(skb,
-#if TG3_VLAN_TAG_USED
+                                               desc->err_vlan & RXD_VLAN_MASK);
-                        if (tp->vlgrp)
-                                hw_vlan = true;
-                        else
-#endif
-                        {
-                                struct vlan_ethhdr *ve = (struct vlan_ethhdr *)
-                                                    __skb_push(skb, VLAN_HLEN);
-                                memmove(ve, skb->data + VLAN_HLEN,
-                                        ETH_ALEN * 2);
-                                ve->h_vlan_proto = htons(ETH_P_8021Q);
-                                ve->h_vlan_TCI = htons(vtag);
-                        }
-                }
-#if TG3_VLAN_TAG_USED
+                napi_gro_receive(&tnapi->napi, skb);
-                if (hw_vlan)
-                        vlan_gro_receive(&tnapi->napi, tp->vlgrp, vtag, skb);
-                else
-#endif
-                        napi_gro_receive(&tnapi->napi, skb);
                received++;
                budget--;
@@ -5740,11 +5738,9 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb,
                base_flags |= TXD_FLAG_TCPUDP_CSUM;
        }
-#if TG3_VLAN_TAG_USED
        if (vlan_tx_tag_present(skb))
                base_flags |= (TXD_FLAG_VLAN |
                               (vlan_tx_tag_get(skb) << 16));
-#endif
        len = skb_headlen(skb);
@@ -5986,11 +5982,10 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
                        }
                }
        }
-#if TG3_VLAN_TAG_USED
        if (vlan_tx_tag_present(skb))
                base_flags |= (TXD_FLAG_VLAN |
                               (vlan_tx_tag_get(skb) << 16));
-#endif
        if ((tp->tg3_flags3 & TG3_FLG3_USE_JUMBO_BDFLAG) &&
            !mss && skb->len > VLAN_ETH_FRAME_LEN)
@@ -7834,7 +7829,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                       TG3_CPMU_DBTMR1_LNKIDLE_2047US);
                tw32_f(TG3_CPMU_EEE_DBTMR2,
-                       TG3_CPMU_DBTMR1_APE_TX_2047US |
+                       TG3_CPMU_DBTMR2_APE_TX_2047US |
                       TG3_CPMU_DBTMR2_TXIDXEQ_2047US);
        }
@@ -8108,8 +8103,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
        /* Program the jumbo buffer descriptor ring control
         * blocks on those devices that have them.
         */
-        if ((tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) &&
+        if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0 ||
-            !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
+            ((tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) &&
+            !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS))) {
                /* Setup replenish threshold. */
                tw32(RCVBDI_JUMBO_THRESH, tp->rx_jumbo_pending / 8);
@@ -8227,8 +8223,12 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
            (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)) {
                val = tr32(TG3_RDMA_RSRVCTRL_REG);
                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
-                        val &= ~TG3_RDMA_RSRVCTRL_TXMRGN_MASK;
+                        val &= ~(TG3_RDMA_RSRVCTRL_TXMRGN_MASK |
-                        val |= TG3_RDMA_RSRVCTRL_TXMRGN_320B;
+                                 TG3_RDMA_RSRVCTRL_FIFO_LWM_MASK |
+                                 TG3_RDMA_RSRVCTRL_FIFO_HWM_MASK);
+                        val |= TG3_RDMA_RSRVCTRL_TXMRGN_320B |
+                               TG3_RDMA_RSRVCTRL_FIFO_LWM_1_5K |
+                               TG3_RDMA_RSRVCTRL_FIFO_HWM_1_5K;
                }
                tw32(TG3_RDMA_RSRVCTRL_REG,
                     val | TG3_RDMA_RSRVCTRL_FIFO_OFLW_FIX);
@@ -8350,7 +8350,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
        tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
        udelay(100);
-        if (tp->tg3_flags2 & TG3_FLG2_USING_MSIX) {
+        if ((tp->tg3_flags2 & TG3_FLG2_USING_MSIX) &&
+                tp->irq_cnt > 1) {
                val = tr32(MSGINT_MODE);
                val |= MSGINT_MODE_MULTIVEC_EN | MSGINT_MODE_ENABLE;
                tw32(MSGINT_MODE, val);
@@ -9090,7 +9091,8 @@ static void tg3_ints_init(struct tg3 *tp)
        if (tp->tg3_flags2 & TG3_FLG2_USING_MSI_OR_MSIX) {
                u32 msi_mode = tr32(MSGINT_MODE);
-                if (tp->tg3_flags2 & TG3_FLG2_USING_MSIX)
+                if ((tp->tg3_flags2 & TG3_FLG2_USING_MSIX) &&
+                    tp->irq_cnt > 1)
                        msi_mode |= MSGINT_MODE_MULTIVEC_EN;
                tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE);
        }
@@ -9532,17 +9534,10 @@ static void __tg3_set_rx_mode(struct net_device *dev)
        rx_mode = tp->rx_mode & ~(RX_MODE_PROMISC |
                                  RX_MODE_KEEP_VLAN_TAG);
+#if !defined(CONFIG_VLAN_8021Q) && !defined(CONFIG_VLAN_8021Q_MODULE)
        /* When ASF is in use, we always keep the RX_MODE_KEEP_VLAN_TAG
         * flag clear.
         */
-#if TG3_VLAN_TAG_USED
-        if (!tp->vlgrp &&
-            !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
-                rx_mode |= RX_MODE_KEEP_VLAN_TAG;
-#else
-        /* By definition, VLAN is disabled always in this
-         * case.
-         */
        if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
                rx_mode |= RX_MODE_KEEP_VLAN_TAG;
 #endif
@@ -10873,13 +10868,16 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
        if (loopback_mode == TG3_MAC_LOOPBACK) {
                /* HW errata - mac loopback fails in some cases on 5780.
                 * Normal traffic and PHY loopback are not affected by
-                 * errata.
+                 * errata.  Also, the MAC loopback test is deprecated for
+                 * all newer ASIC revisions.
                 */
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780)
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780 ||
+                    (tp->tg3_flags & TG3_FLAG_CPMU_PRESENT))
                        return 0;
-                mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
+                mac_mode = tp->mac_mode &
-                           MAC_MODE_PORT_INT_LPBACK;
+                           ~(MAC_MODE_PORT_MODE_MASK | MAC_MODE_HALF_DUPLEX);
+                mac_mode |= MAC_MODE_PORT_INT_LPBACK;
                if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
                        mac_mode |= MAC_MODE_LINK_POLARITY;
                if (tp->phy_flags & TG3_PHYFLG_10_100_ONLY)
@@ -10901,7 +10899,8 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                tg3_writephy(tp, MII_BMCR, val);
                udelay(40);
-                mac_mode = tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK;
+                mac_mode = tp->mac_mode &
+                           ~(MAC_MODE_PORT_MODE_MASK | MAC_MODE_HALF_DUPLEX);
                if (tp->phy_flags & TG3_PHYFLG_IS_FET) {
                        tg3_writephy(tp, MII_TG3_FET_PTEST,
                                     MII_TG3_FET_PTEST_FRC_TX_LINK |
@@ -10929,6 +10928,13 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                                     MII_TG3_EXT_CTRL_LNK3_LED_MODE);
                }
                tw32(MAC_MODE, mac_mode);
+                /* Wait for link */
+                for (i = 0; i < 100; i++) {
+                        if (tr32(MAC_TX_STATUS) & TX_STATUS_LINK_UP)
+                                break;
+                        mdelay(1);
+                }
        } else {
                return -EINVAL;
        }
@@ -11035,14 +11041,19 @@ out:
 static int tg3_test_loopback(struct tg3 *tp)
 {
        int err = 0;
-        u32 cpmuctrl = 0;
+        u32 eee_cap, cpmuctrl = 0;
        if (!netif_running(tp->dev))
                return TG3_LOOPBACK_FAILED;
+        eee_cap = tp->phy_flags & TG3_PHYFLG_EEE_CAP;
+        tp->phy_flags &= ~TG3_PHYFLG_EEE_CAP;
        err = tg3_reset_hw(tp, 1);
-        if (err)
+        if (err) {
-                return TG3_LOOPBACK_FAILED;
+                err = TG3_LOOPBACK_FAILED;
+                goto done;
+        }
        /* Turn off gphy autopowerdown. */
        if (tp->phy_flags & TG3_PHYFLG_ENABLE_APD)
@@ -11062,8 +11073,10 @@ static int tg3_test_loopback(struct tg3 *tp)
                        udelay(10);
                }
-                if (status != CPMU_MUTEX_GNT_DRIVER)
+                if (status != CPMU_MUTEX_GNT_DRIVER) {
-                        return TG3_LOOPBACK_FAILED;
+                        err = TG3_LOOPBACK_FAILED;
+                        goto done;
+                }
                /* Turn off link-based power management. */
                cpmuctrl = tr32(TG3_CPMU_CTRL);
@@ -11092,6 +11105,9 @@ static int tg3_test_loopback(struct tg3 *tp)
        if (tp->phy_flags & TG3_PHYFLG_ENABLE_APD)
                tg3_phy_toggle_apd(tp, true);
+done:
+        tp->phy_flags |= eee_cap;
        return err;
 }
@@ -11198,7 +11214,9 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                        break;                  /* We have no PHY */
-                if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
+                if ((tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) ||
+                    ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
+                     !netif_running(dev)))
                        return -EAGAIN;
                spin_lock_bh(&tp->lock);
@@ -11214,7 +11232,9 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                        break;                  /* We have no PHY */
-                if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
+                if ((tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) ||
+                    ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
+                     !netif_running(dev)))
                        return -EAGAIN;
                spin_lock_bh(&tp->lock);
@@ -11230,31 +11250,6 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        return -EOPNOTSUPP;
 }
-#if TG3_VLAN_TAG_USED
-static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
-{
-        struct tg3 *tp = netdev_priv(dev);
-        if (!netif_running(dev)) {
-                tp->vlgrp = grp;
-                return;
-        }
-        tg3_netif_stop(tp);
-        tg3_full_lock(tp, 0);
-        tp->vlgrp = grp;
-        /* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */
-        __tg3_set_rx_mode(dev);
-        tg3_netif_start(tp);
-        tg3_full_unlock(tp);
-}
-#endif
 static int tg3_get_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)
 {
        struct tg3 *tp = netdev_priv(dev);
@@ -12468,9 +12463,11 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                        tp->tg3_flags3 |= TG3_FLG3_RGMII_EXT_IBND_TX_EN;
        }
 done:
-        device_init_wakeup(&tp->pdev->dev, tp->tg3_flags & TG3_FLAG_WOL_CAP);
+        if (tp->tg3_flags & TG3_FLAG_WOL_CAP)
-        device_set_wakeup_enable(&tp->pdev->dev,
+                device_set_wakeup_enable(&tp->pdev->dev,
                                 tp->tg3_flags & TG3_FLAG_WOL_ENABLE);
+        else
+                device_set_wakeup_capable(&tp->pdev->dev, false);
 }
 static int __devinit tg3_issue_otp_command(struct tg3 *tp, u32 cmd)
@@ -13066,9 +13063,7 @@ static struct pci_dev * __devinit tg3_find_peer(struct tg3 *);
 static void inline vlan_features_add(struct net_device *dev, unsigned long flags)
 {
-#if TG3_VLAN_TAG_USED
        dev->vlan_features |= flags;
-#endif
 }
 static inline u32 tg3_rx_ret_ring_size(struct tg3 *tp)
@@ -13325,7 +13320,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
        }
        /* Determine TSO capabilities */
-        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
+                ; /* Do nothing. HW bug. */
+        else if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
                tp->tg3_flags2 |= TG3_FLG2_HW_TSO_3;
        else if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
                 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
@@ -13376,7 +13373,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                tp->tg3_flags3 |= TG3_FLG3_40BIT_DMA_LIMIT_BUG;
        }
-        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
+        if ((tp->tg3_flags3 & TG3_FLG3_5717_PLUS) &&
+            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719)
                tp->tg3_flags3 |= TG3_FLG3_USE_JUMBO_BDFLAG;
        if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
@@ -13394,42 +13392,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                tp->tg3_flags2 |= TG3_FLG2_PCI_EXPRESS;
                tp->pcie_readrq = 4096;
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
-                        u16 word;
+                        tp->pcie_readrq = 2048;
-                        pci_read_config_word(tp->pdev,
-                                             tp->pcie_cap + PCI_EXP_LNKSTA,
-                                             &word);
-                        switch (word & PCI_EXP_LNKSTA_CLS) {
-                        case PCI_EXP_LNKSTA_CLS_2_5GB:
-                                word &= PCI_EXP_LNKSTA_NLW;
-                                word >>= PCI_EXP_LNKSTA_NLW_SHIFT;
-                                switch (word) {
-                                case 2:
-                                        tp->pcie_readrq = 2048;
-                                        break;
-                                case 4:
-                                        tp->pcie_readrq = 1024;
-                                        break;
-                                }
-                                break;
-                        case PCI_EXP_LNKSTA_CLS_5_0GB:
-                                word &= PCI_EXP_LNKSTA_NLW;
-                                word >>= PCI_EXP_LNKSTA_NLW_SHIFT;
-                                switch (word) {
-                                case 1:
-                                        tp->pcie_readrq = 2048;
-                                        break;
-                                case 2:
-                                        tp->pcie_readrq = 1024;
-                                        break;
-                                case 4:
-                                        tp->pcie_readrq = 512;
-                                        break;
-                                }
-                        }
-                }
                pcie_set_readrq(tp->pdev, tp->pcie_readrq);
@@ -13861,11 +13825,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
        else
                tp->tg3_flags &= ~TG3_FLAG_POLL_SERDES;
-        tp->rx_offset = NET_IP_ALIGN + TG3_RX_HEADROOM;
+        tp->rx_offset = NET_IP_ALIGN;
        tp->rx_copy_thresh = TG3_RX_COPY_THRESHOLD;
        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 &&
            (tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0) {
-                tp->rx_offset -= NET_IP_ALIGN;
+                tp->rx_offset = 0;
 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
                tp->rx_copy_thresh = ~(u16)0;
 #endif
@@ -14629,9 +14593,6 @@ static const struct net_device_ops tg3_netdev_ops = {
        .ndo_do_ioctl           = tg3_ioctl,
        .ndo_tx_timeout         = tg3_tx_timeout,
        .ndo_change_mtu         = tg3_change_mtu,
-#if TG3_VLAN_TAG_USED
-        .ndo_vlan_rx_register   = tg3_vlan_rx_register,
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller    = tg3_poll_controller,
 #endif
@@ -14648,9 +14609,6 @@ static const struct net_device_ops tg3_netdev_ops_dma_bug = {
        .ndo_do_ioctl           = tg3_ioctl,
        .ndo_tx_timeout         = tg3_tx_timeout,
        .ndo_change_mtu         = tg3_change_mtu,
-#if TG3_VLAN_TAG_USED
-        .ndo_vlan_rx_register   = tg3_vlan_rx_register,
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller    = tg3_poll_controller,
 #endif
@@ -14700,9 +14658,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
        SET_NETDEV_DEV(dev, &pdev->dev);
-#if TG3_VLAN_TAG_USED
        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-#endif
        tp = netdev_priv(dev);
        tp->pdev = pdev;
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index d62c8d937c82..73884b69b749 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -4,7 +4,7 @@
 * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
 * Copyright (C) 2001 Jeff Garzik (jgarzik@pobox.com)
 * Copyright (C) 2004 Sun Microsystems Inc.
- * Copyright (C) 2007-2010 Broadcom Corporation.
+ * Copyright (C) 2007-2011 Broadcom Corporation.
 */
 #ifndef _T3_H
@@ -141,6 +141,7 @@
 #define  CHIPREV_ID_57780_A1             0x57780001
 #define  CHIPREV_ID_5717_A0              0x05717000
 #define  CHIPREV_ID_57765_A0             0x57785000
+#define  CHIPREV_ID_5719_A0              0x05719000
 #define  GET_ASIC_REV(CHIP_REV_ID)      ((CHIP_REV_ID) >> 12)
 #define   ASIC_REV_5700                  0x07
 #define   ASIC_REV_5701                  0x00
@@ -1105,7 +1106,7 @@
 #define  TG3_CPMU_DBTMR1_PCIEXIT_2047US  0x07ff0000
 #define  TG3_CPMU_DBTMR1_LNKIDLE_2047US  0x000070ff
 #define TG3_CPMU_EEE_DBTMR2             0x000036b8
-#define  TG3_CPMU_DBTMR1_APE_TX_2047US   0x07ff0000
+#define  TG3_CPMU_DBTMR2_APE_TX_2047US   0x07ff0000
 #define  TG3_CPMU_DBTMR2_TXIDXEQ_2047US  0x000070ff
 #define TG3_CPMU_EEE_LNKIDL_CTRL        0x000036bc
 #define  TG3_CPMU_EEE_LNKIDL_PCIE_NL0    0x01000000
@@ -1333,6 +1334,10 @@
 #define TG3_RDMA_RSRVCTRL_REG           0x00004900
 #define TG3_RDMA_RSRVCTRL_FIFO_OFLW_FIX  0x00000004
+#define TG3_RDMA_RSRVCTRL_FIFO_LWM_1_5K  0x00000c00
+#define TG3_RDMA_RSRVCTRL_FIFO_LWM_MASK  0x00000ff0
+#define TG3_RDMA_RSRVCTRL_FIFO_HWM_1_5K  0x000c0000
+#define TG3_RDMA_RSRVCTRL_FIFO_HWM_MASK  0x000ff000
 #define TG3_RDMA_RSRVCTRL_TXMRGN_320B    0x28000000
 #define TG3_RDMA_RSRVCTRL_TXMRGN_MASK    0xffe00000
 /* 0x4904 --> 0x4910 unused */
@@ -2108,6 +2113,10 @@
 #define MII_TG3_DSP_TAP1                0x0001
 #define  MII_TG3_DSP_TAP1_AGCTGT_DFLT   0x0007
+#define MII_TG3_DSP_TAP26               0x001a
+#define  MII_TG3_DSP_TAP26_ALNOKO       0x0001
+#define  MII_TG3_DSP_TAP26_RMRXSTO      0x0002
+#define  MII_TG3_DSP_TAP26_OPCSINPT     0x0004
 #define MII_TG3_DSP_AADJ1CH0            0x001f
 #define MII_TG3_DSP_CH34TP2             0x4022
 #define MII_TG3_DSP_CH34TP2_HIBW01      0x0010
@@ -2808,9 +2817,6 @@ struct tg3 {
        u32                             rx_std_max_post;
        u32                             rx_offset;
        u32                             rx_pkt_map_sz;
-#if TG3_VLAN_TAG_USED
-        struct vlan_group               *vlgrp;
-#endif
        /* begin "everything else" cacheline(s) section */
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index f8e463cd8ecc..e48a80885343 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -63,45 +63,45 @@
 *                           - Other minor stuff
 *
 *      v1.4 Feb 10, 2000    - Updated with more changes required after Dave's
- *                             network cleanup in 2.3.43pre7 (Tigran & myself)
+ *                             network cleanup in 2.3.43pre7 (Tigran & myself)
- *                           - Minor stuff.
+ *                           - Minor stuff.
 *
- *      v1.5 March 22, 2000  - Fixed another timer bug that would hang the driver
+ *      v1.5 March 22, 2000  - Fixed another timer bug that would hang the
- *                             if no cable/link were present.
+ *                             driver if no cable/link were present.
 *                           - Cosmetic changes.
 *                           - TODO: Port completely to new PCI/DMA API
- *                                   Auto-Neg fallback.
+ *                                   Auto-Neg fallback.
- *
+ *
- *      v1.6 April 04, 2000  - Fixed driver support for kernel-parameters. Haven't
+ *      v1.6 April 04, 2000  - Fixed driver support for kernel-parameters.
- *                             tested it though, as the kernel support is currently
+ *                             Haven't tested it though, as the kernel support
- *                             broken (2.3.99p4p3).
+ *                             is currently broken (2.3.99p4p3).
- *                           - Updated tlan.txt accordingly.
+ *                           - Updated tlan.txt accordingly.
- *                           - Adjusted minimum/maximum frame length.
+ *                           - Adjusted minimum/maximum frame length.
- *                           - There is now a TLAN website up at
+ *                           - There is now a TLAN website up at
- *                             http://hp.sourceforge.net/ 
+ *                             http://hp.sourceforge.net/
- *
+ *
- *      v1.7 April 07, 2000  - Started to implement custom ioctls. Driver now
+ *      v1.7 April 07, 2000  - Started to implement custom ioctls. Driver now
- *                             reports PHY information when used with Donald
+ *                             reports PHY information when used with Donald
- *                             Beckers userspace MII diagnostics utility.
+ *                             Beckers userspace MII diagnostics utility.
- *
+ *
- *      v1.8 April 23, 2000  - Fixed support for forced speed/duplex settings.
+ *      v1.8 April 23, 2000  - Fixed support for forced speed/duplex settings.
- *                           - Added link information to Auto-Neg and forced
+ *                           - Added link information to Auto-Neg and forced
- *                             modes. When NIC operates with auto-neg the driver
+ *                             modes. When NIC operates with auto-neg the driver
- *                             will report Link speed & duplex modes as well as
+ *                             will report Link speed & duplex modes as well as
- *                             link partner abilities. When forced link is used,
+ *                             link partner abilities. When forced link is used,
- *                             the driver will report status of the established
+ *                             the driver will report status of the established
- *                             link.
+ *                             link.
- *                             Please read tlan.txt for additional information.
+ *                             Please read tlan.txt for additional information.
- *                           - Removed call to check_region(), and used
+ *                           - Removed call to check_region(), and used
- *                             return value of request_region() instead.
+ *                             return value of request_region() instead.
 *
 *      v1.8a May 28, 2000   - Minor updates.
 *
 *      v1.9 July 25, 2000   - Fixed a few remaining Full-Duplex issues.
- *                           - Updated with timer fixes from Andrew Morton.
+ *                           - Updated with timer fixes from Andrew Morton.
- *                           - Fixed module race in TLan_Open.
+ *                           - Fixed module race in TLan_Open.
- *                           - Added routine to monitor PHY status.
+ *                           - Added routine to monitor PHY status.
- *                           - Added activity led support for Proliant devices.
+ *                           - Added activity led support for Proliant devices.
 *
 *      v1.10 Aug 30, 2000   - Added support for EISA based tlan controllers
 *                             like the Compaq NetFlex3/E.
@@ -111,8 +111,8 @@
 *                             hardware probe is done with kernel API and
 *                             TLan_EisaProbe.
 *                           - Adjusted debug information for probing.
- *                           - Fixed bug that would cause general debug information
+ *                           - Fixed bug that would cause general debug
- *                             to be printed after driver removal.
+ *                             information to be printed after driver removal.
 *                           - Added transmit timeout handling.
 *                           - Fixed OOM return values in tlan_probe.
 *                           - Fixed possible mem leak in tlan_exit
@@ -136,8 +136,8 @@
 *
 *      v1.12 Oct 12, 2000   - Minor fixes (memleak, init, etc.)
 *
- *      v1.13 Nov 28, 2000   - Stop flooding console with auto-neg issues
+ *      v1.13 Nov 28, 2000   - Stop flooding console with auto-neg issues
- *                             when link can't be established.
+ *                             when link can't be established.
 *                           - Added the bbuf option as a kernel parameter.
 *                           - Fixed ioaddr probe bug.
 *                           - Fixed stupid deadlock with MII interrupts.
@@ -147,28 +147,30 @@
 *                             TLAN v1.0 silicon. This needs to be investigated
 *                             further.
 *
- *      v1.14 Dec 16, 2000   - Added support for servicing multiple frames per.
+ *      v1.14 Dec 16, 2000   - Added support for servicing multiple frames per.
- *                             interrupt. Thanks goes to
+ *                             interrupt. Thanks goes to
- *                             Adam Keys <adam@ti.com>
+ *                             Adam Keys <adam@ti.com>
- *                             Denis Beaudoin <dbeaudoin@ti.com>
+ *                             Denis Beaudoin <dbeaudoin@ti.com>
- *                             for providing the patch.
+ *                             for providing the patch.
- *                           - Fixed auto-neg output when using multiple
+ *                           - Fixed auto-neg output when using multiple
- *                             adapters.
+ *                             adapters.
- *                           - Converted to use new taskq interface.
+ *                           - Converted to use new taskq interface.
 *
- *      v1.14a Jan 6, 2001   - Minor adjustments (spinlocks, etc.)
+ *      v1.14a Jan 6, 2001   - Minor adjustments (spinlocks, etc.)
 *
 *      Samuel Chessman <chessman@tux.org> New Maintainer!
 *
 *      v1.15 Apr 4, 2002    - Correct operation when aui=1 to be
- *                             10T half duplex no loopback
+ *                             10T half duplex no loopback
- *                             Thanks to Gunnar Eikman
+ *                             Thanks to Gunnar Eikman
 *
 *      Sakari Ailus <sakari.ailus@iki.fi>:
 *
 *      v1.15a Dec 15 2008   - Remove bbuf support, it doesn't work anyway.
+ *      v1.16  Jan 6  2011   - Make checkpatch.pl happy.
+ *      v1.17  Jan 6  2011   - Add suspend/resume support.
 *
- *******************************************************************************/
+ ******************************************************************************/
 #include <linux/module.h>
 #include <linux/init.h>
@@ -185,13 +187,11 @@
 #include "tlan.h"
-typedef u32 (TLanIntVectorFunc)( struct net_device *, u16 );
 /* For removing EISA devices */
-static  struct net_device       *TLan_Eisa_Devices;
+static  struct net_device       *tlan_eisa_devices;
-static  int             TLanDevicesInstalled;
+static  int             tlan_devices_installed;
 /* Set speed, duplex and aui settings */
 static  int aui[MAX_TLAN_BOARDS];
@@ -202,7 +202,8 @@ module_param_array(aui, int, NULL, 0);
 module_param_array(duplex, int, NULL, 0);
 module_param_array(speed, int, NULL, 0);
 MODULE_PARM_DESC(aui, "ThunderLAN use AUI port(s) (0-1)");
-MODULE_PARM_DESC(duplex, "ThunderLAN duplex setting(s) (0-default, 1-half, 2-full)");
+MODULE_PARM_DESC(duplex,
+                 "ThunderLAN duplex setting(s) (0-default, 1-half, 2-full)");
 MODULE_PARM_DESC(speed, "ThunderLAN port speen setting(s) (0,10,100)");
 MODULE_AUTHOR("Maintainer: Samuel Chessman <chessman@tux.org>");
@@ -218,139 +219,144 @@ static  int		debug;
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "ThunderLAN debug mask");
-static  const char TLanSignature[] = "TLAN";
+static  const char tlan_signature[] = "TLAN";
-static  const char tlan_banner[] = "ThunderLAN driver v1.15a\n";
+static  const char tlan_banner[] = "ThunderLAN driver v1.17\n";
 static  int tlan_have_pci;
 static  int tlan_have_eisa;
-static const char *media[] = {
+static const char * const media[] = {
-        "10BaseT-HD ", "10BaseT-FD ","100baseTx-HD ",
+        "10BaseT-HD", "10BaseT-FD", "100baseTx-HD",
-        "100baseTx-FD", "100baseT4", NULL
+        "100BaseTx-FD", "100BaseT4", NULL
 };
 static struct board {
-        const char      *deviceLabel;
+        const char      *device_label;
-        u32             flags;
+        u32             flags;
-        u16             addrOfs;
+        u16             addr_ofs;
 } board_info[] = {
        { "Compaq Netelligent 10 T PCI UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
-        { "Compaq Netelligent 10/100 TX PCI UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
+        { "Compaq Netelligent 10/100 TX PCI UTP",
+          TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
        { "Compaq Integrated NetFlex-3/P", TLAN_ADAPTER_NONE, 0x83 },
        { "Compaq NetFlex-3/P",
          TLAN_ADAPTER_UNMANAGED_PHY | TLAN_ADAPTER_BIT_RATE_PHY, 0x83 },
        { "Compaq NetFlex-3/P", TLAN_ADAPTER_NONE, 0x83 },
        { "Compaq Netelligent Integrated 10/100 TX UTP",
          TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
-        { "Compaq Netelligent Dual 10/100 TX PCI UTP", TLAN_ADAPTER_NONE, 0x83 },
+        { "Compaq Netelligent Dual 10/100 TX PCI UTP",
-        { "Compaq Netelligent 10/100 TX Embedded UTP", TLAN_ADAPTER_NONE, 0x83 },
+          TLAN_ADAPTER_NONE, 0x83 },
+        { "Compaq Netelligent 10/100 TX Embedded UTP",
+          TLAN_ADAPTER_NONE, 0x83 },
        { "Olicom OC-2183/2185", TLAN_ADAPTER_USE_INTERN_10, 0x83 },
-        { "Olicom OC-2325", TLAN_ADAPTER_UNMANAGED_PHY, 0xF8 },
+        { "Olicom OC-2325", TLAN_ADAPTER_UNMANAGED_PHY, 0xf8 },
-        { "Olicom OC-2326", TLAN_ADAPTER_USE_INTERN_10, 0xF8 },
+        { "Olicom OC-2326", TLAN_ADAPTER_USE_INTERN_10, 0xf8 },
        { "Compaq Netelligent 10/100 TX UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
-        { "Compaq Netelligent 10 T/2 PCI UTP/Coax", TLAN_ADAPTER_NONE, 0x83 },
+        { "Compaq Netelligent 10 T/2 PCI UTP/coax", TLAN_ADAPTER_NONE, 0x83 },
        { "Compaq NetFlex-3/E",
-          TLAN_ADAPTER_ACTIVITY_LED |   /* EISA card */
+          TLAN_ADAPTER_ACTIVITY_LED |   /* EISA card */
          TLAN_ADAPTER_UNMANAGED_PHY | TLAN_ADAPTER_BIT_RATE_PHY, 0x83 },
-        { "Compaq NetFlex-3/E", TLAN_ADAPTER_ACTIVITY_LED, 0x83 }, /* EISA card */
+        { "Compaq NetFlex-3/E",
+          TLAN_ADAPTER_ACTIVITY_LED, 0x83 }, /* EISA card */
 };
 static DEFINE_PCI_DEVICE_TABLE(tlan_pci_tbl) = {
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL10,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3I,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_THUNDER,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3B,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100PI,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100D,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100I,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7 },
        { PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2183,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
        { PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2325,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 },
        { PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2326,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10 },
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11 },
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_T2,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
        { 0,}
 };
 MODULE_DEVICE_TABLE(pci, tlan_pci_tbl);
-static void     TLan_EisaProbe( void );
+static void     tlan_eisa_probe(void);
-static void     TLan_Eisa_Cleanup( void );
+static void     tlan_eisa_cleanup(void);
-static int      TLan_Init( struct net_device * );
+static int      tlan_init(struct net_device *);
-static int      TLan_Open( struct net_device *dev );
+static int      tlan_open(struct net_device *dev);
-static netdev_tx_t TLan_StartTx( struct sk_buff *, struct net_device *);
+static netdev_tx_t tlan_start_tx(struct sk_buff *, struct net_device *);
-static irqreturn_t TLan_HandleInterrupt( int, void *);
+static irqreturn_t tlan_handle_interrupt(int, void *);
-static int      TLan_Close( struct net_device *);
+static int      tlan_close(struct net_device *);
-static struct   net_device_stats *TLan_GetStats( struct net_device *);
+static struct   net_device_stats *tlan_get_stats(struct net_device *);
-static void     TLan_SetMulticastList( struct net_device *);
+static void     tlan_set_multicast_list(struct net_device *);
-static int      TLan_ioctl( struct net_device *dev, struct ifreq *rq, int cmd);
+static int      tlan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-static int      TLan_probe1( struct pci_dev *pdev, long ioaddr,
+static int      tlan_probe1(struct pci_dev *pdev, long ioaddr,
-                             int irq, int rev, const struct pci_device_id *ent);
+                            int irq, int rev, const struct pci_device_id *ent);
-static void     TLan_tx_timeout( struct net_device *dev);
+static void     tlan_tx_timeout(struct net_device *dev);
-static void     TLan_tx_timeout_work(struct work_struct *work);
+static void     tlan_tx_timeout_work(struct work_struct *work);
-static int      tlan_init_one( struct pci_dev *pdev, const struct pci_device_id *ent);
+static int      tlan_init_one(struct pci_dev *pdev,
+                              const struct pci_device_id *ent);
-static u32      TLan_HandleTxEOF( struct net_device *, u16 );
-static u32      TLan_HandleStatOverflow( struct net_device *, u16 );
+static u32      tlan_handle_tx_eof(struct net_device *, u16);
-static u32      TLan_HandleRxEOF( struct net_device *, u16 );
+static u32      tlan_handle_stat_overflow(struct net_device *, u16);
-static u32      TLan_HandleDummy( struct net_device *, u16 );
+static u32      tlan_handle_rx_eof(struct net_device *, u16);
-static u32      TLan_HandleTxEOC( struct net_device *, u16 );
+static u32      tlan_handle_dummy(struct net_device *, u16);
-static u32      TLan_HandleStatusCheck( struct net_device *, u16 );
+static u32      tlan_handle_tx_eoc(struct net_device *, u16);
-static u32      TLan_HandleRxEOC( struct net_device *, u16 );
+static u32      tlan_handle_status_check(struct net_device *, u16);
+static u32      tlan_handle_rx_eoc(struct net_device *, u16);
-static void     TLan_Timer( unsigned long );
+static void     tlan_timer(unsigned long);
-static void     TLan_ResetLists( struct net_device * );
-static void     TLan_FreeLists( struct net_device * );
+static void     tlan_reset_lists(struct net_device *);
-static void     TLan_PrintDio( u16 );
+static void     tlan_free_lists(struct net_device *);
-static void     TLan_PrintList( TLanList *, char *, int );
+static void     tlan_print_dio(u16);
-static void     TLan_ReadAndClearStats( struct net_device *, int );
+static void     tlan_print_list(struct tlan_list *, char *, int);
-static void     TLan_ResetAdapter( struct net_device * );
+static void     tlan_read_and_clear_stats(struct net_device *, int);
-static void     TLan_FinishReset( struct net_device * );
+static void     tlan_reset_adapter(struct net_device *);
-static void     TLan_SetMac( struct net_device *, int areg, char *mac );
+static void     tlan_finish_reset(struct net_device *);
+static void     tlan_set_mac(struct net_device *, int areg, char *mac);
-static void     TLan_PhyPrint( struct net_device * );
-static void     TLan_PhyDetect( struct net_device * );
+static void     tlan_phy_print(struct net_device *);
-static void     TLan_PhyPowerDown( struct net_device * );
+static void     tlan_phy_detect(struct net_device *);
-static void     TLan_PhyPowerUp( struct net_device * );
+static void     tlan_phy_power_down(struct net_device *);
-static void     TLan_PhyReset( struct net_device * );
+static void     tlan_phy_power_up(struct net_device *);
-static void     TLan_PhyStartLink( struct net_device * );
+static void     tlan_phy_reset(struct net_device *);
-static void     TLan_PhyFinishAutoNeg( struct net_device * );
+static void     tlan_phy_start_link(struct net_device *);
+static void     tlan_phy_finish_auto_neg(struct net_device *);
 #ifdef MONITOR
-static void     TLan_PhyMonitor( struct net_device * );
+static void     tlan_phy_monitor(struct net_device *);
 #endif
 /*
-static int      TLan_PhyNop( struct net_device * );
+  static int    tlan_phy_nop(struct net_device *);
-static int      TLan_PhyInternalCheck( struct net_device * );
+  static int    tlan_phy_internal_check(struct net_device *);
-static int      TLan_PhyInternalService( struct net_device * );
+  static int    tlan_phy_internal_service(struct net_device *);
-static int      TLan_PhyDp83840aCheck( struct net_device * );
+  static int    tlan_phy_dp83840a_check(struct net_device *);
 */
-static bool     TLan_MiiReadReg( struct net_device *, u16, u16, u16 * );
+static bool     tlan_mii_read_reg(struct net_device *, u16, u16, u16 *);
-static void     TLan_MiiSendData( u16, u32, unsigned );
+static void     tlan_mii_send_data(u16, u32, unsigned);
-static void     TLan_MiiSync( u16 );
+static void     tlan_mii_sync(u16);
-static void     TLan_MiiWriteReg( struct net_device *, u16, u16, u16 );
+static void     tlan_mii_write_reg(struct net_device *, u16, u16, u16);
-static void     TLan_EeSendStart( u16 );
+static void     tlan_ee_send_start(u16);
-static int      TLan_EeSendByte( u16, u8, int );
+static int      tlan_ee_send_byte(u16, u8, int);
-static void     TLan_EeReceiveByte( u16, u8 *, int );
+static void     tlan_ee_receive_byte(u16, u8 *, int);
-static int      TLan_EeReadByte( struct net_device *, u8, u8 * );
+static int      tlan_ee_read_byte(struct net_device *, u8, u8 *);
 static inline void
-TLan_StoreSKB( struct tlan_list_tag *tag, struct sk_buff *skb)
+tlan_store_skb(struct tlan_list *tag, struct sk_buff *skb)
 {
        unsigned long addr = (unsigned long)skb;
        tag->buffer[9].address = addr;
@@ -358,7 +364,7 @@ TLan_StoreSKB( struct tlan_list_tag *tag, struct sk_buff *skb)
 }
 static inline struct sk_buff *
-TLan_GetSKB( const struct tlan_list_tag *tag)
+tlan_get_skb(const struct tlan_list *tag)
 {
        unsigned long addr;
@@ -367,50 +373,50 @@ TLan_GetSKB( const struct tlan_list_tag *tag)
        return (struct sk_buff *) addr;
 }
+static u32
-static TLanIntVectorFunc *TLanIntVector[TLAN_INT_NUMBER_OF_INTS] = {
+(*tlan_int_vector[TLAN_INT_NUMBER_OF_INTS])(struct net_device *, u16) = {
        NULL,
-        TLan_HandleTxEOF,
+        tlan_handle_tx_eof,
-        TLan_HandleStatOverflow,
+        tlan_handle_stat_overflow,
-        TLan_HandleRxEOF,
+        tlan_handle_rx_eof,
-        TLan_HandleDummy,
+        tlan_handle_dummy,
-        TLan_HandleTxEOC,
+        tlan_handle_tx_eoc,
-        TLan_HandleStatusCheck,
+        tlan_handle_status_check,
-        TLan_HandleRxEOC
+        tlan_handle_rx_eoc
 };
 static inline void
-TLan_SetTimer( struct net_device *dev, u32 ticks, u32 type )
+tlan_set_timer(struct net_device *dev, u32 ticks, u32 type)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        unsigned long flags = 0;
        if (!in_irq())
                spin_lock_irqsave(&priv->lock, flags);
-        if ( priv->timer.function != NULL &&
+        if (priv->timer.function != NULL &&
-                priv->timerType != TLAN_TIMER_ACTIVITY ) {
+            priv->timer_type != TLAN_TIMER_ACTIVITY) {
                if (!in_irq())
                        spin_unlock_irqrestore(&priv->lock, flags);
                return;
        }
-        priv->timer.function = TLan_Timer;
+        priv->timer.function = tlan_timer;
        if (!in_irq())
                spin_unlock_irqrestore(&priv->lock, flags);
        priv->timer.data = (unsigned long) dev;
-        priv->timerSetAt = jiffies;
+        priv->timer_set_at = jiffies;
-        priv->timerType = type;
+        priv->timer_type = type;
        mod_timer(&priv->timer, jiffies + ticks);
-} /* TLan_SetTimer */
+}
 /*****************************************************************************
 ******************************************************************************
-        ThunderLAN Driver Primary Functions
+ThunderLAN driver primary functions
-        These functions are more or less common to all Linux network drivers.
+these functions are more or less common to all linux network drivers.
 ******************************************************************************
 *****************************************************************************/
@@ -419,49 +425,117 @@ TLan_SetTimer( struct net_device *dev, u32 ticks, u32 type )
-        /***************************************************************
+/***************************************************************
-         *      tlan_remove_one
+ *      tlan_remove_one
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              None
+ *              None
-         *
+ *
-         *      Goes through the TLanDevices list and frees the device
+ *      Goes through the TLanDevices list and frees the device
-         *      structs and memory associated with each device (lists
+ *      structs and memory associated with each device (lists
-         *      and buffers).  It also ureserves the IO port regions
+ *      and buffers).  It also ureserves the IO port regions
-         *      associated with this device.
+ *      associated with this device.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void __devexit tlan_remove_one( struct pci_dev *pdev)
+static void __devexit tlan_remove_one(struct pci_dev *pdev)
 {
-        struct net_device *dev = pci_get_drvdata( pdev );
+        struct net_device *dev = pci_get_drvdata(pdev);
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
-        unregister_netdev( dev );
+        unregister_netdev(dev);
-        if ( priv->dmaStorage ) {
+        if (priv->dma_storage) {
-                pci_free_consistent(priv->pciDev,
+                pci_free_consistent(priv->pci_dev,
-                                    priv->dmaSize, priv->dmaStorage,
+                                    priv->dma_size, priv->dma_storage,
-                                    priv->dmaStorageDMA );
+                                    priv->dma_storage_dma);
        }
 #ifdef CONFIG_PCI
        pci_release_regions(pdev);
 #endif
-        free_netdev( dev );
+        free_netdev(dev);
+        pci_set_drvdata(pdev, NULL);
+}
+static void tlan_start(struct net_device *dev)
+{
+        tlan_reset_lists(dev);
+        /* NOTE: It might not be necessary to read the stats before a
+           reset if you don't care what the values are.
+        */
+        tlan_read_and_clear_stats(dev, TLAN_IGNORE);
+        tlan_reset_adapter(dev);
+        netif_wake_queue(dev);
+}
+static void tlan_stop(struct net_device *dev)
+{
+        struct tlan_priv *priv = netdev_priv(dev);
+        tlan_read_and_clear_stats(dev, TLAN_RECORD);
+        outl(TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD);
+        /* Reset and power down phy */
+        tlan_reset_adapter(dev);
+        if (priv->timer.function != NULL) {
+                del_timer_sync(&priv->timer);
+                priv->timer.function = NULL;
+        }
+}
+#ifdef CONFIG_PM
+static int tlan_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        if (netif_running(dev))
+                tlan_stop(dev);
+        netif_device_detach(dev);
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+        pci_wake_from_d3(pdev, false);
+        pci_set_power_state(pdev, PCI_D3hot);
-        pci_set_drvdata( pdev, NULL );
+        return 0;
 }
+static int tlan_resume(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        pci_enable_wake(pdev, 0, 0);
+        netif_device_attach(dev);
+        if (netif_running(dev))
+                tlan_start(dev);
+        return 0;
+}
+#else /* CONFIG_PM */
+#define tlan_suspend   NULL
+#define tlan_resume    NULL
+#endif /* CONFIG_PM */
 static struct pci_driver tlan_driver = {
        .name           = "tlan",
        .id_table       = tlan_pci_tbl,
        .probe          = tlan_init_one,
        .remove         = __devexit_p(tlan_remove_one),
+        .suspend        = tlan_suspend,
+        .resume         = tlan_resume,
 };
 static int __init tlan_probe(void)
@@ -482,13 +556,13 @@ static int __init tlan_probe(void)
        }
        TLAN_DBG(TLAN_DEBUG_PROBE, "Starting EISA Probe....\n");
-        TLan_EisaProbe();
+        tlan_eisa_probe();
        printk(KERN_INFO "TLAN: %d device%s installed, PCI: %d  EISA: %d\n",
-                 TLanDevicesInstalled, TLanDevicesInstalled == 1 ? "" : "s",
+               tlan_devices_installed, tlan_devices_installed == 1 ? "" : "s",
-                 tlan_have_pci, tlan_have_eisa);
+               tlan_have_pci, tlan_have_eisa);
-        if (TLanDevicesInstalled == 0) {
+        if (tlan_devices_installed == 0) {
                rc = -ENODEV;
                goto  err_out_pci_unreg;
        }
@@ -501,39 +575,39 @@ err_out_pci_free:
 }
-static int __devinit tlan_init_one( struct pci_dev *pdev,
+static int __devinit tlan_init_one(struct pci_dev *pdev,
-                                    const struct pci_device_id *ent)
+                                   const struct pci_device_id *ent)
 {
-        return TLan_probe1( pdev, -1, -1, 0, ent);
+        return tlan_probe1(pdev, -1, -1, 0, ent);
 }
 /*
-        ***************************************************************
+***************************************************************
-         *      tlan_probe1
+*       tlan_probe1
-         *
+*
-         *      Returns:
+*       Returns:
-         *              0 on success, error code on error
+*               0 on success, error code on error
-         *      Parms:
+*       Parms:
-         *              none
+*               none
-         *
+*
-         *      The name is lower case to fit in with all the rest of
+*       The name is lower case to fit in with all the rest of
-         *      the netcard_probe names.  This function looks for
+*       the netcard_probe names.  This function looks for
-         *      another TLan based adapter, setting it up with the
+*       another TLan based adapter, setting it up with the
-         *      allocated device struct if one is found.
+*       allocated device struct if one is found.
-         *      tlan_probe has been ported to the new net API and
+*       tlan_probe has been ported to the new net API and
-         *      now allocates its own device structure. This function
+*       now allocates its own device structure. This function
-         *      is also used by modules.
+*       is also used by modules.
-         *
+*
-         **************************************************************/
+**************************************************************/
-static int __devinit TLan_probe1(struct pci_dev *pdev,
+static int __devinit tlan_probe1(struct pci_dev *pdev,
                                 long ioaddr, int irq, int rev,
-                                 const struct pci_device_id *ent )
+                                 const struct pci_device_id *ent)
 {
        struct net_device  *dev;
-        TLanPrivateInfo    *priv;
+        struct tlan_priv  *priv;
        u16                device_id;
        int                reg, rc = -ENODEV;
@@ -543,7 +617,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                if (rc)
                        return rc;
-                rc = pci_request_regions(pdev, TLanSignature);
+                rc = pci_request_regions(pdev, tlan_signature);
                if (rc) {
                        printk(KERN_ERR "TLAN: Could not reserve IO regions\n");
                        goto err_out;
@@ -551,7 +625,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
        }
 #endif  /*  CONFIG_PCI  */
-        dev = alloc_etherdev(sizeof(TLanPrivateInfo));
+        dev = alloc_etherdev(sizeof(struct tlan_priv));
        if (dev == NULL) {
                printk(KERN_ERR "TLAN: Could not allocate memory for device.\n");
                rc = -ENOMEM;
@@ -561,26 +635,28 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
        priv = netdev_priv(dev);
-        priv->pciDev = pdev;
+        priv->pci_dev = pdev;
        priv->dev = dev;
        /* Is this a PCI device? */
        if (pdev) {
-                u32                pci_io_base = 0;
+                u32                pci_io_base = 0;
                priv->adapter = &board_info[ent->driver_data];
                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                if (rc) {
-                        printk(KERN_ERR "TLAN: No suitable PCI mapping available.\n");
+                        printk(KERN_ERR
+                               "TLAN: No suitable PCI mapping available.\n");
                        goto err_out_free_dev;
                }
-                for ( reg= 0; reg <= 5; reg ++ ) {
+                for (reg = 0; reg <= 5; reg++) {
                        if (pci_resource_flags(pdev, reg) & IORESOURCE_IO) {
                                pci_io_base = pci_resource_start(pdev, reg);
-                                TLAN_DBG( TLAN_DEBUG_GNRL, "IO mapping is available at %x.\n",
+                                TLAN_DBG(TLAN_DEBUG_GNRL,
-                                                pci_io_base);
+                                         "IO mapping is available at %x.\n",
+                                         pci_io_base);
                                break;
                        }
                }
@@ -592,7 +668,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                dev->base_addr = pci_io_base;
                dev->irq = pdev->irq;
-                priv->adapterRev = pdev->revision;
+                priv->adapter_rev = pdev->revision;
                pci_set_master(pdev);
                pci_set_drvdata(pdev, dev);
@@ -602,11 +678,11 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                device_id = inw(ioaddr + EISA_ID2);
                priv->is_eisa = 1;
                if (device_id == 0x20F1) {
-                        priv->adapter = &board_info[13];        /* NetFlex-3/E */
+                        priv->adapter = &board_info[13]; /* NetFlex-3/E */
-                        priv->adapterRev = 23;                  /* TLAN 2.3 */
+                        priv->adapter_rev = 23;         /* TLAN 2.3 */
                } else {
                        priv->adapter = &board_info[14];
-                        priv->adapterRev = 10;                  /* TLAN 1.0 */
+                        priv->adapter_rev = 10;         /* TLAN 1.0 */
                }
                dev->base_addr = ioaddr;
                dev->irq = irq;
@@ -620,11 +696,11 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                priv->speed  = ((dev->mem_start & 0x18) == 0x18) ? 0
                        : (dev->mem_start & 0x18) >> 3;
-                if (priv->speed == 0x1) {
+                if (priv->speed == 0x1)
                        priv->speed = TLAN_SPEED_10;
-                } else if (priv->speed == 0x2) {
+                else if (priv->speed == 0x2)
                        priv->speed = TLAN_SPEED_100;
-                }
                debug = priv->debug = dev->mem_end;
        } else {
                priv->aui    = aui[boards_found];
@@ -635,11 +711,11 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
        /* This will be used when we get an adapter error from
         * within our irq handler */
-        INIT_WORK(&priv->tlan_tqueue, TLan_tx_timeout_work);
+        INIT_WORK(&priv->tlan_tqueue, tlan_tx_timeout_work);
        spin_lock_init(&priv->lock);
-        rc = TLan_Init(dev);
+        rc = tlan_init(dev);
        if (rc) {
                printk(KERN_ERR "TLAN: Could not set up device.\n");
                goto err_out_free_dev;
@@ -652,29 +728,29 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
        }
-        TLanDevicesInstalled++;
+        tlan_devices_installed++;
        boards_found++;
        /* pdev is NULL if this is an EISA device */
        if (pdev)
                tlan_have_pci++;
        else {
-                priv->nextDevice = TLan_Eisa_Devices;
+                priv->next_device = tlan_eisa_devices;
-                TLan_Eisa_Devices = dev;
+                tlan_eisa_devices = dev;
                tlan_have_eisa++;
        }
        printk(KERN_INFO "TLAN: %s irq=%2d, io=%04x, %s, Rev. %d\n",
-                        dev->name,
+               dev->name,
-                        (int) dev->irq,
+               (int) dev->irq,
-                        (int) dev->base_addr,
+               (int) dev->base_addr,
-                        priv->adapter->deviceLabel,
+               priv->adapter->device_label,
-                        priv->adapterRev);
+               priv->adapter_rev);
        return 0;
 err_out_uninit:
-        pci_free_consistent(priv->pciDev, priv->dmaSize, priv->dmaStorage,
+        pci_free_consistent(priv->pci_dev, priv->dma_size, priv->dma_storage,
-                            priv->dmaStorageDMA );
+                            priv->dma_storage_dma);
 err_out_free_dev:
        free_netdev(dev);
 err_out_regions:
@@ -689,22 +765,23 @@ err_out:
 }
-static void TLan_Eisa_Cleanup(void)
+static void tlan_eisa_cleanup(void)
 {
        struct net_device *dev;
-        TLanPrivateInfo *priv;
+        struct tlan_priv *priv;
-        while( tlan_have_eisa ) {
+        while (tlan_have_eisa) {
-                dev = TLan_Eisa_Devices;
+                dev = tlan_eisa_devices;
                priv = netdev_priv(dev);
-                if (priv->dmaStorage) {
+                if (priv->dma_storage) {
-                        pci_free_consistent(priv->pciDev, priv->dmaSize,
+                        pci_free_consistent(priv->pci_dev, priv->dma_size,
-                                            priv->dmaStorage, priv->dmaStorageDMA );
+                                            priv->dma_storage,
+                                            priv->dma_storage_dma);
                }
-                release_region( dev->base_addr, 0x10);
+                release_region(dev->base_addr, 0x10);
-                unregister_netdev( dev );
+                unregister_netdev(dev);
-                TLan_Eisa_Devices = priv->nextDevice;
+                tlan_eisa_devices = priv->next_device;
-                free_netdev( dev );
+                free_netdev(dev);
                tlan_have_eisa--;
        }
 }
@@ -715,7 +792,7 @@ static void __exit tlan_exit(void)
        pci_unregister_driver(&tlan_driver);
        if (tlan_have_eisa)
-                TLan_Eisa_Cleanup();
+                tlan_eisa_cleanup();
 }
@@ -726,24 +803,24 @@ module_exit(tlan_exit);
-        /**************************************************************
+/**************************************************************
-         *      TLan_EisaProbe
+ *      tlan_eisa_probe
-         *
+ *
-         *      Returns: 0 on success, 1 otherwise
+ *      Returns: 0 on success, 1 otherwise
-         *
+ *
-         *      Parms:   None
+ *      Parms:   None
-         *
+ *
-         *
+ *
-         *      This functions probes for EISA devices and calls
+ *      This functions probes for EISA devices and calls
-         *      TLan_probe1 when one is found.
+ *      TLan_probe1 when one is found.
-         *
+ *
-         *************************************************************/
+ *************************************************************/
-static void  __init TLan_EisaProbe (void)
+static void  __init tlan_eisa_probe(void)
 {
-        long    ioaddr;
+        long    ioaddr;
-        int     rc = -ENODEV;
+        int     rc = -ENODEV;
-        int     irq;
+        int     irq;
        u16     device_id;
        if (!EISA_bus) {
@@ -754,15 +831,16 @@ static void  __init TLan_EisaProbe (void)
        /* Loop through all slots of the EISA bus */
        for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000) {
-        TLAN_DBG(TLAN_DEBUG_PROBE,"EISA_ID 0x%4x: 0x%4x\n",
+                TLAN_DBG(TLAN_DEBUG_PROBE, "EISA_ID 0x%4x: 0x%4x\n",
-                 (int) ioaddr + 0xC80, inw(ioaddr + EISA_ID));
+                         (int) ioaddr + 0xc80, inw(ioaddr + EISA_ID));
-        TLAN_DBG(TLAN_DEBUG_PROBE,"EISA_ID 0x%4x: 0x%4x\n",
+                TLAN_DBG(TLAN_DEBUG_PROBE, "EISA_ID 0x%4x: 0x%4x\n",
-                 (int) ioaddr + 0xC82, inw(ioaddr + EISA_ID2));
+                         (int) ioaddr + 0xc82, inw(ioaddr + EISA_ID2));
-                TLAN_DBG(TLAN_DEBUG_PROBE, "Probing for EISA adapter at IO: 0x%4x : ",
+                TLAN_DBG(TLAN_DEBUG_PROBE,
-                                        (int) ioaddr);
+                         "Probing for EISA adapter at IO: 0x%4x : ",
-                if (request_region(ioaddr, 0x10, TLanSignature) == NULL)
+                         (int) ioaddr);
+                if (request_region(ioaddr, 0x10, tlan_signature) == NULL)
                        goto out;
                if (inw(ioaddr + EISA_ID) != 0x110E) {
@@ -772,326 +850,326 @@ static void  __init TLan_EisaProbe (void)
                device_id = inw(ioaddr + EISA_ID2);
                if (device_id !=  0x20F1 && device_id != 0x40F1) {
-                        release_region (ioaddr, 0x10);
+                        release_region(ioaddr, 0x10);
                        goto out;
                }
-                if (inb(ioaddr + EISA_CR) != 0x1) {     /* Check if adapter is enabled */
+                /* check if adapter is enabled */
-                        release_region (ioaddr, 0x10);
+                if (inb(ioaddr + EISA_CR) != 0x1) {
+                        release_region(ioaddr, 0x10);
                        goto out2;
                }
                if (debug == 0x10)
-                        printk("Found one\n");
+                        printk(KERN_INFO "Found one\n");
                /* Get irq from board */
-                switch (inb(ioaddr + 0xCC0)) {
+                switch (inb(ioaddr + 0xcc0)) {
-                        case(0x10):
+                case(0x10):
-                                irq=5;
+                        irq = 5;
-                                break;
+                        break;
-                        case(0x20):
+                case(0x20):
-                                irq=9;
+                        irq = 9;
-                                break;
+                        break;
-                        case(0x40):
+                case(0x40):
-                                irq=10;
+                        irq = 10;
-                                break;
+                        break;
-                        case(0x80):
+                case(0x80):
-                                irq=11;
+                        irq = 11;
-                                break;
+                        break;
-                        default:
+                default:
-                                goto out;
+                        goto out;
                }
                /* Setup the newly found eisa adapter */
-                rc = TLan_probe1( NULL, ioaddr, irq,
+                rc = tlan_probe1(NULL, ioaddr, irq,
-                                        12, NULL);
+                                 12, NULL);
                continue;
-                out:
+out:
-                        if (debug == 0x10)
+                if (debug == 0x10)
-                                printk("None found\n");
+                        printk(KERN_INFO "None found\n");
-                        continue;
+                continue;
-                out2:   if (debug == 0x10)
+out2:
-                                printk("Card found but it is not enabled, skipping\n");
+                if (debug == 0x10)
-                        continue;
+                        printk(KERN_INFO "Card found but it is not enabled, skipping\n");
+                continue;
        }
-} /* TLan_EisaProbe */
+}
 #ifdef CONFIG_NET_POLL_CONTROLLER
-static void TLan_Poll(struct net_device *dev)
+static void tlan_poll(struct net_device *dev)
 {
        disable_irq(dev->irq);
-        TLan_HandleInterrupt(dev->irq, dev);
+        tlan_handle_interrupt(dev->irq, dev);
        enable_irq(dev->irq);
 }
 #endif
-static const struct net_device_ops TLan_netdev_ops = {
+static const struct net_device_ops tlan_netdev_ops = {
-        .ndo_open               = TLan_Open,
+        .ndo_open               = tlan_open,
-        .ndo_stop               = TLan_Close,
+        .ndo_stop               = tlan_close,
-        .ndo_start_xmit         = TLan_StartTx,
+        .ndo_start_xmit         = tlan_start_tx,
-        .ndo_tx_timeout         = TLan_tx_timeout,
+        .ndo_tx_timeout         = tlan_tx_timeout,
-        .ndo_get_stats          = TLan_GetStats,
+        .ndo_get_stats          = tlan_get_stats,
-        .ndo_set_multicast_list = TLan_SetMulticastList,
+        .ndo_set_multicast_list = tlan_set_multicast_list,
-        .ndo_do_ioctl           = TLan_ioctl,
+        .ndo_do_ioctl           = tlan_ioctl,
        .ndo_change_mtu         = eth_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
 #ifdef CONFIG_NET_POLL_CONTROLLER
-        .ndo_poll_controller     = TLan_Poll,
+        .ndo_poll_controller     = tlan_poll,
 #endif
 };
-        /***************************************************************
+/***************************************************************
-         *      TLan_Init
+ *      tlan_init
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              0 on success, error code otherwise.
+ *              0 on success, error code otherwise.
-         *      Parms:
+ *      Parms:
-         *              dev     The structure of the device to be
+ *              dev     The structure of the device to be
-         *                      init'ed.
+ *                      init'ed.
-         *
+ *
-         *      This function completes the initialization of the
+ *      This function completes the initialization of the
-         *      device structure and driver.  It reserves the IO
+ *      device structure and driver.  It reserves the IO
-         *      addresses, allocates memory for the lists and bounce
+ *      addresses, allocates memory for the lists and bounce
-         *      buffers, retrieves the MAC address from the eeprom
+ *      buffers, retrieves the MAC address from the eeprom
-         *      and assignes the device's methods.
+ *      and assignes the device's methods.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static int TLan_Init( struct net_device *dev )
+static int tlan_init(struct net_device *dev)
 {
        int             dma_size;
-        int             err;
+        int             err;
        int             i;
-        TLanPrivateInfo *priv;
+        struct tlan_priv        *priv;
        priv = netdev_priv(dev);
-        dma_size = ( TLAN_NUM_RX_LISTS + TLAN_NUM_TX_LISTS )
+        dma_size = (TLAN_NUM_RX_LISTS + TLAN_NUM_TX_LISTS)
-                * ( sizeof(TLanList) );
+                * (sizeof(struct tlan_list));
-        priv->dmaStorage = pci_alloc_consistent(priv->pciDev,
+        priv->dma_storage = pci_alloc_consistent(priv->pci_dev,
-                                                dma_size, &priv->dmaStorageDMA);
+                                                 dma_size,
-        priv->dmaSize = dma_size;
+                                                 &priv->dma_storage_dma);
+        priv->dma_size = dma_size;
-        if ( priv->dmaStorage == NULL ) {
-                printk(KERN_ERR "TLAN:  Could not allocate lists and buffers for %s.\n",
+        if (priv->dma_storage == NULL) {
-                        dev->name );
+                printk(KERN_ERR
+                       "TLAN:  Could not allocate lists and buffers for %s.\n",
+                       dev->name);
                return -ENOMEM;
        }
-        memset( priv->dmaStorage, 0, dma_size );
+        memset(priv->dma_storage, 0, dma_size);
-        priv->rxList = (TLanList *) ALIGN((unsigned long)priv->dmaStorage, 8);
+        priv->rx_list = (struct tlan_list *)
-        priv->rxListDMA = ALIGN(priv->dmaStorageDMA, 8);
+                ALIGN((unsigned long)priv->dma_storage, 8);
-        priv->txList = priv->rxList + TLAN_NUM_RX_LISTS;
+        priv->rx_list_dma = ALIGN(priv->dma_storage_dma, 8);
-        priv->txListDMA = priv->rxListDMA + sizeof(TLanList) * TLAN_NUM_RX_LISTS;
+        priv->tx_list = priv->rx_list + TLAN_NUM_RX_LISTS;
+        priv->tx_list_dma =
+                priv->rx_list_dma + sizeof(struct tlan_list)*TLAN_NUM_RX_LISTS;
        err = 0;
-        for ( i = 0;  i < 6 ; i++ )
+        for (i = 0;  i < 6 ; i++)
-                err |= TLan_EeReadByte( dev,
+                err |= tlan_ee_read_byte(dev,
-                                        (u8) priv->adapter->addrOfs + i,
+                                         (u8) priv->adapter->addr_ofs + i,
-                                        (u8 *) &dev->dev_addr[i] );
+                                         (u8 *) &dev->dev_addr[i]);
-        if ( err ) {
+        if (err) {
                printk(KERN_ERR "TLAN: %s: Error reading MAC from eeprom: %d\n",
-                        dev->name,
+                       dev->name,
-                        err );
+                       err);
        }
        dev->addr_len = 6;
        netif_carrier_off(dev);
        /* Device methods */
-        dev->netdev_ops = &TLan_netdev_ops;
+        dev->netdev_ops = &tlan_netdev_ops;
        dev->watchdog_timeo = TX_TIMEOUT;
        return 0;
-} /* TLan_Init */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_Open
+ *      tlan_open
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              0 on success, error code otherwise.
+ *              0 on success, error code otherwise.
-         *      Parms:
+ *      Parms:
-         *              dev     Structure of device to be opened.
+ *              dev     Structure of device to be opened.
-         *
+ *
-         *      This routine puts the driver and TLAN adapter in a
+ *      This routine puts the driver and TLAN adapter in a
-         *      state where it is ready to send and receive packets.
+ *      state where it is ready to send and receive packets.
-         *      It allocates the IRQ, resets and brings the adapter
+ *      It allocates the IRQ, resets and brings the adapter
-         *      out of reset, and allows interrupts.  It also delays
+ *      out of reset, and allows interrupts.  It also delays
-         *      the startup for autonegotiation or sends a Rx GO
+ *      the startup for autonegotiation or sends a Rx GO
-         *      command to the adapter, as appropriate.
+ *      command to the adapter, as appropriate.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static int TLan_Open( struct net_device *dev )
+static int tlan_open(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        int             err;
-        priv->tlanRev = TLan_DioRead8( dev->base_addr, TLAN_DEF_REVISION );
+        priv->tlan_rev = tlan_dio_read8(dev->base_addr, TLAN_DEF_REVISION);
-        err = request_irq( dev->irq, TLan_HandleInterrupt, IRQF_SHARED,
+        err = request_irq(dev->irq, tlan_handle_interrupt, IRQF_SHARED,
-                           dev->name, dev );
+                          dev->name, dev);
-        if ( err ) {
+        if (err) {
                pr_err("TLAN:  Cannot open %s because IRQ %d is already in use.\n",
-                       dev->name, dev->irq );
+                       dev->name, dev->irq);
                return err;
        }
        init_timer(&priv->timer);
-        netif_start_queue(dev);
-        /* NOTE: It might not be necessary to read the stats before a
+        tlan_start(dev);
-                         reset if you don't care what the values are.
-        */
-        TLan_ResetLists( dev );
-        TLan_ReadAndClearStats( dev, TLAN_IGNORE );
-        TLan_ResetAdapter( dev );
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Opened.  TLAN Chip Rev: %x\n",
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Opened.  TLAN Chip Rev: %x\n",
-                  dev->name, priv->tlanRev );
+                 dev->name, priv->tlan_rev);
        return 0;
-} /* TLan_Open */
+}
-        /**************************************************************
+/**************************************************************
-         *      TLan_ioctl
+ *      tlan_ioctl
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              0 on success, error code otherwise
+ *              0 on success, error code otherwise
-         *      Params:
+ *      Params:
-         *              dev     structure of device to receive ioctl.
+ *              dev     structure of device to receive ioctl.
-         *
+ *
-         *              rq      ifreq structure to hold userspace data.
+ *              rq      ifreq structure to hold userspace data.
-         *
+ *
-         *              cmd     ioctl command.
+ *              cmd     ioctl command.
-         *
+ *
-         *
+ *
-         *************************************************************/
+ *************************************************************/
-static int TLan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+static int tlan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        struct mii_ioctl_data *data = if_mii(rq);
-        u32 phy   = priv->phy[priv->phyNum];
+        u32 phy   = priv->phy[priv->phy_num];
-        if (!priv->phyOnline)
+        if (!priv->phy_online)
                return -EAGAIN;
-        switch(cmd) {
+        switch (cmd) {
-        case SIOCGMIIPHY:               /* Get address of MII PHY in use. */
+        case SIOCGMIIPHY:               /* get address of MII PHY in use. */
-                        data->phy_id = phy;
+                data->phy_id = phy;
-        case SIOCGMIIREG:               /* Read MII PHY register. */
+        case SIOCGMIIREG:               /* read MII PHY register. */
-                        TLan_MiiReadReg(dev, data->phy_id & 0x1f,
+                tlan_mii_read_reg(dev, data->phy_id & 0x1f,
-                                        data->reg_num & 0x1f, &data->val_out);
+                                  data->reg_num & 0x1f, &data->val_out);
-                        return 0;
+                return 0;
-        case SIOCSMIIREG:               /* Write MII PHY register. */
+        case SIOCSMIIREG:               /* write MII PHY register. */
-                        TLan_MiiWriteReg(dev, data->phy_id & 0x1f,
+                tlan_mii_write_reg(dev, data->phy_id & 0x1f,
-                                         data->reg_num & 0x1f, data->val_in);
+                                   data->reg_num & 0x1f, data->val_in);
-                        return 0;
+                return 0;
-                default:
+        default:
-                        return -EOPNOTSUPP;
+                return -EOPNOTSUPP;
        }
-} /* tlan_ioctl */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_tx_timeout
+ *      tlan_tx_timeout
-         *
+ *
-         *      Returns: nothing
+ *      Returns: nothing
-         *
+ *
-         *      Params:
+ *      Params:
-         *              dev     structure of device which timed out
+ *              dev     structure of device which timed out
-         *                      during transmit.
+ *                      during transmit.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_tx_timeout(struct net_device *dev)
+static void tlan_tx_timeout(struct net_device *dev)
 {
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Transmit timed out.\n", dev->name);
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Transmit timed out.\n", dev->name);
        /* Ok so we timed out, lets see what we can do about it...*/
-        TLan_FreeLists( dev );
+        tlan_free_lists(dev);
-        TLan_ResetLists( dev );
+        tlan_reset_lists(dev);
-        TLan_ReadAndClearStats( dev, TLAN_IGNORE );
+        tlan_read_and_clear_stats(dev, TLAN_IGNORE);
-        TLan_ResetAdapter( dev );
+        tlan_reset_adapter(dev);
        dev->trans_start = jiffies; /* prevent tx timeout */
-        netif_wake_queue( dev );
+        netif_wake_queue(dev);
 }
-        /***************************************************************
+/***************************************************************
-         *      TLan_tx_timeout_work
+ *      tlan_tx_timeout_work
-         *
+ *
-         *      Returns: nothing
+ *      Returns: nothing
-         *
+ *
-         *      Params:
+ *      Params:
-         *              work    work item of device which timed out
+ *              work    work item of device which timed out
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_tx_timeout_work(struct work_struct *work)
+static void tlan_tx_timeout_work(struct work_struct *work)
 {
-        TLanPrivateInfo *priv =
+        struct tlan_priv        *priv =
-                container_of(work, TLanPrivateInfo, tlan_tqueue);
+                container_of(work, struct tlan_priv, tlan_tqueue);
-        TLan_tx_timeout(priv->dev);
+        tlan_tx_timeout(priv->dev);
 }
-        /***************************************************************
+/***************************************************************
-         *      TLan_StartTx
+ *      tlan_start_tx
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              0 on success, non-zero on failure.
+ *              0 on success, non-zero on failure.
-         *      Parms:
+ *      Parms:
-         *              skb     A pointer to the sk_buff containing the
+ *              skb     A pointer to the sk_buff containing the
-         *                      frame to be sent.
+ *                      frame to be sent.
-         *              dev     The device to send the data on.
+ *              dev     The device to send the data on.
-         *
+ *
-         *      This function adds a frame to the Tx list to be sent
+ *      This function adds a frame to the Tx list to be sent
-         *      ASAP.  First it verifies that the adapter is ready and
+ *      ASAP.  First it verifies that the adapter is ready and
-         *      there is room in the queue.  Then it sets up the next
+ *      there is room in the queue.  Then it sets up the next
-         *      available list, copies the frame to the corresponding
+ *      available list, copies the frame to the corresponding
-         *      buffer.  If the adapter Tx channel is idle, it gives
+ *      buffer.  If the adapter Tx channel is idle, it gives
-         *      the adapter a Tx Go command on the list, otherwise it
+ *      the adapter a Tx Go command on the list, otherwise it
-         *      sets the forward address of the previous list to point
+ *      sets the forward address of the previous list to point
-         *      to this one.  Then it frees the sk_buff.
+ *      to this one.  Then it frees the sk_buff.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static netdev_tx_t TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
+static netdev_tx_t tlan_start_tx(struct sk_buff *skb, struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        dma_addr_t      tail_list_phys;
-        TLanList        *tail_list;
+        struct tlan_list        *tail_list;
        unsigned long   flags;
        unsigned int    txlen;
-        if ( ! priv->phyOnline ) {
+        if (!priv->phy_online) {
-                TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s PHY is not ready\n",
+                TLAN_DBG(TLAN_DEBUG_TX, "TRANSMIT:  %s PHY is not ready\n",
-                          dev->name );
+                         dev->name);
                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
@@ -1100,218 +1178,214 @@ static netdev_tx_t TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
                return NETDEV_TX_OK;
        txlen = max(skb->len, (unsigned int)TLAN_MIN_FRAME_SIZE);
-        tail_list = priv->txList + priv->txTail;
+        tail_list = priv->tx_list + priv->tx_tail;
-        tail_list_phys = priv->txListDMA + sizeof(TLanList) * priv->txTail;
+        tail_list_phys =
+                priv->tx_list_dma + sizeof(struct tlan_list)*priv->tx_tail;
-        if ( tail_list->cStat != TLAN_CSTAT_UNUSED ) {
+        if (tail_list->c_stat != TLAN_CSTAT_UNUSED) {
-                TLAN_DBG( TLAN_DEBUG_TX,
+                TLAN_DBG(TLAN_DEBUG_TX,
-                          "TRANSMIT:  %s is busy (Head=%d Tail=%d)\n",
+                         "TRANSMIT:  %s is busy (Head=%d Tail=%d)\n",
-                          dev->name, priv->txHead, priv->txTail );
+                         dev->name, priv->tx_head, priv->tx_tail);
                netif_stop_queue(dev);
-                priv->txBusyCount++;
+                priv->tx_busy_count++;
                return NETDEV_TX_BUSY;
        }
        tail_list->forward = 0;
-        tail_list->buffer[0].address = pci_map_single(priv->pciDev,
+        tail_list->buffer[0].address = pci_map_single(priv->pci_dev,
                                                      skb->data, txlen,
                                                      PCI_DMA_TODEVICE);
-        TLan_StoreSKB(tail_list, skb);
+        tlan_store_skb(tail_list, skb);
-        tail_list->frameSize = (u16) txlen;
+        tail_list->frame_size = (u16) txlen;
        tail_list->buffer[0].count = TLAN_LAST_BUFFER | (u32) txlen;
        tail_list->buffer[1].count = 0;
        tail_list->buffer[1].address = 0;
        spin_lock_irqsave(&priv->lock, flags);
-        tail_list->cStat = TLAN_CSTAT_READY;
+        tail_list->c_stat = TLAN_CSTAT_READY;
-        if ( ! priv->txInProgress ) {
+        if (!priv->tx_in_progress) {
-                priv->txInProgress = 1;
+                priv->tx_in_progress = 1;
-                TLAN_DBG( TLAN_DEBUG_TX,
+                TLAN_DBG(TLAN_DEBUG_TX,
-                          "TRANSMIT:  Starting TX on buffer %d\n", priv->txTail );
+                         "TRANSMIT:  Starting TX on buffer %d\n",
-                outl( tail_list_phys, dev->base_addr + TLAN_CH_PARM );
+                         priv->tx_tail);
-                outl( TLAN_HC_GO, dev->base_addr + TLAN_HOST_CMD );
+                outl(tail_list_phys, dev->base_addr + TLAN_CH_PARM);
+                outl(TLAN_HC_GO, dev->base_addr + TLAN_HOST_CMD);
        } else {
-                TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Adding buffer %d to TX channel\n",
+                TLAN_DBG(TLAN_DEBUG_TX,
-                          priv->txTail );
+                         "TRANSMIT:  Adding buffer %d to TX channel\n",
-                if ( priv->txTail == 0 ) {
+                         priv->tx_tail);
-                        ( priv->txList + ( TLAN_NUM_TX_LISTS - 1 ) )->forward
+                if (priv->tx_tail == 0) {
+                        (priv->tx_list + (TLAN_NUM_TX_LISTS - 1))->forward
                                = tail_list_phys;
                } else {
-                        ( priv->txList + ( priv->txTail - 1 ) )->forward
+                        (priv->tx_list + (priv->tx_tail - 1))->forward
                                = tail_list_phys;
                }
        }
        spin_unlock_irqrestore(&priv->lock, flags);
-        CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS );
+        CIRC_INC(priv->tx_tail, TLAN_NUM_TX_LISTS);
        return NETDEV_TX_OK;
-} /* TLan_StartTx */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_HandleInterrupt
+ *      tlan_handle_interrupt
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              irq     The line on which the interrupt
+ *              irq     The line on which the interrupt
-         *                      occurred.
+ *                      occurred.
-         *              dev_id  A pointer to the device assigned to
+ *              dev_id  A pointer to the device assigned to
-         *                      this irq line.
+ *                      this irq line.
-         *
+ *
-         *      This function handles an interrupt generated by its
+ *      This function handles an interrupt generated by its
-         *      assigned TLAN adapter.  The function deactivates
+ *      assigned TLAN adapter.  The function deactivates
-         *      interrupts on its adapter, records the type of
+ *      interrupts on its adapter, records the type of
-         *      interrupt, executes the appropriate subhandler, and
+ *      interrupt, executes the appropriate subhandler, and
-         *      acknowdges the interrupt to the adapter (thus
+ *      acknowdges the interrupt to the adapter (thus
-         *      re-enabling adapter interrupts.
+ *      re-enabling adapter interrupts.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static irqreturn_t TLan_HandleInterrupt(int irq, void *dev_id)
+static irqreturn_t tlan_handle_interrupt(int irq, void *dev_id)
 {
        struct net_device       *dev = dev_id;
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        u16             host_int;
        u16             type;
        spin_lock(&priv->lock);
-        host_int = inw( dev->base_addr + TLAN_HOST_INT );
+        host_int = inw(dev->base_addr + TLAN_HOST_INT);
-        type = ( host_int & TLAN_HI_IT_MASK ) >> 2;
+        type = (host_int & TLAN_HI_IT_MASK) >> 2;
-        if ( type ) {
+        if (type) {
                u32     ack;
                u32     host_cmd;
-                outw( host_int, dev->base_addr + TLAN_HOST_INT );
+                outw(host_int, dev->base_addr + TLAN_HOST_INT);
-                ack = TLanIntVector[type]( dev, host_int );
+                ack = tlan_int_vector[type](dev, host_int);
-                if ( ack ) {
+                if (ack) {
-                        host_cmd = TLAN_HC_ACK | ack | ( type << 18 );
+                        host_cmd = TLAN_HC_ACK | ack | (type << 18);
-                        outl( host_cmd, dev->base_addr + TLAN_HOST_CMD );
+                        outl(host_cmd, dev->base_addr + TLAN_HOST_CMD);
                }
        }
        spin_unlock(&priv->lock);
        return IRQ_RETVAL(type);
-} /* TLan_HandleInterrupts */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_Close
+ *      tlan_close
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              An error code.
+ *              An error code.
-         *      Parms:
+ *      Parms:
-         *              dev     The device structure of the device to
+ *              dev     The device structure of the device to
-         *                      close.
+ *                      close.
-         *
+ *
-         *      This function shuts down the adapter.  It records any
+ *      This function shuts down the adapter.  It records any
-         *      stats, puts the adapter into reset state, deactivates
+ *      stats, puts the adapter into reset state, deactivates
-         *      its time as needed, and frees the irq it is using.
+ *      its time as needed, and frees the irq it is using.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static int TLan_Close(struct net_device *dev)
+static int tlan_close(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
-        netif_stop_queue(dev);
        priv->neg_be_verbose = 0;
+        tlan_stop(dev);
-        TLan_ReadAndClearStats( dev, TLAN_RECORD );
+        free_irq(dev->irq, dev);
-        outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD );
+        tlan_free_lists(dev);
-        if ( priv->timer.function != NULL ) {
+        TLAN_DBG(TLAN_DEBUG_GNRL, "Device %s closed.\n", dev->name);
-                del_timer_sync( &priv->timer );
-                priv->timer.function = NULL;
-        }
-        free_irq( dev->irq, dev );
-        TLan_FreeLists( dev );
-        TLAN_DBG( TLAN_DEBUG_GNRL, "Device %s closed.\n", dev->name );
        return 0;
-} /* TLan_Close */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_GetStats
+ *      tlan_get_stats
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              A pointer to the device's statistics structure.
+ *              A pointer to the device's statistics structure.
-         *      Parms:
+ *      Parms:
-         *              dev     The device structure to return the
+ *              dev     The device structure to return the
-         *                      stats for.
+ *                      stats for.
-         *
+ *
-         *      This function updates the devices statistics by reading
+ *      This function updates the devices statistics by reading
-         *      the TLAN chip's onboard registers.  Then it returns the
+ *      the TLAN chip's onboard registers.  Then it returns the
-         *      address of the statistics structure.
+ *      address of the statistics structure.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static struct net_device_stats *TLan_GetStats( struct net_device *dev )
+static struct net_device_stats *tlan_get_stats(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        int i;
        /* Should only read stats if open ? */
-        TLan_ReadAndClearStats( dev, TLAN_RECORD );
+        tlan_read_and_clear_stats(dev, TLAN_RECORD);
-        TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  %s EOC count = %d\n", dev->name,
+        TLAN_DBG(TLAN_DEBUG_RX, "RECEIVE:  %s EOC count = %d\n", dev->name,
-                  priv->rxEocCount );
+                 priv->rx_eoc_count);
-        TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s Busy count = %d\n", dev->name,
+        TLAN_DBG(TLAN_DEBUG_TX, "TRANSMIT:  %s Busy count = %d\n", dev->name,
-                  priv->txBusyCount );
+                 priv->tx_busy_count);
-        if ( debug & TLAN_DEBUG_GNRL ) {
+        if (debug & TLAN_DEBUG_GNRL) {
-                TLan_PrintDio( dev->base_addr );
+                tlan_print_dio(dev->base_addr);
-                TLan_PhyPrint( dev );
+                tlan_phy_print(dev);
        }
-        if ( debug & TLAN_DEBUG_LIST ) {
+        if (debug & TLAN_DEBUG_LIST) {
-                for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ )
+                for (i = 0; i < TLAN_NUM_RX_LISTS; i++)
-                        TLan_PrintList( priv->rxList + i, "RX", i );
+                        tlan_print_list(priv->rx_list + i, "RX", i);
-                for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ )
+                for (i = 0; i < TLAN_NUM_TX_LISTS; i++)
-                        TLan_PrintList( priv->txList + i, "TX", i );
+                        tlan_print_list(priv->tx_list + i, "TX", i);
        }
        return &dev->stats;
-} /* TLan_GetStats */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_SetMulticastList
+ *      tlan_set_multicast_list
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              dev     The device structure to set the
+ *              dev     The device structure to set the
-         *                      multicast list for.
+ *                      multicast list for.
-         *
+ *
-         *      This function sets the TLAN adaptor to various receive
+ *      This function sets the TLAN adaptor to various receive
-         *      modes.  If the IFF_PROMISC flag is set, promiscuous
+ *      modes.  If the IFF_PROMISC flag is set, promiscuous
-         *      mode is acitviated.  Otherwise, promiscuous mode is
+ *      mode is acitviated.  Otherwise, promiscuous mode is
-         *      turned off.  If the IFF_ALLMULTI flag is set, then
+ *      turned off.  If the IFF_ALLMULTI flag is set, then
-         *      the hash table is set to receive all group addresses.
+ *      the hash table is set to receive all group addresses.
-         *      Otherwise, the first three multicast addresses are
+ *      Otherwise, the first three multicast addresses are
-         *      stored in AREG_1-3, and the rest are selected via the
+ *      stored in AREG_1-3, and the rest are selected via the
-         *      hash table, as necessary.
+ *      hash table, as necessary.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_SetMulticastList( struct net_device *dev )
+static void tlan_set_multicast_list(struct net_device *dev)
 {
        struct netdev_hw_addr *ha;
        u32                     hash1 = 0;
@@ -1320,53 +1394,56 @@ static void TLan_SetMulticastList( struct net_device *dev )
        u32                     offset;
        u8                      tmp;
-        if ( dev->flags & IFF_PROMISC ) {
+        if (dev->flags & IFF_PROMISC) {
-                tmp = TLan_DioRead8( dev->base_addr, TLAN_NET_CMD );
+                tmp = tlan_dio_read8(dev->base_addr, TLAN_NET_CMD);
-                TLan_DioWrite8( dev->base_addr,
+                tlan_dio_write8(dev->base_addr,
-                                TLAN_NET_CMD, tmp | TLAN_NET_CMD_CAF );
+                                TLAN_NET_CMD, tmp | TLAN_NET_CMD_CAF);
        } else {
-                tmp = TLan_DioRead8( dev->base_addr, TLAN_NET_CMD );
+                tmp = tlan_dio_read8(dev->base_addr, TLAN_NET_CMD);
-                TLan_DioWrite8( dev->base_addr,
+                tlan_dio_write8(dev->base_addr,
-                                TLAN_NET_CMD, tmp & ~TLAN_NET_CMD_CAF );
+                                TLAN_NET_CMD, tmp & ~TLAN_NET_CMD_CAF);
-                if ( dev->flags & IFF_ALLMULTI ) {
+                if (dev->flags & IFF_ALLMULTI) {
-                        for ( i = 0; i < 3; i++ )
+                        for (i = 0; i < 3; i++)
-                                TLan_SetMac( dev, i + 1, NULL );
+                                tlan_set_mac(dev, i + 1, NULL);
-                        TLan_DioWrite32( dev->base_addr, TLAN_HASH_1, 0xFFFFFFFF );
+                        tlan_dio_write32(dev->base_addr, TLAN_HASH_1,
-                        TLan_DioWrite32( dev->base_addr, TLAN_HASH_2, 0xFFFFFFFF );
+                                         0xffffffff);
+                        tlan_dio_write32(dev->base_addr, TLAN_HASH_2,
+                                         0xffffffff);
                } else {
                        i = 0;
                        netdev_for_each_mc_addr(ha, dev) {
-                                if ( i < 3 ) {
+                                if (i < 3) {
-                                        TLan_SetMac( dev, i + 1,
+                                        tlan_set_mac(dev, i + 1,
                                                     (char *) &ha->addr);
                                } else {
-                                        offset = TLan_HashFunc((u8 *)&ha->addr);
+                                        offset =
-                                        if ( offset < 32 )
+                                                tlan_hash_func((u8 *)&ha->addr);
-                                                hash1 |= ( 1 << offset );
+                                        if (offset < 32)
+                                                hash1 |= (1 << offset);
                                        else
-                                                hash2 |= ( 1 << ( offset - 32 ) );
+                                                hash2 |= (1 << (offset - 32));
                                }
                                i++;
                        }
-                        for ( ; i < 3; i++ )
+                        for ( ; i < 3; i++)
-                                TLan_SetMac( dev, i + 1, NULL );
+                                tlan_set_mac(dev, i + 1, NULL);
-                        TLan_DioWrite32( dev->base_addr, TLAN_HASH_1, hash1 );
+                        tlan_dio_write32(dev->base_addr, TLAN_HASH_1, hash1);
-                        TLan_DioWrite32( dev->base_addr, TLAN_HASH_2, hash2 );
+                        tlan_dio_write32(dev->base_addr, TLAN_HASH_2, hash2);
                }
        }
-} /* TLan_SetMulticastList */
+}
 /*****************************************************************************
 ******************************************************************************
-        ThunderLAN Driver Interrupt Vectors and Table
+ThunderLAN driver interrupt vectors and table
-        Please see Chap. 4, "Interrupt Handling" of the "ThunderLAN
+please see chap. 4, "Interrupt Handling" of the "ThunderLAN
-        Programmer's Guide" for more informations on handling interrupts
+Programmer's Guide" for more informations on handling interrupts
-        generated by TLAN based adapters.
+generated by TLAN based adapters.
 ******************************************************************************
 *****************************************************************************/
@@ -1374,46 +1451,48 @@ static void TLan_SetMulticastList( struct net_device *dev )
-        /***************************************************************
+/***************************************************************
-         *      TLan_HandleTxEOF
+ *      tlan_handle_tx_eof
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              1
+ *              1
-         *      Parms:
+ *      Parms:
-         *              dev             Device assigned the IRQ that was
+ *              dev             Device assigned the IRQ that was
-         *                              raised.
+ *                              raised.
-         *              host_int        The contents of the HOST_INT
+ *              host_int        The contents of the HOST_INT
-         *                              port.
+ *                              port.
-         *
+ *
-         *      This function handles Tx EOF interrupts which are raised
+ *      This function handles Tx EOF interrupts which are raised
-         *      by the adapter when it has completed sending the
+ *      by the adapter when it has completed sending the
-         *      contents of a buffer.  If detemines which list/buffer
+ *      contents of a buffer.  If detemines which list/buffer
-         *      was completed and resets it.  If the buffer was the last
+ *      was completed and resets it.  If the buffer was the last
-         *      in the channel (EOC), then the function checks to see if
+ *      in the channel (EOC), then the function checks to see if
-         *      another buffer is ready to send, and if so, sends a Tx
+ *      another buffer is ready to send, and if so, sends a Tx
-         *      Go command.  Finally, the driver activates/continues the
+ *      Go command.  Finally, the driver activates/continues the
-         *      activity LED.
+ *      activity LED.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_tx_eof(struct net_device *dev, u16 host_int)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        int             eoc = 0;
-        TLanList        *head_list;
+        struct tlan_list        *head_list;
        dma_addr_t      head_list_phys;
        u32             ack = 0;
-        u16             tmpCStat;
+        u16             tmp_c_stat;
-        TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Handling TX EOF (Head=%d Tail=%d)\n",
+        TLAN_DBG(TLAN_DEBUG_TX,
-                  priv->txHead, priv->txTail );
+                 "TRANSMIT:  Handling TX EOF (Head=%d Tail=%d)\n",
-        head_list = priv->txList + priv->txHead;
+                 priv->tx_head, priv->tx_tail);
+        head_list = priv->tx_list + priv->tx_head;
-        while (((tmpCStat = head_list->cStat ) & TLAN_CSTAT_FRM_CMP) && (ack < 255)) {
+        while (((tmp_c_stat = head_list->c_stat) & TLAN_CSTAT_FRM_CMP)
-                struct sk_buff *skb = TLan_GetSKB(head_list);
+               && (ack < 255)) {
+                struct sk_buff *skb = tlan_get_skb(head_list);
                ack++;
-                pci_unmap_single(priv->pciDev, head_list->buffer[0].address,
+                pci_unmap_single(priv->pci_dev, head_list->buffer[0].address,
                                 max(skb->len,
                                     (unsigned int)TLAN_MIN_FRAME_SIZE),
                                 PCI_DMA_TODEVICE);
@@ -1421,304 +1500,313 @@ static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
                head_list->buffer[8].address = 0;
                head_list->buffer[9].address = 0;
-                if ( tmpCStat & TLAN_CSTAT_EOC )
+                if (tmp_c_stat & TLAN_CSTAT_EOC)
                        eoc = 1;
-                dev->stats.tx_bytes += head_list->frameSize;
+                dev->stats.tx_bytes += head_list->frame_size;
-                head_list->cStat = TLAN_CSTAT_UNUSED;
+                head_list->c_stat = TLAN_CSTAT_UNUSED;
                netif_start_queue(dev);
-                CIRC_INC( priv->txHead, TLAN_NUM_TX_LISTS );
+                CIRC_INC(priv->tx_head, TLAN_NUM_TX_LISTS);
-                head_list = priv->txList + priv->txHead;
+                head_list = priv->tx_list + priv->tx_head;
        }
        if (!ack)
-                printk(KERN_INFO "TLAN: Received interrupt for uncompleted TX frame.\n");
+                printk(KERN_INFO
+                       "TLAN: Received interrupt for uncompleted TX frame.\n");
-        if ( eoc ) {
-                TLAN_DBG( TLAN_DEBUG_TX,
+        if (eoc) {
-                          "TRANSMIT:  Handling TX EOC (Head=%d Tail=%d)\n",
+                TLAN_DBG(TLAN_DEBUG_TX,
-                          priv->txHead, priv->txTail );
+                         "TRANSMIT:  handling TX EOC (Head=%d Tail=%d)\n",
-                head_list = priv->txList + priv->txHead;
+                         priv->tx_head, priv->tx_tail);
-                head_list_phys = priv->txListDMA + sizeof(TLanList) * priv->txHead;
+                head_list = priv->tx_list + priv->tx_head;
-                if ( ( head_list->cStat & TLAN_CSTAT_READY ) == TLAN_CSTAT_READY ) {
+                head_list_phys = priv->tx_list_dma
-                        outl(head_list_phys, dev->base_addr + TLAN_CH_PARM );
+                        + sizeof(struct tlan_list)*priv->tx_head;
+                if ((head_list->c_stat & TLAN_CSTAT_READY)
+                    == TLAN_CSTAT_READY) {
+                        outl(head_list_phys, dev->base_addr + TLAN_CH_PARM);
                        ack |= TLAN_HC_GO;
                } else {
-                        priv->txInProgress = 0;
+                        priv->tx_in_progress = 0;
                }
        }
-        if ( priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED ) {
+        if (priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED) {
-                TLan_DioWrite8( dev->base_addr,
+                tlan_dio_write8(dev->base_addr,
-                                TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
+                                TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT);
-                if ( priv->timer.function == NULL ) {
+                if (priv->timer.function == NULL) {
-                         priv->timer.function = TLan_Timer;
+                        priv->timer.function = tlan_timer;
-                         priv->timer.data = (unsigned long) dev;
+                        priv->timer.data = (unsigned long) dev;
-                         priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
+                        priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
-                         priv->timerSetAt = jiffies;
+                        priv->timer_set_at = jiffies;
-                         priv->timerType = TLAN_TIMER_ACTIVITY;
+                        priv->timer_type = TLAN_TIMER_ACTIVITY;
-                         add_timer(&priv->timer);
+                        add_timer(&priv->timer);
-                } else if ( priv->timerType == TLAN_TIMER_ACTIVITY ) {
+                } else if (priv->timer_type == TLAN_TIMER_ACTIVITY) {
-                        priv->timerSetAt = jiffies;
+                        priv->timer_set_at = jiffies;
                }
        }
        return ack;
-} /* TLan_HandleTxEOF */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_HandleStatOverflow
+ *      TLan_HandleStatOverflow
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              1
+ *              1
-         *      Parms:
+ *      Parms:
-         *              dev             Device assigned the IRQ that was
+ *              dev             Device assigned the IRQ that was
-         *                              raised.
+ *                              raised.
-         *              host_int        The contents of the HOST_INT
+ *              host_int        The contents of the HOST_INT
-         *                              port.
+ *                              port.
-         *
+ *
-         *      This function handles the Statistics Overflow interrupt
+ *      This function handles the Statistics Overflow interrupt
-         *      which means that one or more of the TLAN statistics
+ *      which means that one or more of the TLAN statistics
-         *      registers has reached 1/2 capacity and needs to be read.
+ *      registers has reached 1/2 capacity and needs to be read.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static u32 TLan_HandleStatOverflow( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_stat_overflow(struct net_device *dev, u16 host_int)
 {
-        TLan_ReadAndClearStats( dev, TLAN_RECORD );
+        tlan_read_and_clear_stats(dev, TLAN_RECORD);
        return 1;
-} /* TLan_HandleStatOverflow */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_HandleRxEOF
+ *      TLan_HandleRxEOF
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              1
+ *              1
-         *      Parms:
+ *      Parms:
-         *              dev             Device assigned the IRQ that was
+ *              dev             Device assigned the IRQ that was
-         *                              raised.
+ *                              raised.
-         *              host_int        The contents of the HOST_INT
+ *              host_int        The contents of the HOST_INT
-         *                              port.
+ *                              port.
-         *
+ *
-         *      This function handles the Rx EOF interrupt which
+ *      This function handles the Rx EOF interrupt which
-         *      indicates a frame has been received by the adapter from
+ *      indicates a frame has been received by the adapter from
-         *      the net and the frame has been transferred to memory.
+ *      the net and the frame has been transferred to memory.
-         *      The function determines the bounce buffer the frame has
+ *      The function determines the bounce buffer the frame has
-         *      been loaded into, creates a new sk_buff big enough to
+ *      been loaded into, creates a new sk_buff big enough to
-         *      hold the frame, and sends it to protocol stack.  It
+ *      hold the frame, and sends it to protocol stack.  It
-         *      then resets the used buffer and appends it to the end
+ *      then resets the used buffer and appends it to the end
-         *      of the list.  If the frame was the last in the Rx
+ *      of the list.  If the frame was the last in the Rx
-         *      channel (EOC), the function restarts the receive channel
+ *      channel (EOC), the function restarts the receive channel
-         *      by sending an Rx Go command to the adapter.  Then it
+ *      by sending an Rx Go command to the adapter.  Then it
-         *      activates/continues the activity LED.
+ *      activates/continues the activity LED.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static u32 TLan_HandleRxEOF( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_rx_eof(struct net_device *dev, u16 host_int)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        u32             ack = 0;
        int             eoc = 0;
-        TLanList        *head_list;
+        struct tlan_list        *head_list;
        struct sk_buff  *skb;
-        TLanList        *tail_list;
+        struct tlan_list        *tail_list;
-        u16             tmpCStat;
+        u16             tmp_c_stat;
        dma_addr_t      head_list_phys;
-        TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  Handling RX EOF (Head=%d Tail=%d)\n",
+        TLAN_DBG(TLAN_DEBUG_RX, "RECEIVE:  handling RX EOF (Head=%d Tail=%d)\n",
-                  priv->rxHead, priv->rxTail );
+                 priv->rx_head, priv->rx_tail);
-        head_list = priv->rxList + priv->rxHead;
+        head_list = priv->rx_list + priv->rx_head;
-        head_list_phys = priv->rxListDMA + sizeof(TLanList) * priv->rxHead;
+        head_list_phys =
+                priv->rx_list_dma + sizeof(struct tlan_list)*priv->rx_head;
-        while (((tmpCStat = head_list->cStat) & TLAN_CSTAT_FRM_CMP) && (ack < 255)) {
+        while (((tmp_c_stat = head_list->c_stat) & TLAN_CSTAT_FRM_CMP)
-                dma_addr_t frameDma = head_list->buffer[0].address;
+               && (ack < 255)) {
-                u32 frameSize = head_list->frameSize;
+                dma_addr_t frame_dma = head_list->buffer[0].address;
+                u32 frame_size = head_list->frame_size;
                struct sk_buff *new_skb;
                ack++;
-                if (tmpCStat & TLAN_CSTAT_EOC)
+                if (tmp_c_stat & TLAN_CSTAT_EOC)
                        eoc = 1;
                new_skb = netdev_alloc_skb_ip_align(dev,
                                                    TLAN_MAX_FRAME_SIZE + 5);
-                if ( !new_skb )
+                if (!new_skb)
                        goto drop_and_reuse;
-                skb = TLan_GetSKB(head_list);
+                skb = tlan_get_skb(head_list);
-                pci_unmap_single(priv->pciDev, frameDma,
+                pci_unmap_single(priv->pci_dev, frame_dma,
                                 TLAN_MAX_FRAME_SIZE, PCI_DMA_FROMDEVICE);
-                skb_put( skb, frameSize );
+                skb_put(skb, frame_size);
-                dev->stats.rx_bytes += frameSize;
+                dev->stats.rx_bytes += frame_size;
-                skb->protocol = eth_type_trans( skb, dev );
+                skb->protocol = eth_type_trans(skb, dev);
-                netif_rx( skb );
+                netif_rx(skb);
-                head_list->buffer[0].address = pci_map_single(priv->pciDev,
+                head_list->buffer[0].address =
-                                                              new_skb->data,
+                        pci_map_single(priv->pci_dev, new_skb->data,
-                                                              TLAN_MAX_FRAME_SIZE,
+                                       TLAN_MAX_FRAME_SIZE, PCI_DMA_FROMDEVICE);
-                                                              PCI_DMA_FROMDEVICE);
-                TLan_StoreSKB(head_list, new_skb);
+                tlan_store_skb(head_list, new_skb);
 drop_and_reuse:
                head_list->forward = 0;
-                head_list->cStat = 0;
+                head_list->c_stat = 0;
-                tail_list = priv->rxList + priv->rxTail;
+                tail_list = priv->rx_list + priv->rx_tail;
                tail_list->forward = head_list_phys;
-                CIRC_INC( priv->rxHead, TLAN_NUM_RX_LISTS );
+                CIRC_INC(priv->rx_head, TLAN_NUM_RX_LISTS);
-                CIRC_INC( priv->rxTail, TLAN_NUM_RX_LISTS );
+                CIRC_INC(priv->rx_tail, TLAN_NUM_RX_LISTS);
-                head_list = priv->rxList + priv->rxHead;
+                head_list = priv->rx_list + priv->rx_head;
-                head_list_phys = priv->rxListDMA + sizeof(TLanList) * priv->rxHead;
+                head_list_phys = priv->rx_list_dma
+                        + sizeof(struct tlan_list)*priv->rx_head;
        }
        if (!ack)
-                printk(KERN_INFO "TLAN: Received interrupt for uncompleted RX frame.\n");
+                printk(KERN_INFO
+                       "TLAN: Received interrupt for uncompleted RX frame.\n");
-        if ( eoc ) {
-                TLAN_DBG( TLAN_DEBUG_RX,
+        if (eoc) {
-                          "RECEIVE:  Handling RX EOC (Head=%d Tail=%d)\n",
+                TLAN_DBG(TLAN_DEBUG_RX,
-                          priv->rxHead, priv->rxTail );
+                         "RECEIVE:  handling RX EOC (Head=%d Tail=%d)\n",
-                head_list = priv->rxList + priv->rxHead;
+                         priv->rx_head, priv->rx_tail);
-                head_list_phys = priv->rxListDMA + sizeof(TLanList) * priv->rxHead;
+                head_list = priv->rx_list + priv->rx_head;
-                outl(head_list_phys, dev->base_addr + TLAN_CH_PARM );
+                head_list_phys = priv->rx_list_dma
+                        + sizeof(struct tlan_list)*priv->rx_head;
+                outl(head_list_phys, dev->base_addr + TLAN_CH_PARM);
                ack |= TLAN_HC_GO | TLAN_HC_RT;
-                priv->rxEocCount++;
+                priv->rx_eoc_count++;
        }
-        if ( priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED ) {
+        if (priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED) {
-                TLan_DioWrite8( dev->base_addr,
+                tlan_dio_write8(dev->base_addr,
-                                TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
+                                TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT);
-                if ( priv->timer.function == NULL )  {
+                if (priv->timer.function == NULL)  {
-                        priv->timer.function = TLan_Timer;
+                        priv->timer.function = tlan_timer;
                        priv->timer.data = (unsigned long) dev;
                        priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
-                        priv->timerSetAt = jiffies;
+                        priv->timer_set_at = jiffies;
-                        priv->timerType = TLAN_TIMER_ACTIVITY;
+                        priv->timer_type = TLAN_TIMER_ACTIVITY;
                        add_timer(&priv->timer);
-                } else if ( priv->timerType == TLAN_TIMER_ACTIVITY ) {
+                } else if (priv->timer_type == TLAN_TIMER_ACTIVITY) {
-                        priv->timerSetAt = jiffies;
+                        priv->timer_set_at = jiffies;
                }
        }
        return ack;
-} /* TLan_HandleRxEOF */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_HandleDummy
+ *      tlan_handle_dummy
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              1
+ *              1
-         *      Parms:
+ *      Parms:
-         *              dev             Device assigned the IRQ that was
+ *              dev             Device assigned the IRQ that was
-         *                              raised.
+ *                              raised.
-         *              host_int        The contents of the HOST_INT
+ *              host_int        The contents of the HOST_INT
-         *                              port.
+ *                              port.
-         *
+ *
-         *      This function handles the Dummy interrupt, which is
+ *      This function handles the Dummy interrupt, which is
-         *      raised whenever a test interrupt is generated by setting
+ *      raised whenever a test interrupt is generated by setting
-         *      the Req_Int bit of HOST_CMD to 1.
+ *      the Req_Int bit of HOST_CMD to 1.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static u32 TLan_HandleDummy( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_dummy(struct net_device *dev, u16 host_int)
 {
-        printk( "TLAN:  Test interrupt on %s.\n", dev->name );
+        pr_info("TLAN:  Test interrupt on %s.\n", dev->name);
        return 1;
-} /* TLan_HandleDummy */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_HandleTxEOC
+ *      tlan_handle_tx_eoc
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              1
+ *              1
-         *      Parms:
+ *      Parms:
-         *              dev             Device assigned the IRQ that was
+ *              dev             Device assigned the IRQ that was
-         *                              raised.
+ *                              raised.
-         *              host_int        The contents of the HOST_INT
+ *              host_int        The contents of the HOST_INT
-         *                              port.
+ *                              port.
-         *
+ *
-         *      This driver is structured to determine EOC occurrences by
+ *      This driver is structured to determine EOC occurrences by
-         *      reading the CSTAT member of the list structure.  Tx EOC
+ *      reading the CSTAT member of the list structure.  Tx EOC
-         *      interrupts are disabled via the DIO INTDIS register.
+ *      interrupts are disabled via the DIO INTDIS register.
-         *      However, TLAN chips before revision 3.0 didn't have this
+ *      However, TLAN chips before revision 3.0 didn't have this
-         *      functionality, so process EOC events if this is the
+ *      functionality, so process EOC events if this is the
-         *      case.
+ *      case.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static u32 TLan_HandleTxEOC( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_tx_eoc(struct net_device *dev, u16 host_int)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
-        TLanList                *head_list;
+        struct tlan_list                *head_list;
        dma_addr_t              head_list_phys;
        u32                     ack = 1;
        host_int = 0;
-        if ( priv->tlanRev < 0x30 ) {
+        if (priv->tlan_rev < 0x30) {
-                TLAN_DBG( TLAN_DEBUG_TX,
+                TLAN_DBG(TLAN_DEBUG_TX,
-                          "TRANSMIT:  Handling TX EOC (Head=%d Tail=%d) -- IRQ\n",
+                         "TRANSMIT:  handling TX EOC (Head=%d Tail=%d) -- IRQ\n",
-                          priv->txHead, priv->txTail );
+                         priv->tx_head, priv->tx_tail);
-                head_list = priv->txList + priv->txHead;
+                head_list = priv->tx_list + priv->tx_head;
-                head_list_phys = priv->txListDMA + sizeof(TLanList) * priv->txHead;
+                head_list_phys = priv->tx_list_dma
-                if ( ( head_list->cStat & TLAN_CSTAT_READY ) == TLAN_CSTAT_READY ) {
+                        + sizeof(struct tlan_list)*priv->tx_head;
+                if ((head_list->c_stat & TLAN_CSTAT_READY)
+                    == TLAN_CSTAT_READY) {
                        netif_stop_queue(dev);
-                        outl( head_list_phys, dev->base_addr + TLAN_CH_PARM );
+                        outl(head_list_phys, dev->base_addr + TLAN_CH_PARM);
                        ack |= TLAN_HC_GO;
                } else {
-                        priv->txInProgress = 0;
+                        priv->tx_in_progress = 0;
                }
        }
        return ack;
-} /* TLan_HandleTxEOC */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_HandleStatusCheck
+ *      tlan_handle_status_check
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              0 if Adapter check, 1 if Network Status check.
+ *              0 if Adapter check, 1 if Network Status check.
-         *      Parms:
+ *      Parms:
-         *              dev             Device assigned the IRQ that was
+ *              dev             Device assigned the IRQ that was
-         *                              raised.
+ *                              raised.
-         *              host_int        The contents of the HOST_INT
+ *              host_int        The contents of the HOST_INT
-         *                              port.
+ *                              port.
-         *
+ *
-         *      This function handles Adapter Check/Network Status
+ *      This function handles Adapter Check/Network Status
-         *      interrupts generated by the adapter.  It checks the
+ *      interrupts generated by the adapter.  It checks the
-         *      vector in the HOST_INT register to determine if it is
+ *      vector in the HOST_INT register to determine if it is
-         *      an Adapter Check interrupt.  If so, it resets the
+ *      an Adapter Check interrupt.  If so, it resets the
-         *      adapter.  Otherwise it clears the status registers
+ *      adapter.  Otherwise it clears the status registers
-         *      and services the PHY.
+ *      and services the PHY.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_status_check(struct net_device *dev, u16 host_int)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        u32             ack;
        u32             error;
        u8              net_sts;
@@ -1727,92 +1815,94 @@ static u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int )
        u16             tlphy_sts;
        ack = 1;
-        if ( host_int & TLAN_HI_IV_MASK ) {
+        if (host_int & TLAN_HI_IV_MASK) {
-                netif_stop_queue( dev );
+                netif_stop_queue(dev);
-                error = inl( dev->base_addr + TLAN_CH_PARM );
+                error = inl(dev->base_addr + TLAN_CH_PARM);
-                printk( "TLAN:  %s: Adaptor Error = 0x%x\n", dev->name, error );
+                pr_info("TLAN:  %s: Adaptor Error = 0x%x\n", dev->name, error);
-                TLan_ReadAndClearStats( dev, TLAN_RECORD );
+                tlan_read_and_clear_stats(dev, TLAN_RECORD);
-                outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD );
+                outl(TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD);
                schedule_work(&priv->tlan_tqueue);
                netif_wake_queue(dev);
                ack = 0;
        } else {
-                TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Status Check\n", dev->name );
+                TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Status Check\n", dev->name);
-                phy = priv->phy[priv->phyNum];
+                phy = priv->phy[priv->phy_num];
-                net_sts = TLan_DioRead8( dev->base_addr, TLAN_NET_STS );
+                net_sts = tlan_dio_read8(dev->base_addr, TLAN_NET_STS);
-                if ( net_sts ) {
+                if (net_sts) {
-                        TLan_DioWrite8( dev->base_addr, TLAN_NET_STS, net_sts );
+                        tlan_dio_write8(dev->base_addr, TLAN_NET_STS, net_sts);
-                        TLAN_DBG( TLAN_DEBUG_GNRL, "%s:    Net_Sts = %x\n",
+                        TLAN_DBG(TLAN_DEBUG_GNRL, "%s:    Net_Sts = %x\n",
-                                  dev->name, (unsigned) net_sts );
+                                 dev->name, (unsigned) net_sts);
                }
-                if ( ( net_sts & TLAN_NET_STS_MIRQ ) &&  ( priv->phyNum == 0 ) ) {
+                if ((net_sts & TLAN_NET_STS_MIRQ) &&  (priv->phy_num == 0)) {
-                        TLan_MiiReadReg( dev, phy, TLAN_TLPHY_STS, &tlphy_sts );
+                        tlan_mii_read_reg(dev, phy, TLAN_TLPHY_STS, &tlphy_sts);
-                        TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl );
+                        tlan_mii_read_reg(dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl);
-                        if ( ! ( tlphy_sts & TLAN_TS_POLOK ) &&
+                        if (!(tlphy_sts & TLAN_TS_POLOK) &&
-                             ! ( tlphy_ctl & TLAN_TC_SWAPOL ) ) {
+                            !(tlphy_ctl & TLAN_TC_SWAPOL)) {
-                                tlphy_ctl |= TLAN_TC_SWAPOL;
+                                tlphy_ctl |= TLAN_TC_SWAPOL;
-                                TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl);
+                                tlan_mii_write_reg(dev, phy, TLAN_TLPHY_CTL,
-                        } else if ( ( tlphy_sts & TLAN_TS_POLOK ) &&
+                                                   tlphy_ctl);
-                                    ( tlphy_ctl & TLAN_TC_SWAPOL ) ) {
+                        } else if ((tlphy_sts & TLAN_TS_POLOK) &&
-                                tlphy_ctl &= ~TLAN_TC_SWAPOL;
+                                   (tlphy_ctl & TLAN_TC_SWAPOL)) {
-                                TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl);
+                                tlphy_ctl &= ~TLAN_TC_SWAPOL;
-                        }
+                                tlan_mii_write_reg(dev, phy, TLAN_TLPHY_CTL,
+                                                   tlphy_ctl);
-                        if (debug) {
-                                TLan_PhyPrint( dev );
                        }
+                        if (debug)
+                                tlan_phy_print(dev);
                }
        }
        return ack;
-} /* TLan_HandleStatusCheck */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_HandleRxEOC
+ *      tlan_handle_rx_eoc
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              1
+ *              1
-         *      Parms:
+ *      Parms:
-         *              dev             Device assigned the IRQ that was
+ *              dev             Device assigned the IRQ that was
-         *                              raised.
+ *                              raised.
-         *              host_int        The contents of the HOST_INT
+ *              host_int        The contents of the HOST_INT
-         *                              port.
+ *                              port.
-         *
+ *
-         *      This driver is structured to determine EOC occurrences by
+ *      This driver is structured to determine EOC occurrences by
-         *      reading the CSTAT member of the list structure.  Rx EOC
+ *      reading the CSTAT member of the list structure.  Rx EOC
-         *      interrupts are disabled via the DIO INTDIS register.
+ *      interrupts are disabled via the DIO INTDIS register.
-         *      However, TLAN chips before revision 3.0 didn't have this
+ *      However, TLAN chips before revision 3.0 didn't have this
-         *      CSTAT member or a INTDIS register, so if this chip is
+ *      CSTAT member or a INTDIS register, so if this chip is
-         *      pre-3.0, process EOC interrupts normally.
+ *      pre-3.0, process EOC interrupts normally.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static u32 TLan_HandleRxEOC( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_rx_eoc(struct net_device *dev, u16 host_int)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        dma_addr_t      head_list_phys;
        u32             ack = 1;
-        if (  priv->tlanRev < 0x30 ) {
+        if (priv->tlan_rev < 0x30) {
-                TLAN_DBG( TLAN_DEBUG_RX,
+                TLAN_DBG(TLAN_DEBUG_RX,
-                          "RECEIVE:  Handling RX EOC (Head=%d Tail=%d) -- IRQ\n",
+                         "RECEIVE:  Handling RX EOC (head=%d tail=%d) -- IRQ\n",
-                          priv->rxHead, priv->rxTail );
+                         priv->rx_head, priv->rx_tail);
-                head_list_phys = priv->rxListDMA + sizeof(TLanList) * priv->rxHead;
+                head_list_phys = priv->rx_list_dma
-                outl( head_list_phys, dev->base_addr + TLAN_CH_PARM );
+                        + sizeof(struct tlan_list)*priv->rx_head;
+                outl(head_list_phys, dev->base_addr + TLAN_CH_PARM);
                ack |= TLAN_HC_GO | TLAN_HC_RT;
-                priv->rxEocCount++;
+                priv->rx_eoc_count++;
        }
        return ack;
-} /* TLan_HandleRxEOC */
+}
@@ -1820,98 +1910,98 @@ static u32 TLan_HandleRxEOC( struct net_device *dev, u16 host_int )
 /*****************************************************************************
 ******************************************************************************
-        ThunderLAN Driver Timer Function
+ThunderLAN driver timer function
 ******************************************************************************
 *****************************************************************************/
-        /***************************************************************
+/***************************************************************
-         *      TLan_Timer
+ *      tlan_timer
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              data    A value given to add timer when
+ *              data    A value given to add timer when
-         *                      add_timer was called.
+ *                      add_timer was called.
-         *
+ *
-         *      This function handles timed functionality for the
+ *      This function handles timed functionality for the
-         *      TLAN driver.  The two current timer uses are for
+ *      TLAN driver.  The two current timer uses are for
-         *      delaying for autonegotionation and driving the ACT LED.
+ *      delaying for autonegotionation and driving the ACT LED.
-         *      -       Autonegotiation requires being allowed about
+ *      -       Autonegotiation requires being allowed about
-         *              2 1/2 seconds before attempting to transmit a
+ *              2 1/2 seconds before attempting to transmit a
-         *              packet.  It would be a very bad thing to hang
+ *              packet.  It would be a very bad thing to hang
-         *              the kernel this long, so the driver doesn't
+ *              the kernel this long, so the driver doesn't
-         *              allow transmission 'til after this time, for
+ *              allow transmission 'til after this time, for
-         *              certain PHYs.  It would be much nicer if all
+ *              certain PHYs.  It would be much nicer if all
-         *              PHYs were interrupt-capable like the internal
+ *              PHYs were interrupt-capable like the internal
-         *              PHY.
+ *              PHY.
-         *      -       The ACT LED, which shows adapter activity, is
+ *      -       The ACT LED, which shows adapter activity, is
-         *              driven by the driver, and so must be left on
+ *              driven by the driver, and so must be left on
-         *              for a short period to power up the LED so it
+ *              for a short period to power up the LED so it
-         *              can be seen.  This delay can be changed by
+ *              can be seen.  This delay can be changed by
-         *              changing the TLAN_TIMER_ACT_DELAY in tlan.h,
+ *              changing the TLAN_TIMER_ACT_DELAY in tlan.h,
-         *              if desired.  100 ms  produces a slightly
+ *              if desired.  100 ms  produces a slightly
-         *              sluggish response.
+ *              sluggish response.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_Timer( unsigned long data )
+static void tlan_timer(unsigned long data)
 {
        struct net_device       *dev = (struct net_device *) data;
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        u32             elapsed;
        unsigned long   flags = 0;
        priv->timer.function = NULL;
-        switch ( priv->timerType ) {
+        switch (priv->timer_type) {
 #ifdef MONITOR
-                case TLAN_TIMER_LINK_BEAT:
+        case TLAN_TIMER_LINK_BEAT:
-                        TLan_PhyMonitor( dev );
+                tlan_phy_monitor(dev);
-                        break;
+                break;
 #endif
-                case TLAN_TIMER_PHY_PDOWN:
+        case TLAN_TIMER_PHY_PDOWN:
-                        TLan_PhyPowerDown( dev );
+                tlan_phy_power_down(dev);
-                        break;
+                break;
-                case TLAN_TIMER_PHY_PUP:
+        case TLAN_TIMER_PHY_PUP:
-                        TLan_PhyPowerUp( dev );
+                tlan_phy_power_up(dev);
-                        break;
+                break;
-                case TLAN_TIMER_PHY_RESET:
+        case TLAN_TIMER_PHY_RESET:
-                        TLan_PhyReset( dev );
+                tlan_phy_reset(dev);
-                        break;
+                break;
-                case TLAN_TIMER_PHY_START_LINK:
+        case TLAN_TIMER_PHY_START_LINK:
-                        TLan_PhyStartLink( dev );
+                tlan_phy_start_link(dev);
-                        break;
+                break;
-                case TLAN_TIMER_PHY_FINISH_AN:
+        case TLAN_TIMER_PHY_FINISH_AN:
-                        TLan_PhyFinishAutoNeg( dev );
+                tlan_phy_finish_auto_neg(dev);
-                        break;
+                break;
-                case TLAN_TIMER_FINISH_RESET:
+        case TLAN_TIMER_FINISH_RESET:
-                        TLan_FinishReset( dev );
+                tlan_finish_reset(dev);
-                        break;
+                break;
-                case TLAN_TIMER_ACTIVITY:
+        case TLAN_TIMER_ACTIVITY:
-                        spin_lock_irqsave(&priv->lock, flags);
+                spin_lock_irqsave(&priv->lock, flags);
-                        if ( priv->timer.function == NULL ) {
+                if (priv->timer.function == NULL) {
-                                elapsed = jiffies - priv->timerSetAt;
+                        elapsed = jiffies - priv->timer_set_at;
-                                if ( elapsed >= TLAN_TIMER_ACT_DELAY ) {
+                        if (elapsed >= TLAN_TIMER_ACT_DELAY) {
-                                        TLan_DioWrite8( dev->base_addr,
+                                tlan_dio_write8(dev->base_addr,
-                                                        TLAN_LED_REG, TLAN_LED_LINK );
+                                                TLAN_LED_REG, TLAN_LED_LINK);
-                                } else  {
+                        } else  {
-                                        priv->timer.function = TLan_Timer;
+                                priv->timer.function = tlan_timer;
-                                        priv->timer.expires = priv->timerSetAt
+                                priv->timer.expires = priv->timer_set_at
-                                                + TLAN_TIMER_ACT_DELAY;
+                                        + TLAN_TIMER_ACT_DELAY;
-                                        spin_unlock_irqrestore(&priv->lock, flags);
+                                spin_unlock_irqrestore(&priv->lock, flags);
-                                        add_timer( &priv->timer );
+                                add_timer(&priv->timer);
-                                        break;
+                                break;
-                                }
                        }
-                        spin_unlock_irqrestore(&priv->lock, flags);
+                }
-                        break;
+                spin_unlock_irqrestore(&priv->lock, flags);
-                default:
+                break;
-                        break;
+        default:
+                break;
        }
-} /* TLan_Timer */
+}
@@ -1919,39 +2009,39 @@ static void TLan_Timer( unsigned long data )
 /*****************************************************************************
 ******************************************************************************
-        ThunderLAN Driver Adapter Related Routines
+ThunderLAN driver adapter related routines
 ******************************************************************************
 *****************************************************************************/
-        /***************************************************************
+/***************************************************************
-         *      TLan_ResetLists
+ *      tlan_reset_lists
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              dev     The device structure with the list
+ *              dev     The device structure with the list
-         *                      stuctures to be reset.
+ *                      stuctures to be reset.
-         *
+ *
-         *      This routine sets the variables associated with managing
+ *      This routine sets the variables associated with managing
-         *      the TLAN lists to their initial values.
+ *      the TLAN lists to their initial values.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_ResetLists( struct net_device *dev )
+static void tlan_reset_lists(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        int             i;
-        TLanList        *list;
+        struct tlan_list        *list;
        dma_addr_t      list_phys;
        struct sk_buff  *skb;
-        priv->txHead = 0;
+        priv->tx_head = 0;
-        priv->txTail = 0;
+        priv->tx_tail = 0;
-        for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ ) {
+        for (i = 0; i < TLAN_NUM_TX_LISTS; i++) {
-                list = priv->txList + i;
+                list = priv->tx_list + i;
-                list->cStat = TLAN_CSTAT_UNUSED;
+                list->c_stat = TLAN_CSTAT_UNUSED;
                list->buffer[0].address = 0;
                list->buffer[2].count = 0;
                list->buffer[2].address = 0;
@@ -1959,169 +2049,169 @@ static void TLan_ResetLists( struct net_device *dev )
                list->buffer[9].address = 0;
        }
-        priv->rxHead = 0;
+        priv->rx_head = 0;
-        priv->rxTail = TLAN_NUM_RX_LISTS - 1;
+        priv->rx_tail = TLAN_NUM_RX_LISTS - 1;
-        for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ ) {
+        for (i = 0; i < TLAN_NUM_RX_LISTS; i++) {
-                list = priv->rxList + i;
+                list = priv->rx_list + i;
-                list_phys = priv->rxListDMA + sizeof(TLanList) * i;
+                list_phys = priv->rx_list_dma + sizeof(struct tlan_list)*i;
-                list->cStat = TLAN_CSTAT_READY;
+                list->c_stat = TLAN_CSTAT_READY;
-                list->frameSize = TLAN_MAX_FRAME_SIZE;
+                list->frame_size = TLAN_MAX_FRAME_SIZE;
                list->buffer[0].count = TLAN_MAX_FRAME_SIZE | TLAN_LAST_BUFFER;
                skb = netdev_alloc_skb_ip_align(dev, TLAN_MAX_FRAME_SIZE + 5);
-                if ( !skb ) {
+                if (!skb) {
-                        pr_err("TLAN: out of memory for received data.\n" );
+                        pr_err("TLAN: out of memory for received data.\n");
                        break;
                }
-                list->buffer[0].address = pci_map_single(priv->pciDev,
+                list->buffer[0].address = pci_map_single(priv->pci_dev,
                                                         skb->data,
                                                         TLAN_MAX_FRAME_SIZE,
                                                         PCI_DMA_FROMDEVICE);
-                TLan_StoreSKB(list, skb);
+                tlan_store_skb(list, skb);
                list->buffer[1].count = 0;
                list->buffer[1].address = 0;
-                list->forward = list_phys + sizeof(TLanList);
+                list->forward = list_phys + sizeof(struct tlan_list);
        }
        /* in case ran out of memory early, clear bits */
        while (i < TLAN_NUM_RX_LISTS) {
-                TLan_StoreSKB(priv->rxList + i, NULL);
+                tlan_store_skb(priv->rx_list + i, NULL);
                ++i;
        }
        list->forward = 0;
-} /* TLan_ResetLists */
+}
-static void TLan_FreeLists( struct net_device *dev )
+static void tlan_free_lists(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        int             i;
-        TLanList        *list;
+        struct tlan_list        *list;
        struct sk_buff  *skb;
-        for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ ) {
+        for (i = 0; i < TLAN_NUM_TX_LISTS; i++) {
-                list = priv->txList + i;
+                list = priv->tx_list + i;
-                skb = TLan_GetSKB(list);
+                skb = tlan_get_skb(list);
-                if ( skb ) {
+                if (skb) {
                        pci_unmap_single(
-                                priv->pciDev,
+                                priv->pci_dev,
                                list->buffer[0].address,
                                max(skb->len,
                                    (unsigned int)TLAN_MIN_FRAME_SIZE),
                                PCI_DMA_TODEVICE);
-                        dev_kfree_skb_any( skb );
+                        dev_kfree_skb_any(skb);
                        list->buffer[8].address = 0;
                        list->buffer[9].address = 0;
                }
        }
-        for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ ) {
+        for (i = 0; i < TLAN_NUM_RX_LISTS; i++) {
-                list = priv->rxList + i;
+                list = priv->rx_list + i;
-                skb = TLan_GetSKB(list);
+                skb = tlan_get_skb(list);
-                if ( skb ) {
+                if (skb) {
-                        pci_unmap_single(priv->pciDev,
+                        pci_unmap_single(priv->pci_dev,
                                         list->buffer[0].address,
                                         TLAN_MAX_FRAME_SIZE,
                                         PCI_DMA_FROMDEVICE);
-                        dev_kfree_skb_any( skb );
+                        dev_kfree_skb_any(skb);
                        list->buffer[8].address = 0;
                        list->buffer[9].address = 0;
                }
        }
-} /* TLan_FreeLists */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_PrintDio
+ *      tlan_print_dio
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              io_base         Base IO port of the device of
+ *              io_base         Base IO port of the device of
-         *                              which to print DIO registers.
+ *                              which to print DIO registers.
-         *
+ *
-         *      This function prints out all the internal (DIO)
+ *      This function prints out all the internal (DIO)
-         *      registers of a TLAN chip.
+ *      registers of a TLAN chip.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_PrintDio( u16 io_base )
+static void tlan_print_dio(u16 io_base)
 {
        u32 data0, data1;
        int     i;
-        printk( "TLAN:   Contents of internal registers for io base 0x%04hx.\n",
+        pr_info("TLAN:   Contents of internal registers for io base 0x%04hx.\n",
-                io_base );
+               io_base);
-        printk( "TLAN:      Off.  +0         +4\n" );
+        pr_info("TLAN:      Off.  +0     +4\n");
-        for ( i = 0; i < 0x4C; i+= 8 ) {
+        for (i = 0; i < 0x4C; i += 8) {
-                data0 = TLan_DioRead32( io_base, i );
+                data0 = tlan_dio_read32(io_base, i);
-                data1 = TLan_DioRead32( io_base, i + 0x4 );
+                data1 = tlan_dio_read32(io_base, i + 0x4);
-                printk( "TLAN:      0x%02x  0x%08x 0x%08x\n", i, data0, data1 );
+                pr_info("TLAN:      0x%02x  0x%08x 0x%08x\n", i, data0, data1);
        }
-} /* TLan_PrintDio */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_PrintList
+ *      TLan_PrintList
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              list    A pointer to the TLanList structure to
+ *              list    A pointer to the struct tlan_list structure to
-         *                      be printed.
+ *                      be printed.
-         *              type    A string to designate type of list,
+ *              type    A string to designate type of list,
-         *                      "Rx" or "Tx".
+ *                      "Rx" or "Tx".
-         *              num     The index of the list.
+ *              num     The index of the list.
-         *
+ *
-         *      This function prints out the contents of the list
+ *      This function prints out the contents of the list
-         *      pointed to by the list parameter.
+ *      pointed to by the list parameter.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_PrintList( TLanList *list, char *type, int num)
+static void tlan_print_list(struct tlan_list *list, char *type, int num)
 {
        int i;
-        printk( "TLAN:   %s List %d at %p\n", type, num, list );
+        pr_info("TLAN:   %s List %d at %p\n", type, num, list);
-        printk( "TLAN:      Forward    = 0x%08x\n",  list->forward );
+        pr_info("TLAN:      Forward    = 0x%08x\n",  list->forward);
-        printk( "TLAN:      CSTAT      = 0x%04hx\n", list->cStat );
+        pr_info("TLAN:      CSTAT      = 0x%04hx\n", list->c_stat);
-        printk( "TLAN:      Frame Size = 0x%04hx\n", list->frameSize );
+        pr_info("TLAN:      Frame Size = 0x%04hx\n", list->frame_size);
-        /* for ( i = 0; i < 10; i++ ) { */
+        /* for (i = 0; i < 10; i++) { */
-        for ( i = 0; i < 2; i++ ) {
+        for (i = 0; i < 2; i++) {
-                printk( "TLAN:      Buffer[%d].count, addr = 0x%08x, 0x%08x\n",
+                pr_info("TLAN:      Buffer[%d].count, addr = 0x%08x, 0x%08x\n",
-                        i, list->buffer[i].count, list->buffer[i].address );
+                       i, list->buffer[i].count, list->buffer[i].address);
        }
-} /* TLan_PrintList */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_ReadAndClearStats
+ *      tlan_read_and_clear_stats
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              dev     Pointer to device structure of adapter
+ *              dev     Pointer to device structure of adapter
-         *                      to which to read stats.
+ *                      to which to read stats.
-         *              record  Flag indicating whether to add
+ *              record  Flag indicating whether to add
-         *
+ *
-         *      This functions reads all the internal status registers
+ *      This functions reads all the internal status registers
-         *      of the TLAN chip, which clears them as a side effect.
+ *      of the TLAN chip, which clears them as a side effect.
-         *      It then either adds the values to the device's status
+ *      It then either adds the values to the device's status
-         *      struct, or discards them, depending on whether record
+ *      struct, or discards them, depending on whether record
-         *      is TLAN_RECORD (!=0)  or TLAN_IGNORE (==0).
+ *      is TLAN_RECORD (!=0)  or TLAN_IGNORE (==0).
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_ReadAndClearStats( struct net_device *dev, int record )
+static void tlan_read_and_clear_stats(struct net_device *dev, int record)
 {
        u32             tx_good, tx_under;
        u32             rx_good, rx_over;
@@ -2129,41 +2219,42 @@ static void TLan_ReadAndClearStats( struct net_device *dev, int record )
        u32             multi_col, single_col;
        u32             excess_col, late_col, loss;
-        outw( TLAN_GOOD_TX_FRMS, dev->base_addr + TLAN_DIO_ADR );
+        outw(TLAN_GOOD_TX_FRMS, dev->base_addr + TLAN_DIO_ADR);
-        tx_good  = inb( dev->base_addr + TLAN_DIO_DATA );
+        tx_good  = inb(dev->base_addr + TLAN_DIO_DATA);
-        tx_good += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
+        tx_good += inb(dev->base_addr + TLAN_DIO_DATA + 1) << 8;
-        tx_good += inb( dev->base_addr + TLAN_DIO_DATA + 2 ) << 16;
+        tx_good += inb(dev->base_addr + TLAN_DIO_DATA + 2) << 16;
-        tx_under = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
+        tx_under = inb(dev->base_addr + TLAN_DIO_DATA + 3);
-        outw( TLAN_GOOD_RX_FRMS, dev->base_addr + TLAN_DIO_ADR );
+        outw(TLAN_GOOD_RX_FRMS, dev->base_addr + TLAN_DIO_ADR);
-        rx_good  = inb( dev->base_addr + TLAN_DIO_DATA );
+        rx_good  = inb(dev->base_addr + TLAN_DIO_DATA);
-        rx_good += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
+        rx_good += inb(dev->base_addr + TLAN_DIO_DATA + 1) << 8;
-        rx_good += inb( dev->base_addr + TLAN_DIO_DATA + 2 ) << 16;
+        rx_good += inb(dev->base_addr + TLAN_DIO_DATA + 2) << 16;
-        rx_over  = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
+        rx_over  = inb(dev->base_addr + TLAN_DIO_DATA + 3);
-        outw( TLAN_DEFERRED_TX, dev->base_addr + TLAN_DIO_ADR );
+        outw(TLAN_DEFERRED_TX, dev->base_addr + TLAN_DIO_ADR);
-        def_tx  = inb( dev->base_addr + TLAN_DIO_DATA );
+        def_tx  = inb(dev->base_addr + TLAN_DIO_DATA);
-        def_tx += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
+        def_tx += inb(dev->base_addr + TLAN_DIO_DATA + 1) << 8;
-        crc     = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
+        crc     = inb(dev->base_addr + TLAN_DIO_DATA + 2);
-        code    = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
+        code    = inb(dev->base_addr + TLAN_DIO_DATA + 3);
-        outw( TLAN_MULTICOL_FRMS, dev->base_addr + TLAN_DIO_ADR );
+        outw(TLAN_MULTICOL_FRMS, dev->base_addr + TLAN_DIO_ADR);
-        multi_col   = inb( dev->base_addr + TLAN_DIO_DATA );
+        multi_col   = inb(dev->base_addr + TLAN_DIO_DATA);
-        multi_col  += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
+        multi_col  += inb(dev->base_addr + TLAN_DIO_DATA + 1) << 8;
-        single_col  = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
+        single_col  = inb(dev->base_addr + TLAN_DIO_DATA + 2);
-        single_col += inb( dev->base_addr + TLAN_DIO_DATA + 3 ) << 8;
+        single_col += inb(dev->base_addr + TLAN_DIO_DATA + 3) << 8;
-        outw( TLAN_EXCESSCOL_FRMS, dev->base_addr + TLAN_DIO_ADR );
+        outw(TLAN_EXCESSCOL_FRMS, dev->base_addr + TLAN_DIO_ADR);
-        excess_col = inb( dev->base_addr + TLAN_DIO_DATA );
+        excess_col = inb(dev->base_addr + TLAN_DIO_DATA);
-        late_col   = inb( dev->base_addr + TLAN_DIO_DATA + 1 );
+        late_col   = inb(dev->base_addr + TLAN_DIO_DATA + 1);
-        loss       = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
+        loss       = inb(dev->base_addr + TLAN_DIO_DATA + 2);
-        if ( record ) {
+        if (record) {
                dev->stats.rx_packets += rx_good;
                dev->stats.rx_errors  += rx_over + crc + code;
                dev->stats.tx_packets += tx_good;
                dev->stats.tx_errors  += tx_under + loss;
-                dev->stats.collisions += multi_col + single_col + excess_col + late_col;
+                dev->stats.collisions += multi_col
+                        + single_col + excess_col + late_col;
                dev->stats.rx_over_errors    += rx_over;
                dev->stats.rx_crc_errors     += crc;
@@ -2173,39 +2264,39 @@ static void TLan_ReadAndClearStats( struct net_device *dev, int record )
                dev->stats.tx_carrier_errors += loss;
        }
-} /* TLan_ReadAndClearStats */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_Reset
+ *      TLan_Reset
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              0
+ *              0
-         *      Parms:
+ *      Parms:
-         *              dev     Pointer to device structure of adapter
+ *              dev     Pointer to device structure of adapter
-         *                      to be reset.
+ *                      to be reset.
-         *
+ *
-         *      This function resets the adapter and it's physical
+ *      This function resets the adapter and it's physical
-         *      device.  See Chap. 3, pp. 9-10 of the "ThunderLAN
+ *      device.  See Chap. 3, pp. 9-10 of the "ThunderLAN
-         *      Programmer's Guide" for details.  The routine tries to
+ *      Programmer's Guide" for details.  The routine tries to
-         *      implement what is detailed there, though adjustments
+ *      implement what is detailed there, though adjustments
-         *      have been made.
+ *      have been made.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
 static void
-TLan_ResetAdapter( struct net_device *dev )
+tlan_reset_adapter(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        int             i;
        u32             addr;
        u32             data;
        u8              data8;
-        priv->tlanFullDuplex = false;
+        priv->tlan_full_duplex = false;
-        priv->phyOnline=0;
+        priv->phy_online = 0;
        netif_carrier_off(dev);
 /*  1.  Assert reset bit. */
@@ -2216,7 +2307,7 @@ TLan_ResetAdapter( struct net_device *dev )
        udelay(1000);
-/*  2.  Turn off interrupts. ( Probably isn't necessary ) */
+/*  2.  Turn off interrupts. (Probably isn't necessary) */
        data = inl(dev->base_addr + TLAN_HOST_CMD);
        data |= TLAN_HC_INT_OFF;
@@ -2224,207 +2315,208 @@ TLan_ResetAdapter( struct net_device *dev )
 /*  3.  Clear AREGs and HASHs. */
-        for ( i = TLAN_AREG_0; i <= TLAN_HASH_2; i += 4 ) {
+        for (i = TLAN_AREG_0; i <= TLAN_HASH_2; i += 4)
-                TLan_DioWrite32( dev->base_addr, (u16) i, 0 );
+                tlan_dio_write32(dev->base_addr, (u16) i, 0);
-        }
 /*  4.  Setup NetConfig register. */
        data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
-        TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, (u16) data );
+        tlan_dio_write16(dev->base_addr, TLAN_NET_CONFIG, (u16) data);
 /*  5.  Load Ld_Tmr and Ld_Thr in HOST_CMD. */
-        outl( TLAN_HC_LD_TMR | 0x3f, dev->base_addr + TLAN_HOST_CMD );
+        outl(TLAN_HC_LD_TMR | 0x3f, dev->base_addr + TLAN_HOST_CMD);
-        outl( TLAN_HC_LD_THR | 0x9, dev->base_addr + TLAN_HOST_CMD );
+        outl(TLAN_HC_LD_THR | 0x9, dev->base_addr + TLAN_HOST_CMD);
 /*  6.  Unreset the MII by setting NMRST (in NetSio) to 1. */
-        outw( TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR);
        addr = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
-        TLan_SetBit( TLAN_NET_SIO_NMRST, addr );
+        tlan_set_bit(TLAN_NET_SIO_NMRST, addr);
 /*  7.  Setup the remaining registers. */
-        if ( priv->tlanRev >= 0x30 ) {
+        if (priv->tlan_rev >= 0x30) {
                data8 = TLAN_ID_TX_EOC | TLAN_ID_RX_EOC;
-                TLan_DioWrite8( dev->base_addr, TLAN_INT_DIS, data8 );
+                tlan_dio_write8(dev->base_addr, TLAN_INT_DIS, data8);
        }
-        TLan_PhyDetect( dev );
+        tlan_phy_detect(dev);
        data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN;
-        if ( priv->adapter->flags & TLAN_ADAPTER_BIT_RATE_PHY ) {
+        if (priv->adapter->flags & TLAN_ADAPTER_BIT_RATE_PHY) {
                data |= TLAN_NET_CFG_BIT;
-                if ( priv->aui == 1 ) {
+                if (priv->aui == 1) {
-                        TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x0a );
+                        tlan_dio_write8(dev->base_addr, TLAN_ACOMMIT, 0x0a);
-                } else if ( priv->duplex == TLAN_DUPLEX_FULL ) {
+                } else if (priv->duplex == TLAN_DUPLEX_FULL) {
-                        TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x00 );
+                        tlan_dio_write8(dev->base_addr, TLAN_ACOMMIT, 0x00);
-                        priv->tlanFullDuplex = true;
+                        priv->tlan_full_duplex = true;
                } else {
-                        TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x08 );
+                        tlan_dio_write8(dev->base_addr, TLAN_ACOMMIT, 0x08);
                }
        }
-        if ( priv->phyNum == 0 ) {
+        if (priv->phy_num == 0)
                data |= TLAN_NET_CFG_PHY_EN;
-        }
+        tlan_dio_write16(dev->base_addr, TLAN_NET_CONFIG, (u16) data);
-        TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, (u16) data );
-        if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
+        if (priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY)
-                TLan_FinishReset( dev );
+                tlan_finish_reset(dev);
-        } else {
+        else
-                TLan_PhyPowerDown( dev );
+                tlan_phy_power_down(dev);
-        }
-} /* TLan_ResetAdapter */
+}
 static void
-TLan_FinishReset( struct net_device *dev )
+tlan_finish_reset(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        u8              data;
        u32             phy;
        u8              sio;
        u16             status;
        u16             partner;
        u16             tlphy_ctl;
-        u16             tlphy_par;
+        u16             tlphy_par;
        u16             tlphy_id1, tlphy_id2;
-        int             i;
+        int             i;
-        phy = priv->phy[priv->phyNum];
+        phy = priv->phy[priv->phy_num];
        data = TLAN_NET_CMD_NRESET | TLAN_NET_CMD_NWRAP;
-        if ( priv->tlanFullDuplex ) {
+        if (priv->tlan_full_duplex)
                data |= TLAN_NET_CMD_DUPLEX;
-        }
+        tlan_dio_write8(dev->base_addr, TLAN_NET_CMD, data);
-        TLan_DioWrite8( dev->base_addr, TLAN_NET_CMD, data );
        data = TLAN_NET_MASK_MASK4 | TLAN_NET_MASK_MASK5;
-        if ( priv->phyNum == 0 ) {
+        if (priv->phy_num == 0)
                data |= TLAN_NET_MASK_MASK7;
-        }
+        tlan_dio_write8(dev->base_addr, TLAN_NET_MASK, data);
-        TLan_DioWrite8( dev->base_addr, TLAN_NET_MASK, data );
+        tlan_dio_write16(dev->base_addr, TLAN_MAX_RX, ((1536)+7)&~7);
-        TLan_DioWrite16( dev->base_addr, TLAN_MAX_RX, ((1536)+7)&~7 );
+        tlan_mii_read_reg(dev, phy, MII_GEN_ID_HI, &tlphy_id1);
-        TLan_MiiReadReg( dev, phy, MII_GEN_ID_HI, &tlphy_id1 );
+        tlan_mii_read_reg(dev, phy, MII_GEN_ID_LO, &tlphy_id2);
-        TLan_MiiReadReg( dev, phy, MII_GEN_ID_LO, &tlphy_id2 );
-        if ( ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) ||
+        if ((priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY) ||
-             ( priv->aui ) ) {
+            (priv->aui)) {
                status = MII_GS_LINK;
-                printk( "TLAN:  %s: Link forced.\n", dev->name );
+                pr_info("TLAN:  %s: Link forced.\n", dev->name);
        } else {
-                TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+                tlan_mii_read_reg(dev, phy, MII_GEN_STS, &status);
-                udelay( 1000 );
+                udelay(1000);
-                TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+                tlan_mii_read_reg(dev, phy, MII_GEN_STS, &status);
-                if ( (status & MII_GS_LINK) &&
+                if ((status & MII_GS_LINK) &&
-                     /* We only support link info on Nat.Sem. PHY's */
+                    /* We only support link info on Nat.Sem. PHY's */
-                        (tlphy_id1 == NAT_SEM_ID1) &&
+                    (tlphy_id1 == NAT_SEM_ID1) &&
-                        (tlphy_id2 == NAT_SEM_ID2) ) {
+                    (tlphy_id2 == NAT_SEM_ID2)) {
-                        TLan_MiiReadReg( dev, phy, MII_AN_LPA, &partner );
+                        tlan_mii_read_reg(dev, phy, MII_AN_LPA, &partner);
-                        TLan_MiiReadReg( dev, phy, TLAN_TLPHY_PAR, &tlphy_par );
+                        tlan_mii_read_reg(dev, phy, TLAN_TLPHY_PAR, &tlphy_par);
-                        printk( "TLAN: %s: Link active with ", dev->name );
+                        pr_info("TLAN: %s: Link active with ", dev->name);
                        if (!(tlphy_par & TLAN_PHY_AN_EN_STAT)) {
-                                 printk( "forced 10%sMbps %s-Duplex\n",
+                                pr_info("forced 10%sMbps %s-Duplex\n",
-                                         tlphy_par & TLAN_PHY_SPEED_100 ? "" : "0",
+                                        tlphy_par & TLAN_PHY_SPEED_100
-                                         tlphy_par & TLAN_PHY_DUPLEX_FULL ? "Full" : "Half");
+                                        ? "" : "0",
+                                        tlphy_par & TLAN_PHY_DUPLEX_FULL
+                                        ? "Full" : "Half");
                        } else {
-                                printk( "AutoNegotiation enabled, at 10%sMbps %s-Duplex\n",
+                                pr_info("Autonegotiation enabled, at 10%sMbps %s-Duplex\n",
-                                        tlphy_par & TLAN_PHY_SPEED_100 ? "" : "0",
+                                        tlphy_par & TLAN_PHY_SPEED_100
-                                        tlphy_par & TLAN_PHY_DUPLEX_FULL ? "Full" : "Half");
+                                        ? "" : "0",
-                                printk("TLAN: Partner capability: ");
+                                        tlphy_par & TLAN_PHY_DUPLEX_FULL
-                                        for (i = 5; i <= 10; i++)
+                                        ? "Full" : "half");
-                                                if (partner & (1<<i))
+                                pr_info("TLAN: Partner capability: ");
-                                                        printk("%s",media[i-5]);
+                                for (i = 5; i <= 10; i++)
+                                        if (partner & (1<<i))
+                                                printk("%s", media[i-5]);
                                printk("\n");
                        }
-                        TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK );
+                        tlan_dio_write8(dev->base_addr, TLAN_LED_REG,
+                                        TLAN_LED_LINK);
 #ifdef MONITOR
                        /* We have link beat..for now anyway */
-                        priv->link = 1;
+                        priv->link = 1;
-                        /*Enabling link beat monitoring */
+                        /*Enabling link beat monitoring */
-                        TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_LINK_BEAT );
+                        tlan_set_timer(dev, (10*HZ), TLAN_TIMER_LINK_BEAT);
 #endif
                } else if (status & MII_GS_LINK)  {
-                        printk( "TLAN: %s: Link active\n", dev->name );
+                        pr_info("TLAN: %s: Link active\n", dev->name);
-                        TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK );
+                        tlan_dio_write8(dev->base_addr, TLAN_LED_REG,
+                                        TLAN_LED_LINK);
                }
        }
-        if ( priv->phyNum == 0 ) {
+        if (priv->phy_num == 0) {
-                TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl );
+                tlan_mii_read_reg(dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl);
-                tlphy_ctl |= TLAN_TC_INTEN;
+                tlphy_ctl |= TLAN_TC_INTEN;
-                TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl );
+                tlan_mii_write_reg(dev, phy, TLAN_TLPHY_CTL, tlphy_ctl);
-                sio = TLan_DioRead8( dev->base_addr, TLAN_NET_SIO );
+                sio = tlan_dio_read8(dev->base_addr, TLAN_NET_SIO);
-                sio |= TLAN_NET_SIO_MINTEN;
+                sio |= TLAN_NET_SIO_MINTEN;
-                TLan_DioWrite8( dev->base_addr, TLAN_NET_SIO, sio );
+                tlan_dio_write8(dev->base_addr, TLAN_NET_SIO, sio);
-        }
+        }
-        if ( status & MII_GS_LINK ) {
+        if (status & MII_GS_LINK) {
-                TLan_SetMac( dev, 0, dev->dev_addr );
+                tlan_set_mac(dev, 0, dev->dev_addr);
-                priv->phyOnline = 1;
+                priv->phy_online = 1;
-                outb( ( TLAN_HC_INT_ON >> 8 ), dev->base_addr + TLAN_HOST_CMD + 1 );
+                outb((TLAN_HC_INT_ON >> 8), dev->base_addr + TLAN_HOST_CMD + 1);
-                if ( debug >= 1 && debug != TLAN_DEBUG_PROBE ) {
+                if (debug >= 1 && debug != TLAN_DEBUG_PROBE)
-                        outb( ( TLAN_HC_REQ_INT >> 8 ), dev->base_addr + TLAN_HOST_CMD + 1 );
+                        outb((TLAN_HC_REQ_INT >> 8),
-                }
+                             dev->base_addr + TLAN_HOST_CMD + 1);
-                outl( priv->rxListDMA, dev->base_addr + TLAN_CH_PARM );
+                outl(priv->rx_list_dma, dev->base_addr + TLAN_CH_PARM);
-                outl( TLAN_HC_GO | TLAN_HC_RT, dev->base_addr + TLAN_HOST_CMD );
+                outl(TLAN_HC_GO | TLAN_HC_RT, dev->base_addr + TLAN_HOST_CMD);
                netif_carrier_on(dev);
        } else {
-                printk( "TLAN: %s: Link inactive, will retry in 10 secs...\n",
+                pr_info("TLAN: %s: Link inactive, will retry in 10 secs...\n",
-                        dev->name );
+                       dev->name);
-                TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_FINISH_RESET );
+                tlan_set_timer(dev, (10*HZ), TLAN_TIMER_FINISH_RESET);
                return;
        }
-        TLan_SetMulticastList(dev);
+        tlan_set_multicast_list(dev);
-} /* TLan_FinishReset */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_SetMac
+ *      tlan_set_mac
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              dev     Pointer to device structure of adapter
+ *              dev     Pointer to device structure of adapter
-         *                      on which to change the AREG.
+ *                      on which to change the AREG.
-         *              areg    The AREG to set the address in (0 - 3).
+ *              areg    The AREG to set the address in (0 - 3).
-         *              mac     A pointer to an array of chars.  Each
+ *              mac     A pointer to an array of chars.  Each
-         *                      element stores one byte of the address.
+ *                      element stores one byte of the address.
-         *                      IE, it isn't in ascii.
+ *                      IE, it isn't in ascii.
-         *
+ *
-         *      This function transfers a MAC address to one of the
+ *      This function transfers a MAC address to one of the
-         *      TLAN AREGs (address registers).  The TLAN chip locks
+ *      TLAN AREGs (address registers).  The TLAN chip locks
-         *      the register on writing to offset 0 and unlocks the
+ *      the register on writing to offset 0 and unlocks the
-         *      register after writing to offset 5.  If NULL is passed
+ *      register after writing to offset 5.  If NULL is passed
-         *      in mac, then the AREG is filled with 0's.
+ *      in mac, then the AREG is filled with 0's.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_SetMac( struct net_device *dev, int areg, char *mac )
+static void tlan_set_mac(struct net_device *dev, int areg, char *mac)
 {
        int i;
        areg *= 6;
-        if ( mac != NULL ) {
+        if (mac != NULL) {
-                for ( i = 0; i < 6; i++ )
+                for (i = 0; i < 6; i++)
-                        TLan_DioWrite8( dev->base_addr,
+                        tlan_dio_write8(dev->base_addr,
-                                        TLAN_AREG_0 + areg + i, mac[i] );
+                                        TLAN_AREG_0 + areg + i, mac[i]);
        } else {
-                for ( i = 0; i < 6; i++ )
+                for (i = 0; i < 6; i++)
-                        TLan_DioWrite8( dev->base_addr,
+                        tlan_dio_write8(dev->base_addr,
-                                        TLAN_AREG_0 + areg + i, 0 );
+                                        TLAN_AREG_0 + areg + i, 0);
        }
-} /* TLan_SetMac */
+}
@@ -2432,205 +2524,202 @@ static void TLan_SetMac( struct net_device *dev, int areg, char *mac )
 /*****************************************************************************
 ******************************************************************************
-        ThunderLAN Driver PHY Layer Routines
+ThunderLAN driver PHY layer routines
 ******************************************************************************
 *****************************************************************************/
-        /*********************************************************************
+/*********************************************************************
-         *      TLan_PhyPrint
+ *      tlan_phy_print
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              dev     A pointer to the device structure of the
+ *              dev     A pointer to the device structure of the
-         *                      TLAN device having the PHYs to be detailed.
+ *                      TLAN device having the PHYs to be detailed.
-         *
+ *
-         *      This function prints the registers a PHY (aka transceiver).
+ *      This function prints the registers a PHY (aka transceiver).
-         *
+ *
-         ********************************************************************/
+ ********************************************************************/
-static void TLan_PhyPrint( struct net_device *dev )
+static void tlan_phy_print(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        u16 i, data0, data1, data2, data3, phy;
-        phy = priv->phy[priv->phyNum];
+        phy = priv->phy[priv->phy_num];
-        if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
+        if (priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY) {
-                printk( "TLAN:   Device %s, Unmanaged PHY.\n", dev->name );
+                pr_info("TLAN:   Device %s, Unmanaged PHY.\n", dev->name);
-        } else if ( phy <= TLAN_PHY_MAX_ADDR ) {
+        } else if (phy <= TLAN_PHY_MAX_ADDR) {
-                printk( "TLAN:   Device %s, PHY 0x%02x.\n", dev->name, phy );
+                pr_info("TLAN:   Device %s, PHY 0x%02x.\n", dev->name, phy);
-                printk( "TLAN:      Off.  +0     +1     +2     +3\n" );
+                pr_info("TLAN:      Off.  +0     +1     +2     +3\n");
-                for ( i = 0; i < 0x20; i+= 4 ) {
+                for (i = 0; i < 0x20; i += 4) {
-                        printk( "TLAN:      0x%02x", i );
+                        pr_info("TLAN:      0x%02x", i);
-                        TLan_MiiReadReg( dev, phy, i, &data0 );
+                        tlan_mii_read_reg(dev, phy, i, &data0);
-                        printk( " 0x%04hx", data0 );
+                        printk(" 0x%04hx", data0);
-                        TLan_MiiReadReg( dev, phy, i + 1, &data1 );
+                        tlan_mii_read_reg(dev, phy, i + 1, &data1);
-                        printk( " 0x%04hx", data1 );
+                        printk(" 0x%04hx", data1);
-                        TLan_MiiReadReg( dev, phy, i + 2, &data2 );
+                        tlan_mii_read_reg(dev, phy, i + 2, &data2);
-                        printk( " 0x%04hx", data2 );
+                        printk(" 0x%04hx", data2);
-                        TLan_MiiReadReg( dev, phy, i + 3, &data3 );
+                        tlan_mii_read_reg(dev, phy, i + 3, &data3);
-                        printk( " 0x%04hx\n", data3 );
+                        printk(" 0x%04hx\n", data3);
                }
        } else {
-                printk( "TLAN:   Device %s, Invalid PHY.\n", dev->name );
+                pr_info("TLAN:   Device %s, Invalid PHY.\n", dev->name);
        }
-} /* TLan_PhyPrint */
+}
-        /*********************************************************************
+/*********************************************************************
-         *      TLan_PhyDetect
+ *      tlan_phy_detect
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              dev     A pointer to the device structure of the adapter
+ *              dev     A pointer to the device structure of the adapter
-         *                      for which the PHY needs determined.
+ *                      for which the PHY needs determined.
-         *
+ *
-         *      So far I've found that adapters which have external PHYs
+ *      So far I've found that adapters which have external PHYs
-         *      may also use the internal PHY for part of the functionality.
+ *      may also use the internal PHY for part of the functionality.
-         *      (eg, AUI/Thinnet).  This function finds out if this TLAN
+ *      (eg, AUI/Thinnet).  This function finds out if this TLAN
-         *      chip has an internal PHY, and then finds the first external
+ *      chip has an internal PHY, and then finds the first external
-         *      PHY (starting from address 0) if it exists).
+ *      PHY (starting from address 0) if it exists).
-         *
+ *
-         ********************************************************************/
+ ********************************************************************/
-static void TLan_PhyDetect( struct net_device *dev )
+static void tlan_phy_detect(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        u16             control;
        u16             hi;
        u16             lo;
        u32             phy;
-        if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
+        if (priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY) {
-                priv->phyNum = 0xFFFF;
+                priv->phy_num = 0xffff;
                return;
        }
-        TLan_MiiReadReg( dev, TLAN_PHY_MAX_ADDR, MII_GEN_ID_HI, &hi );
+        tlan_mii_read_reg(dev, TLAN_PHY_MAX_ADDR, MII_GEN_ID_HI, &hi);
-        if ( hi != 0xFFFF ) {
+        if (hi != 0xffff)
                priv->phy[0] = TLAN_PHY_MAX_ADDR;
-        } else {
+        else
                priv->phy[0] = TLAN_PHY_NONE;
-        }
        priv->phy[1] = TLAN_PHY_NONE;
-        for ( phy = 0; phy <= TLAN_PHY_MAX_ADDR; phy++ ) {
+        for (phy = 0; phy <= TLAN_PHY_MAX_ADDR; phy++) {
-                TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &control );
+                tlan_mii_read_reg(dev, phy, MII_GEN_CTL, &control);
-                TLan_MiiReadReg( dev, phy, MII_GEN_ID_HI, &hi );
+                tlan_mii_read_reg(dev, phy, MII_GEN_ID_HI, &hi);
-                TLan_MiiReadReg( dev, phy, MII_GEN_ID_LO, &lo );
+                tlan_mii_read_reg(dev, phy, MII_GEN_ID_LO, &lo);
-                if ( ( control != 0xFFFF ) ||
+                if ((control != 0xffff) ||
-                     ( hi != 0xFFFF ) || ( lo != 0xFFFF ) ) {
+                    (hi != 0xffff) || (lo != 0xffff)) {
-                        TLAN_DBG( TLAN_DEBUG_GNRL,
+                        TLAN_DBG(TLAN_DEBUG_GNRL,
-                                  "PHY found at %02x %04x %04x %04x\n",
+                                 "PHY found at %02x %04x %04x %04x\n",
-                                  phy, control, hi, lo );
+                                 phy, control, hi, lo);
-                        if ( ( priv->phy[1] == TLAN_PHY_NONE ) &&
+                        if ((priv->phy[1] == TLAN_PHY_NONE) &&
-                             ( phy != TLAN_PHY_MAX_ADDR ) ) {
+                            (phy != TLAN_PHY_MAX_ADDR)) {
                                priv->phy[1] = phy;
                        }
                }
        }
-        if ( priv->phy[1] != TLAN_PHY_NONE ) {
+        if (priv->phy[1] != TLAN_PHY_NONE)
-                priv->phyNum = 1;
+                priv->phy_num = 1;
-        } else if ( priv->phy[0] != TLAN_PHY_NONE ) {
+        else if (priv->phy[0] != TLAN_PHY_NONE)
-                priv->phyNum = 0;
+                priv->phy_num = 0;
-        } else {
+        else
-                printk( "TLAN:  Cannot initialize device, no PHY was found!\n" );
+                pr_info("TLAN:  Cannot initialize device, no PHY was found!\n");
-        }
-} /* TLan_PhyDetect */
+}
-static void TLan_PhyPowerDown( struct net_device *dev )
+static void tlan_phy_power_down(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        u16             value;
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Powering down PHY(s).\n", dev->name );
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Powering down PHY(s).\n", dev->name);
        value = MII_GC_PDOWN | MII_GC_LOOPBK | MII_GC_ISOLATE;
-        TLan_MiiSync( dev->base_addr );
+        tlan_mii_sync(dev->base_addr);
-        TLan_MiiWriteReg( dev, priv->phy[priv->phyNum], MII_GEN_CTL, value );
+        tlan_mii_write_reg(dev, priv->phy[priv->phy_num], MII_GEN_CTL, value);
-        if ( ( priv->phyNum == 0 ) &&
+        if ((priv->phy_num == 0) &&
-             ( priv->phy[1] != TLAN_PHY_NONE ) &&
+            (priv->phy[1] != TLAN_PHY_NONE) &&
-             ( ! ( priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10 ) ) ) {
+            (!(priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10))) {
-                TLan_MiiSync( dev->base_addr );
+                tlan_mii_sync(dev->base_addr);
-                TLan_MiiWriteReg( dev, priv->phy[1], MII_GEN_CTL, value );
+                tlan_mii_write_reg(dev, priv->phy[1], MII_GEN_CTL, value);
        }
        /* Wait for 50 ms and powerup
         * This is abitrary.  It is intended to make sure the
         * transceiver settles.
         */
-        TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_PUP );
+        tlan_set_timer(dev, (HZ/20), TLAN_TIMER_PHY_PUP);
-} /* TLan_PhyPowerDown */
+}
-static void TLan_PhyPowerUp( struct net_device *dev )
+static void tlan_phy_power_up(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        u16             value;
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Powering up PHY.\n", dev->name );
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Powering up PHY.\n", dev->name);
-        TLan_MiiSync( dev->base_addr );
+        tlan_mii_sync(dev->base_addr);
        value = MII_GC_LOOPBK;
-        TLan_MiiWriteReg( dev, priv->phy[priv->phyNum], MII_GEN_CTL, value );
+        tlan_mii_write_reg(dev, priv->phy[priv->phy_num], MII_GEN_CTL, value);
-        TLan_MiiSync(dev->base_addr);
+        tlan_mii_sync(dev->base_addr);
        /* Wait for 500 ms and reset the
         * transceiver.  The TLAN docs say both 50 ms and
         * 500 ms, so do the longer, just in case.
         */
-        TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_RESET );
+        tlan_set_timer(dev, (HZ/20), TLAN_TIMER_PHY_RESET);
-} /* TLan_PhyPowerUp */
+}
-static void TLan_PhyReset( struct net_device *dev )
+static void tlan_phy_reset(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        u16             phy;
        u16             value;
-        phy = priv->phy[priv->phyNum];
+        phy = priv->phy[priv->phy_num];
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Reseting PHY.\n", dev->name );
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Reseting PHY.\n", dev->name);
-        TLan_MiiSync( dev->base_addr );
+        tlan_mii_sync(dev->base_addr);
        value = MII_GC_LOOPBK | MII_GC_RESET;
-        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, value );
+        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, value);
-        TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &value );
+        tlan_mii_read_reg(dev, phy, MII_GEN_CTL, &value);
-        while ( value & MII_GC_RESET ) {
+        while (value & MII_GC_RESET)
-                TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &value );
+                tlan_mii_read_reg(dev, phy, MII_GEN_CTL, &value);
-        }
        /* Wait for 500 ms and initialize.
         * I don't remember why I wait this long.
         * I've changed this to 50ms, as it seems long enough.
         */
-        TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_START_LINK );
+        tlan_set_timer(dev, (HZ/20), TLAN_TIMER_PHY_START_LINK);
-} /* TLan_PhyReset */
+}
-static void TLan_PhyStartLink( struct net_device *dev )
+static void tlan_phy_start_link(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        u16             ability;
        u16             control;
        u16             data;
@@ -2638,86 +2727,88 @@ static void TLan_PhyStartLink( struct net_device *dev )
        u16             status;
        u16             tctl;
-        phy = priv->phy[priv->phyNum];
+        phy = priv->phy[priv->phy_num];
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Trying to activate link.\n", dev->name );
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Trying to activate link.\n", dev->name);
-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+        tlan_mii_read_reg(dev, phy, MII_GEN_STS, &status);
-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &ability );
+        tlan_mii_read_reg(dev, phy, MII_GEN_STS, &ability);
-        if ( ( status & MII_GS_AUTONEG ) &&
+        if ((status & MII_GS_AUTONEG) &&
-             ( ! priv->aui ) ) {
+            (!priv->aui)) {
                ability = status >> 11;
-                if ( priv->speed  == TLAN_SPEED_10 &&
+                if (priv->speed  == TLAN_SPEED_10 &&
-                     priv->duplex == TLAN_DUPLEX_HALF) {
+                    priv->duplex == TLAN_DUPLEX_HALF) {
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0000);
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x0000);
-                } else if ( priv->speed == TLAN_SPEED_10 &&
+                } else if (priv->speed == TLAN_SPEED_10 &&
-                            priv->duplex == TLAN_DUPLEX_FULL) {
+                           priv->duplex == TLAN_DUPLEX_FULL) {
-                        priv->tlanFullDuplex = true;
+                        priv->tlan_full_duplex = true;
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0100);
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x0100);
-                } else if ( priv->speed == TLAN_SPEED_100 &&
+                } else if (priv->speed == TLAN_SPEED_100 &&
-                            priv->duplex == TLAN_DUPLEX_HALF) {
+                           priv->duplex == TLAN_DUPLEX_HALF) {
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2000);
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x2000);
-                } else if ( priv->speed == TLAN_SPEED_100 &&
+                } else if (priv->speed == TLAN_SPEED_100 &&
-                            priv->duplex == TLAN_DUPLEX_FULL) {
+                           priv->duplex == TLAN_DUPLEX_FULL) {
-                        priv->tlanFullDuplex = true;
+                        priv->tlan_full_duplex = true;
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2100);
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x2100);
                } else {
                        /* Set Auto-Neg advertisement */
-                        TLan_MiiWriteReg( dev, phy, MII_AN_ADV, (ability << 5) | 1);
+                        tlan_mii_write_reg(dev, phy, MII_AN_ADV,
+                                           (ability << 5) | 1);
                        /* Enablee Auto-Neg */
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x1000 );
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x1000);
                        /* Restart Auto-Neg */
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x1200 );
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x1200);
                        /* Wait for 4 sec for autonegotiation
-                        * to complete.  The max spec time is less than this
+                         * to complete.  The max spec time is less than this
-                        * but the card need additional time to start AN.
+                         * but the card need additional time to start AN.
-                        * .5 sec should be plenty extra.
+                         * .5 sec should be plenty extra.
-                        */
+                         */
-                        printk( "TLAN: %s: Starting autonegotiation.\n", dev->name );
+                        pr_info("TLAN: %s: Starting autonegotiation.\n",
-                        TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_PHY_FINISH_AN );
+                                dev->name);
+                        tlan_set_timer(dev, (2*HZ), TLAN_TIMER_PHY_FINISH_AN);
                        return;
                }
        }
-        if ( ( priv->aui ) && ( priv->phyNum != 0 ) ) {
+        if ((priv->aui) && (priv->phy_num != 0)) {
-                priv->phyNum = 0;
+                priv->phy_num = 0;
-                data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
+                data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN
-                TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, data );
+                        | TLAN_NET_CFG_PHY_EN;
-                TLan_SetTimer( dev, (40*HZ/1000), TLAN_TIMER_PHY_PDOWN );
+                tlan_dio_write16(dev->base_addr, TLAN_NET_CONFIG, data);
+                tlan_set_timer(dev, (40*HZ/1000), TLAN_TIMER_PHY_PDOWN);
                return;
-        }  else if ( priv->phyNum == 0 ) {
+        } else if (priv->phy_num == 0) {
                control = 0;
-                TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tctl );
+                tlan_mii_read_reg(dev, phy, TLAN_TLPHY_CTL, &tctl);
-                if ( priv->aui ) {
+                if (priv->aui) {
-                        tctl |= TLAN_TC_AUISEL;
+                        tctl |= TLAN_TC_AUISEL;
                } else {
-                        tctl &= ~TLAN_TC_AUISEL;
+                        tctl &= ~TLAN_TC_AUISEL;
-                        if ( priv->duplex == TLAN_DUPLEX_FULL ) {
+                        if (priv->duplex == TLAN_DUPLEX_FULL) {
                                control |= MII_GC_DUPLEX;
-                                priv->tlanFullDuplex = true;
+                                priv->tlan_full_duplex = true;
                        }
-                        if ( priv->speed == TLAN_SPEED_100 ) {
+                        if (priv->speed == TLAN_SPEED_100)
                                control |= MII_GC_SPEEDSEL;
-                        }
                }
-                TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, control );
+                tlan_mii_write_reg(dev, phy, MII_GEN_CTL, control);
-                TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tctl );
+                tlan_mii_write_reg(dev, phy, TLAN_TLPHY_CTL, tctl);
        }
        /* Wait for 2 sec to give the transceiver time
         * to establish link.
         */
-        TLan_SetTimer( dev, (4*HZ), TLAN_TIMER_FINISH_RESET );
+        tlan_set_timer(dev, (4*HZ), TLAN_TIMER_FINISH_RESET);
-} /* TLan_PhyStartLink */
+}
-static void TLan_PhyFinishAutoNeg( struct net_device *dev )
+static void tlan_phy_finish_auto_neg(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
        u16             an_adv;
        u16             an_lpa;
        u16             data;
@@ -2725,115 +2816,118 @@ static void TLan_PhyFinishAutoNeg( struct net_device *dev )
        u16             phy;
        u16             status;
-        phy = priv->phy[priv->phyNum];
+        phy = priv->phy[priv->phy_num];
-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+        tlan_mii_read_reg(dev, phy, MII_GEN_STS, &status);
-        udelay( 1000 );
+        udelay(1000);
-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+        tlan_mii_read_reg(dev, phy, MII_GEN_STS, &status);
-        if ( ! ( status & MII_GS_AUTOCMPLT ) ) {
+        if (!(status & MII_GS_AUTOCMPLT)) {
                /* Wait for 8 sec to give the process
                 * more time.  Perhaps we should fail after a while.
                 */
-                 if (!priv->neg_be_verbose++) {
+                if (!priv->neg_be_verbose++) {
-                         pr_info("TLAN:  Giving autonegotiation more time.\n");
+                        pr_info("TLAN:  Giving autonegotiation more time.\n");
-                         pr_info("TLAN:  Please check that your adapter has\n");
+                        pr_info("TLAN:  Please check that your adapter has\n");
-                         pr_info("TLAN:  been properly connected to a HUB or Switch.\n");
+                        pr_info("TLAN:  been properly connected to a HUB or Switch.\n");
-                         pr_info("TLAN:  Trying to establish link in the background...\n");
+                        pr_info("TLAN:  Trying to establish link in the background...\n");
-                 }
+                }
-                TLan_SetTimer( dev, (8*HZ), TLAN_TIMER_PHY_FINISH_AN );
+                tlan_set_timer(dev, (8*HZ), TLAN_TIMER_PHY_FINISH_AN);
                return;
        }
-        printk( "TLAN: %s: Autonegotiation complete.\n", dev->name );
+        pr_info("TLAN: %s: Autonegotiation complete.\n", dev->name);
-        TLan_MiiReadReg( dev, phy, MII_AN_ADV, &an_adv );
+        tlan_mii_read_reg(dev, phy, MII_AN_ADV, &an_adv);
-        TLan_MiiReadReg( dev, phy, MII_AN_LPA, &an_lpa );
+        tlan_mii_read_reg(dev, phy, MII_AN_LPA, &an_lpa);
        mode = an_adv & an_lpa & 0x03E0;
-        if ( mode & 0x0100 ) {
+        if (mode & 0x0100)
-                priv->tlanFullDuplex = true;
+                priv->tlan_full_duplex = true;
-        } else if ( ! ( mode & 0x0080 ) && ( mode & 0x0040 ) ) {
+        else if (!(mode & 0x0080) && (mode & 0x0040))
-                priv->tlanFullDuplex = true;
+                priv->tlan_full_duplex = true;
-        }
+        if ((!(mode & 0x0180)) &&
-        if ( ( ! ( mode & 0x0180 ) ) &&
+            (priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10) &&
-             ( priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10 ) &&
+            (priv->phy_num != 0)) {
-             ( priv->phyNum != 0 ) ) {
+                priv->phy_num = 0;
-                priv->phyNum = 0;
+                data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN
-                data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
+                        | TLAN_NET_CFG_PHY_EN;
-                TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, data );
+                tlan_dio_write16(dev->base_addr, TLAN_NET_CONFIG, data);
-                TLan_SetTimer( dev, (400*HZ/1000), TLAN_TIMER_PHY_PDOWN );
+                tlan_set_timer(dev, (400*HZ/1000), TLAN_TIMER_PHY_PDOWN);
                return;
        }
-        if ( priv->phyNum == 0 ) {
+        if (priv->phy_num == 0) {
-                if ( ( priv->duplex == TLAN_DUPLEX_FULL ) ||
+                if ((priv->duplex == TLAN_DUPLEX_FULL) ||
-                     ( an_adv & an_lpa & 0x0040 ) ) {
+                    (an_adv & an_lpa & 0x0040)) {
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL,
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL,
-                                          MII_GC_AUTOENB | MII_GC_DUPLEX );
+                                           MII_GC_AUTOENB | MII_GC_DUPLEX);
-                        pr_info("TLAN:  Starting internal PHY with FULL-DUPLEX\n" );
+                        pr_info("TLAN:  Starting internal PHY with FULL-DUPLEX\n");
                } else {
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, MII_GC_AUTOENB );
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL,
-                        pr_info( "TLAN:  Starting internal PHY with HALF-DUPLEX\n" );
+                                           MII_GC_AUTOENB);
+                        pr_info("TLAN:  Starting internal PHY with HALF-DUPLEX\n");
                }
        }
        /* Wait for 100 ms.  No reason in partiticular.
         */
-        TLan_SetTimer( dev, (HZ/10), TLAN_TIMER_FINISH_RESET );
+        tlan_set_timer(dev, (HZ/10), TLAN_TIMER_FINISH_RESET);
-} /* TLan_PhyFinishAutoNeg */
+}
 #ifdef MONITOR
-        /*********************************************************************
+/*********************************************************************
-        *
+ *
-        *      TLan_phyMonitor
+ *     tlan_phy_monitor
-        *
+ *
-        *      Returns:
+ *     Returns:
-        *              None
+ *            None
-        *
+ *
-        *      Params:
+ *     Params:
-        *              dev             The device structure of this device.
+ *            dev            The device structure of this device.
-        *
+ *
-        *
+ *
-        *      This function monitors PHY condition by reading the status
+ *     This function monitors PHY condition by reading the status
-        *      register via the MII bus. This can be used to give info
+ *     register via the MII bus. This can be used to give info
-        *      about link changes (up/down), and possible switch to alternate
+ *     about link changes (up/down), and possible switch to alternate
-        *      media.
+ *     media.
-        *
+ *
-        * ******************************************************************/
+ *******************************************************************/
-void TLan_PhyMonitor( struct net_device *dev )
+void tlan_phy_monitor(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        u16     phy;
        u16     phy_status;
-        phy = priv->phy[priv->phyNum];
+        phy = priv->phy[priv->phy_num];
-        /* Get PHY status register */
+        /* Get PHY status register */
-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &phy_status );
+        tlan_mii_read_reg(dev, phy, MII_GEN_STS, &phy_status);
-        /* Check if link has been lost */
+        /* Check if link has been lost */
-        if (!(phy_status & MII_GS_LINK)) {
+        if (!(phy_status & MII_GS_LINK)) {
-               if (priv->link) {
+                if (priv->link) {
-                      priv->link = 0;
+                        priv->link = 0;
-                      printk(KERN_DEBUG "TLAN: %s has lost link\n", dev->name);
+                        printk(KERN_DEBUG "TLAN: %s has lost link\n",
-                      netif_carrier_off(dev);
+                               dev->name);
-                      TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
+                        netif_carrier_off(dev);
-                      return;
+                        tlan_set_timer(dev, (2*HZ), TLAN_TIMER_LINK_BEAT);
+                        return;
                }
        }
-        /* Link restablished? */
+        /* Link restablished? */
-        if ((phy_status & MII_GS_LINK) && !priv->link) {
+        if ((phy_status & MII_GS_LINK) && !priv->link) {
-                priv->link = 1;
+                priv->link = 1;
-                printk(KERN_DEBUG "TLAN: %s has reestablished link\n", dev->name);
+                printk(KERN_DEBUG "TLAN: %s has reestablished link\n",
+                       dev->name);
                netif_carrier_on(dev);
-        }
+        }
        /* Setup a new monitor */
-        TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
+        tlan_set_timer(dev, (2*HZ), TLAN_TIMER_LINK_BEAT);
 }
 #endif /* MONITOR */
@@ -2842,47 +2936,48 @@ void TLan_PhyMonitor( struct net_device *dev )
 /*****************************************************************************
 ******************************************************************************
-        ThunderLAN Driver MII Routines
+ThunderLAN driver MII routines
-        These routines are based on the information in Chap. 2 of the
+these routines are based on the information in chap. 2 of the
-        "ThunderLAN Programmer's Guide", pp. 15-24.
+"ThunderLAN Programmer's Guide", pp. 15-24.
 ******************************************************************************
 *****************************************************************************/
-        /***************************************************************
+/***************************************************************
-         *      TLan_MiiReadReg
+ *      tlan_mii_read_reg
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              false   if ack received ok
+ *              false   if ack received ok
-         *              true    if no ack received or other error
+ *              true    if no ack received or other error
-         *
+ *
-         *      Parms:
+ *      Parms:
-         *              dev             The device structure containing
+ *              dev             The device structure containing
-         *                              The io address and interrupt count
+ *                              The io address and interrupt count
-         *                              for this device.
+ *                              for this device.
-         *              phy             The address of the PHY to be queried.
+ *              phy             The address of the PHY to be queried.
-         *              reg             The register whose contents are to be
+ *              reg             The register whose contents are to be
-         *                              retrieved.
+ *                              retrieved.
-         *              val             A pointer to a variable to store the
+ *              val             A pointer to a variable to store the
-         *                              retrieved value.
+ *                              retrieved value.
-         *
+ *
-         *      This function uses the TLAN's MII bus to retrieve the contents
+ *      This function uses the TLAN's MII bus to retrieve the contents
-         *      of a given register on a PHY.  It sends the appropriate info
+ *      of a given register on a PHY.  It sends the appropriate info
-         *      and then reads the 16-bit register value from the MII bus via
+ *      and then reads the 16-bit register value from the MII bus via
-         *      the TLAN SIO register.
+ *      the TLAN SIO register.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static bool TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
+static bool
+tlan_mii_read_reg(struct net_device *dev, u16 phy, u16 reg, u16 *val)
 {
        u8      nack;
        u16     sio, tmp;
-        u32     i;
+        u32     i;
        bool    err;
        int     minten;
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        unsigned long flags = 0;
        err = false;
@@ -2892,48 +2987,48 @@ static bool TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val
        if (!in_irq())
                spin_lock_irqsave(&priv->lock, flags);
-        TLan_MiiSync(dev->base_addr);
+        tlan_mii_sync(dev->base_addr);
-        minten = TLan_GetBit( TLAN_NET_SIO_MINTEN, sio );
+        minten = tlan_get_bit(TLAN_NET_SIO_MINTEN, sio);
-        if ( minten )
+        if (minten)
-                TLan_ClearBit(TLAN_NET_SIO_MINTEN, sio);
+                tlan_clear_bit(TLAN_NET_SIO_MINTEN, sio);
-        TLan_MiiSendData( dev->base_addr, 0x1, 2 );     /* Start ( 01b ) */
+        tlan_mii_send_data(dev->base_addr, 0x1, 2);     /* start (01b) */
-        TLan_MiiSendData( dev->base_addr, 0x2, 2 );     /* Read  ( 10b ) */
+        tlan_mii_send_data(dev->base_addr, 0x2, 2);     /* read  (10b) */
-        TLan_MiiSendData( dev->base_addr, phy, 5 );     /* Device #      */
+        tlan_mii_send_data(dev->base_addr, phy, 5);     /* device #      */
-        TLan_MiiSendData( dev->base_addr, reg, 5 );     /* Register #    */
+        tlan_mii_send_data(dev->base_addr, reg, 5);     /* register #    */
-        TLan_ClearBit(TLAN_NET_SIO_MTXEN, sio);         /* Change direction */
+        tlan_clear_bit(TLAN_NET_SIO_MTXEN, sio);        /* change direction */
-        TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);          /* Clock Idle bit */
+        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);         /* clock idle bit */
-        TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
-        TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);          /* Wait 300ns */
+        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);         /* wait 300ns */
-        nack = TLan_GetBit(TLAN_NET_SIO_MDATA, sio);    /* Check for ACK */
+        nack = tlan_get_bit(TLAN_NET_SIO_MDATA, sio);   /* check for ACK */
-        TLan_SetBit(TLAN_NET_SIO_MCLK, sio);            /* Finish ACK */
+        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);           /* finish ACK */
-        if (nack) {                                     /* No ACK, so fake it */
+        if (nack) {                                     /* no ACK, so fake it */
                for (i = 0; i < 16; i++) {
-                        TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
+                        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);
-                        TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+                        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
                }
                tmp = 0xffff;
                err = true;
        } else {                                        /* ACK, so read data */
                for (tmp = 0, i = 0x8000; i; i >>= 1) {
-                        TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
+                        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);
-                        if (TLan_GetBit(TLAN_NET_SIO_MDATA, sio))
+                        if (tlan_get_bit(TLAN_NET_SIO_MDATA, sio))
                                tmp |= i;
-                        TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+                        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
                }
        }
-        TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);          /* Idle cycle */
+        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);         /* idle cycle */
-        TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
-        if ( minten )
+        if (minten)
-                TLan_SetBit(TLAN_NET_SIO_MINTEN, sio);
+                tlan_set_bit(TLAN_NET_SIO_MINTEN, sio);
        *val = tmp;
@@ -2942,116 +3037,117 @@ static bool TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val
        return err;
-} /* TLan_MiiReadReg */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_MiiSendData
+ *      tlan_mii_send_data
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              base_port       The base IO port of the adapter in
+ *              base_port       The base IO port of the adapter in
-         *                              question.
+ *                              question.
-         *              dev             The address of the PHY to be queried.
+ *              dev             The address of the PHY to be queried.
-         *              data            The value to be placed on the MII bus.
+ *              data            The value to be placed on the MII bus.
-         *              num_bits        The number of bits in data that are to
+ *              num_bits        The number of bits in data that are to
-         *                              be placed on the MII bus.
+ *                              be placed on the MII bus.
-         *
+ *
-         *      This function sends on sequence of bits on the MII
+ *      This function sends on sequence of bits on the MII
-         *      configuration bus.
+ *      configuration bus.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_MiiSendData( u16 base_port, u32 data, unsigned num_bits )
+static void tlan_mii_send_data(u16 base_port, u32 data, unsigned num_bits)
 {
        u16 sio;
        u32 i;
-        if ( num_bits == 0 )
+        if (num_bits == 0)
                return;
-        outw( TLAN_NET_SIO, base_port + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, base_port + TLAN_DIO_ADR);
        sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
-        TLan_SetBit( TLAN_NET_SIO_MTXEN, sio );
+        tlan_set_bit(TLAN_NET_SIO_MTXEN, sio);
-        for ( i = ( 0x1 << ( num_bits - 1 ) ); i; i >>= 1 ) {
+        for (i = (0x1 << (num_bits - 1)); i; i >>= 1) {
-                TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );
+                tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);
-                (void) TLan_GetBit( TLAN_NET_SIO_MCLK, sio );
+                (void) tlan_get_bit(TLAN_NET_SIO_MCLK, sio);
-                if ( data & i )
+                if (data & i)
-                        TLan_SetBit( TLAN_NET_SIO_MDATA, sio );
+                        tlan_set_bit(TLAN_NET_SIO_MDATA, sio);
                else
-                        TLan_ClearBit( TLAN_NET_SIO_MDATA, sio );
+                        tlan_clear_bit(TLAN_NET_SIO_MDATA, sio);
-                TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
+                tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
-                (void) TLan_GetBit( TLAN_NET_SIO_MCLK, sio );
+                (void) tlan_get_bit(TLAN_NET_SIO_MCLK, sio);
        }
-} /* TLan_MiiSendData */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_MiiSync
+ *      TLan_MiiSync
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              base_port       The base IO port of the adapter in
+ *              base_port       The base IO port of the adapter in
-         *                              question.
+ *                              question.
-         *
+ *
-         *      This functions syncs all PHYs in terms of the MII configuration
+ *      This functions syncs all PHYs in terms of the MII configuration
-         *      bus.
+ *      bus.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_MiiSync( u16 base_port )
+static void tlan_mii_sync(u16 base_port)
 {
        int i;
        u16 sio;
-        outw( TLAN_NET_SIO, base_port + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, base_port + TLAN_DIO_ADR);
        sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
-        TLan_ClearBit( TLAN_NET_SIO_MTXEN, sio );
+        tlan_clear_bit(TLAN_NET_SIO_MTXEN, sio);
-        for ( i = 0; i < 32; i++ ) {
+        for (i = 0; i < 32; i++) {
-                TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );
+                tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);
-                TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
+                tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
        }
-} /* TLan_MiiSync */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_MiiWriteReg
+ *      tlan_mii_write_reg
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              dev             The device structure for the device
+ *              dev             The device structure for the device
-         *                              to write to.
+ *                              to write to.
-         *              phy             The address of the PHY to be written to.
+ *              phy             The address of the PHY to be written to.
-         *              reg             The register whose contents are to be
+ *              reg             The register whose contents are to be
-         *                              written.
+ *                              written.
-         *              val             The value to be written to the register.
+ *              val             The value to be written to the register.
-         *
+ *
-         *      This function uses the TLAN's MII bus to write the contents of a
+ *      This function uses the TLAN's MII bus to write the contents of a
-         *      given register on a PHY.  It sends the appropriate info and then
+ *      given register on a PHY.  It sends the appropriate info and then
-         *      writes the 16-bit register value from the MII configuration bus
+ *      writes the 16-bit register value from the MII configuration bus
-         *      via the TLAN SIO register.
+ *      via the TLAN SIO register.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val )
+static void
+tlan_mii_write_reg(struct net_device *dev, u16 phy, u16 reg, u16 val)
 {
        u16     sio;
        int     minten;
        unsigned long flags = 0;
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR);
        sio = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
@@ -3059,30 +3155,30 @@ static void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val
        if (!in_irq())
                spin_lock_irqsave(&priv->lock, flags);
-        TLan_MiiSync( dev->base_addr );
+        tlan_mii_sync(dev->base_addr);
-        minten = TLan_GetBit( TLAN_NET_SIO_MINTEN, sio );
+        minten = tlan_get_bit(TLAN_NET_SIO_MINTEN, sio);
-        if ( minten )
+        if (minten)
-                TLan_ClearBit( TLAN_NET_SIO_MINTEN, sio );
+                tlan_clear_bit(TLAN_NET_SIO_MINTEN, sio);
-        TLan_MiiSendData( dev->base_addr, 0x1, 2 );     /* Start ( 01b ) */
+        tlan_mii_send_data(dev->base_addr, 0x1, 2);     /* start (01b) */
-        TLan_MiiSendData( dev->base_addr, 0x1, 2 );     /* Write ( 01b ) */
+        tlan_mii_send_data(dev->base_addr, 0x1, 2);     /* write (01b) */
-        TLan_MiiSendData( dev->base_addr, phy, 5 );     /* Device #      */
+        tlan_mii_send_data(dev->base_addr, phy, 5);     /* device #      */
-        TLan_MiiSendData( dev->base_addr, reg, 5 );     /* Register #    */
+        tlan_mii_send_data(dev->base_addr, reg, 5);     /* register #    */
-        TLan_MiiSendData( dev->base_addr, 0x2, 2 );     /* Send ACK */
+        tlan_mii_send_data(dev->base_addr, 0x2, 2);     /* send ACK */
-        TLan_MiiSendData( dev->base_addr, val, 16 );    /* Send Data */
+        tlan_mii_send_data(dev->base_addr, val, 16);    /* send data */
-        TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );        /* Idle cycle */
+        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio); /* idle cycle */
-        TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
+        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
-        if ( minten )
+        if (minten)
-                TLan_SetBit( TLAN_NET_SIO_MINTEN, sio );
+                tlan_set_bit(TLAN_NET_SIO_MINTEN, sio);
        if (!in_irq())
                spin_unlock_irqrestore(&priv->lock, flags);
-} /* TLan_MiiWriteReg */
+}
@@ -3090,229 +3186,226 @@ static void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val
 /*****************************************************************************
 ******************************************************************************
-        ThunderLAN Driver Eeprom routines
+ThunderLAN driver eeprom routines
-        The Compaq Netelligent 10 and 10/100 cards use a Microchip 24C02A
+the Compaq netelligent 10 and 10/100 cards use a microchip 24C02A
-        EEPROM.  These functions are based on information in Microchip's
+EEPROM.  these functions are based on information in microchip's
-        data sheet.  I don't know how well this functions will work with
+data sheet.  I don't know how well this functions will work with
-        other EEPROMs.
+other Eeproms.
 ******************************************************************************
 *****************************************************************************/
-        /***************************************************************
+/***************************************************************
-         *      TLan_EeSendStart
+ *      tlan_ee_send_start
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              io_base         The IO port base address for the
+ *              io_base         The IO port base address for the
-         *                              TLAN device with the EEPROM to
+ *                              TLAN device with the EEPROM to
-         *                              use.
+ *                              use.
-         *
+ *
-         *      This function sends a start cycle to an EEPROM attached
+ *      This function sends a start cycle to an EEPROM attached
-         *      to a TLAN chip.
+ *      to a TLAN chip.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_EeSendStart( u16 io_base )
+static void tlan_ee_send_start(u16 io_base)
 {
        u16     sio;
-        outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
        sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
-        TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+        tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
-        TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
+        tlan_set_bit(TLAN_NET_SIO_EDATA, sio);
-        TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
+        tlan_set_bit(TLAN_NET_SIO_ETXEN, sio);
-        TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
+        tlan_clear_bit(TLAN_NET_SIO_EDATA, sio);
-        TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+        tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
-} /* TLan_EeSendStart */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_EeSendByte
+ *      tlan_ee_send_byte
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              If the correct ack was received, 0, otherwise 1
+ *              If the correct ack was received, 0, otherwise 1
-         *      Parms:  io_base         The IO port base address for the
+ *      Parms:  io_base         The IO port base address for the
-         *                              TLAN device with the EEPROM to
+ *                              TLAN device with the EEPROM to
-         *                              use.
+ *                              use.
-         *              data            The 8 bits of information to
+ *              data            The 8 bits of information to
-         *                              send to the EEPROM.
+ *                              send to the EEPROM.
-         *              stop            If TLAN_EEPROM_STOP is passed, a
+ *              stop            If TLAN_EEPROM_STOP is passed, a
-         *                              stop cycle is sent after the
+ *                              stop cycle is sent after the
-         *                              byte is sent after the ack is
+ *                              byte is sent after the ack is
-         *                              read.
+ *                              read.
-         *
+ *
-         *      This function sends a byte on the serial EEPROM line,
+ *      This function sends a byte on the serial EEPROM line,
-         *      driving the clock to send each bit. The function then
+ *      driving the clock to send each bit. The function then
-         *      reverses transmission direction and reads an acknowledge
+ *      reverses transmission direction and reads an acknowledge
-         *      bit.
+ *      bit.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static int TLan_EeSendByte( u16 io_base, u8 data, int stop )
+static int tlan_ee_send_byte(u16 io_base, u8 data, int stop)
 {
        int     err;
        u8      place;
        u16     sio;
-        outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
        sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
        /* Assume clock is low, tx is enabled; */
-        for ( place = 0x80; place != 0; place >>= 1 ) {
+        for (place = 0x80; place != 0; place >>= 1) {
-                if ( place & data )
+                if (place & data)
-                        TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
+                        tlan_set_bit(TLAN_NET_SIO_EDATA, sio);
                else
-                        TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
+                        tlan_clear_bit(TLAN_NET_SIO_EDATA, sio);
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
-                TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
        }
-        TLan_ClearBit( TLAN_NET_SIO_ETXEN, sio );
+        tlan_clear_bit(TLAN_NET_SIO_ETXEN, sio);
-        TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+        tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
-        err = TLan_GetBit( TLAN_NET_SIO_EDATA, sio );
+        err = tlan_get_bit(TLAN_NET_SIO_EDATA, sio);
-        TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+        tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
-        TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
+        tlan_set_bit(TLAN_NET_SIO_ETXEN, sio);
-        if ( ( ! err ) && stop ) {
+        if ((!err) && stop) {
                /* STOP, raise data while clock is high */
-                TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
+                tlan_clear_bit(TLAN_NET_SIO_EDATA, sio);
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
-                TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
+                tlan_set_bit(TLAN_NET_SIO_EDATA, sio);
        }
        return err;
-} /* TLan_EeSendByte */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_EeReceiveByte
+ *      tlan_ee_receive_byte
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              Nothing
+ *              Nothing
-         *      Parms:
+ *      Parms:
-         *              io_base         The IO port base address for the
+ *              io_base         The IO port base address for the
-         *                              TLAN device with the EEPROM to
+ *                              TLAN device with the EEPROM to
-         *                              use.
+ *                              use.
-         *              data            An address to a char to hold the
+ *              data            An address to a char to hold the
-         *                              data sent from the EEPROM.
+ *                              data sent from the EEPROM.
-         *              stop            If TLAN_EEPROM_STOP is passed, a
+ *              stop            If TLAN_EEPROM_STOP is passed, a
-         *                              stop cycle is sent after the
+ *                              stop cycle is sent after the
-         *                              byte is received, and no ack is
+ *                              byte is received, and no ack is
-         *                              sent.
+ *                              sent.
-         *
+ *
-         *      This function receives 8 bits of data from the EEPROM
+ *      This function receives 8 bits of data from the EEPROM
-         *      over the serial link.  It then sends and ack bit, or no
+ *      over the serial link.  It then sends and ack bit, or no
-         *      ack and a stop bit.  This function is used to retrieve
+ *      ack and a stop bit.  This function is used to retrieve
-         *      data after the address of a byte in the EEPROM has been
+ *      data after the address of a byte in the EEPROM has been
-         *      sent.
+ *      sent.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static void TLan_EeReceiveByte( u16 io_base, u8 *data, int stop )
+static void tlan_ee_receive_byte(u16 io_base, u8 *data, int stop)
 {
        u8  place;
        u16 sio;
-        outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
        sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
        *data = 0;
        /* Assume clock is low, tx is enabled; */
-        TLan_ClearBit( TLAN_NET_SIO_ETXEN, sio );
+        tlan_clear_bit(TLAN_NET_SIO_ETXEN, sio);
-        for ( place = 0x80; place; place >>= 1 ) {
+        for (place = 0x80; place; place >>= 1) {
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
-                if ( TLan_GetBit( TLAN_NET_SIO_EDATA, sio ) )
+                if (tlan_get_bit(TLAN_NET_SIO_EDATA, sio))
                        *data |= place;
-                TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
        }
-        TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
+        tlan_set_bit(TLAN_NET_SIO_ETXEN, sio);
-        if ( ! stop ) {
+        if (!stop) {
-                TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );       /* Ack = 0 */
+                tlan_clear_bit(TLAN_NET_SIO_EDATA, sio); /* ack = 0 */
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
-                TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
        } else {
-                TLan_SetBit( TLAN_NET_SIO_EDATA, sio );         /* No ack = 1 (?) */
+                tlan_set_bit(TLAN_NET_SIO_EDATA, sio);  /* no ack = 1 (?) */
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
-                TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
                /* STOP, raise data while clock is high */
-                TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
+                tlan_clear_bit(TLAN_NET_SIO_EDATA, sio);
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
-                TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
+                tlan_set_bit(TLAN_NET_SIO_EDATA, sio);
-        }
+        }
-} /* TLan_EeReceiveByte */
+}
-        /***************************************************************
+/***************************************************************
-         *      TLan_EeReadByte
+ *      tlan_ee_read_byte
-         *
+ *
-         *      Returns:
+ *      Returns:
-         *              No error = 0, else, the stage at which the error
+ *              No error = 0, else, the stage at which the error
-         *              occurred.
+ *              occurred.
-         *      Parms:
+ *      Parms:
-         *              io_base         The IO port base address for the
+ *              io_base         The IO port base address for the
-         *                              TLAN device with the EEPROM to
+ *                              TLAN device with the EEPROM to
-         *                              use.
+ *                              use.
-         *              ee_addr         The address of the byte in the
+ *              ee_addr         The address of the byte in the
-         *                              EEPROM whose contents are to be
+ *                              EEPROM whose contents are to be
-         *                              retrieved.
+ *                              retrieved.
-         *              data            An address to a char to hold the
+ *              data            An address to a char to hold the
-         *                              data obtained from the EEPROM.
+ *                              data obtained from the EEPROM.
-         *
+ *
-         *      This function reads a byte of information from an byte
+ *      This function reads a byte of information from an byte
-         *      cell in the EEPROM.
+ *      cell in the EEPROM.
-         *
+ *
-         **************************************************************/
+ **************************************************************/
-static int TLan_EeReadByte( struct net_device *dev, u8 ee_addr, u8 *data )
+static int tlan_ee_read_byte(struct net_device *dev, u8 ee_addr, u8 *data)
 {
        int err;
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
        unsigned long flags = 0;
-        int ret=0;
+        int ret = 0;
        spin_lock_irqsave(&priv->lock, flags);
-        TLan_EeSendStart( dev->base_addr );
+        tlan_ee_send_start(dev->base_addr);
-        err = TLan_EeSendByte( dev->base_addr, 0xA0, TLAN_EEPROM_ACK );
+        err = tlan_ee_send_byte(dev->base_addr, 0xa0, TLAN_EEPROM_ACK);
-        if (err)
+        if (err) {
-        {
+                ret = 1;
-                ret=1;
                goto fail;
        }
-        err = TLan_EeSendByte( dev->base_addr, ee_addr, TLAN_EEPROM_ACK );
+        err = tlan_ee_send_byte(dev->base_addr, ee_addr, TLAN_EEPROM_ACK);
-        if (err)
+        if (err) {
-        {
+                ret = 2;
-                ret=2;
                goto fail;
        }
-        TLan_EeSendStart( dev->base_addr );
+        tlan_ee_send_start(dev->base_addr);
-        err = TLan_EeSendByte( dev->base_addr, 0xA1, TLAN_EEPROM_ACK );
+        err = tlan_ee_send_byte(dev->base_addr, 0xa1, TLAN_EEPROM_ACK);
-        if (err)
+        if (err) {
-        {
+                ret = 3;
-                ret=3;
                goto fail;
        }
-        TLan_EeReceiveByte( dev->base_addr, data, TLAN_EEPROM_STOP );
+        tlan_ee_receive_byte(dev->base_addr, data, TLAN_EEPROM_STOP);
 fail:
        spin_unlock_irqrestore(&priv->lock, flags);
        return ret;
-} /* TLan_EeReadByte */
+}
diff --git a/drivers/net/tlan.h b/drivers/net/tlan.h
index 3315ced774e2..5fc98a8e4889 100644
--- a/drivers/net/tlan.h
+++ b/drivers/net/tlan.h
@@ -20,8 +20,8 @@
 ********************************************************************/
-#include <asm/io.h>
+#include <linux/io.h>
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/netdevice.h>
@@ -40,8 +40,11 @@
 #define TLAN_IGNORE             0
 #define TLAN_RECORD             1
-#define TLAN_DBG(lvl, format, args...)  \
+#define TLAN_DBG(lvl, format, args...)                                  \
-        do { if (debug&lvl) printk(KERN_DEBUG "TLAN: " format, ##args ); } while(0)
+        do {                                                            \
+                if (debug&lvl)                                          \
+                        printk(KERN_DEBUG "TLAN: " format, ##args);     \
+        } while (0)
 #define TLAN_DEBUG_GNRL         0x0001
 #define TLAN_DEBUG_TX           0x0002
@@ -50,7 +53,8 @@
 #define TLAN_DEBUG_PROBE        0x0010
 #define TX_TIMEOUT              (10*HZ)  /* We need time for auto-neg */
-#define MAX_TLAN_BOARDS         8        /* Max number of boards installed at a time */
+#define MAX_TLAN_BOARDS         8        /* Max number of boards installed
+                                            at a time */
        /*****************************************************************
@@ -70,13 +74,13 @@
 #define PCI_DEVICE_ID_OLICOM_OC2326                     0x0014
 #endif
-typedef struct tlan_adapter_entry {
+struct tlan_adapter_entry {
-        u16     vendorId;
+        u16     vendor_id;
-        u16     deviceId;
+        u16     device_id;
-        char    *deviceLabel;
+        char    *device_label;
        u32     flags;
-        u16     addrOfs;
+        u16     addr_ofs;
-} TLanAdapterEntry;
+};
 #define TLAN_ADAPTER_NONE               0x00000000
 #define TLAN_ADAPTER_UNMANAGED_PHY      0x00000001
@@ -129,18 +133,18 @@ typedef struct tlan_adapter_entry {
 #define TLAN_CSTAT_DP_PR        0x0100
-typedef struct tlan_buffer_ref_tag {
+struct tlan_buffer {
        u32     count;
        u32     address;
-} TLanBufferRef;
+};
-typedef struct tlan_list_tag {
+struct tlan_list {
        u32             forward;
-        u16             cStat;
+        u16             c_stat;
-        u16             frameSize;
+        u16             frame_size;
-        TLanBufferRef   buffer[TLAN_BUFFERS_PER_LIST];
+        struct tlan_buffer buffer[TLAN_BUFFERS_PER_LIST];
-} TLanList;
+};
 typedef u8 TLanBuffer[TLAN_MAX_FRAME_SIZE];
@@ -164,49 +168,49 @@ typedef u8 TLanBuffer[TLAN_MAX_FRAME_SIZE];
         *
         ****************************************************************/
-typedef struct tlan_private_tag {
+struct tlan_priv {
-        struct net_device       *nextDevice;
+        struct net_device       *next_device;
-        struct pci_dev          *pciDev;
+        struct pci_dev          *pci_dev;
        struct net_device       *dev;
-        void                    *dmaStorage;
+        void                    *dma_storage;
-        dma_addr_t              dmaStorageDMA;
+        dma_addr_t              dma_storage_dma;
-        unsigned int            dmaSize;
+        unsigned int            dma_size;
-        u8                      *padBuffer;
+        u8                      *pad_buffer;
-        TLanList                *rxList;
+        struct tlan_list        *rx_list;
-        dma_addr_t              rxListDMA;
+        dma_addr_t              rx_list_dma;
-        u8                      *rxBuffer;
+        u8                      *rx_buffer;
-        dma_addr_t              rxBufferDMA;
+        dma_addr_t              rx_buffer_dma;
-        u32                     rxHead;
+        u32                     rx_head;
-        u32                     rxTail;
+        u32                     rx_tail;
-        u32                     rxEocCount;
+        u32                     rx_eoc_count;
-        TLanList                *txList;
+        struct tlan_list        *tx_list;
-        dma_addr_t              txListDMA;
+        dma_addr_t              tx_list_dma;
-        u8                      *txBuffer;
+        u8                      *tx_buffer;
-        dma_addr_t              txBufferDMA;
+        dma_addr_t              tx_buffer_dma;
-        u32                     txHead;
+        u32                     tx_head;
-        u32                     txInProgress;
+        u32                     tx_in_progress;
-        u32                     txTail;
+        u32                     tx_tail;
-        u32                     txBusyCount;
+        u32                     tx_busy_count;
-        u32                     phyOnline;
+        u32                     phy_online;
-        u32                     timerSetAt;
+        u32                     timer_set_at;
-        u32                     timerType;
+        u32                     timer_type;
        struct timer_list       timer;
        struct board            *adapter;
-        u32                     adapterRev;
+        u32                     adapter_rev;
        u32                     aui;
        u32                     debug;
        u32                     duplex;
        u32                     phy[2];
-        u32                     phyNum;
+        u32                     phy_num;
        u32                     speed;
-        u8                      tlanRev;
+        u8                      tlan_rev;
-        u8                      tlanFullDuplex;
+        u8                      tlan_full_duplex;
        spinlock_t              lock;
        u8                      link;
        u8                      is_eisa;
        struct work_struct                      tlan_tqueue;
        u8                      neg_be_verbose;
-} TLanPrivateInfo;
+};
@@ -247,7 +251,7 @@ typedef struct tlan_private_tag {
         ****************************************************************/
 #define TLAN_HOST_CMD                   0x00
-#define         TLAN_HC_GO              0x80000000
+#define TLAN_HC_GO              0x80000000
 #define         TLAN_HC_STOP            0x40000000
 #define         TLAN_HC_ACK             0x20000000
 #define         TLAN_HC_CS_MASK         0x1FE00000
@@ -283,7 +287,7 @@ typedef struct tlan_private_tag {
 #define         TLAN_NET_CMD_TRFRAM     0x02
 #define         TLAN_NET_CMD_TXPACE     0x01
 #define TLAN_NET_SIO                    0x01
-#define         TLAN_NET_SIO_MINTEN     0x80
+#define TLAN_NET_SIO_MINTEN     0x80
 #define         TLAN_NET_SIO_ECLOK      0x40
 #define         TLAN_NET_SIO_ETXEN      0x20
 #define         TLAN_NET_SIO_EDATA      0x10
@@ -304,7 +308,7 @@ typedef struct tlan_private_tag {
 #define         TLAN_NET_MASK_MASK4     0x10
 #define         TLAN_NET_MASK_RSRVD     0x0F
 #define TLAN_NET_CONFIG                 0x04
-#define         TLAN_NET_CFG_RCLK       0x8000
+#define TLAN_NET_CFG_RCLK       0x8000
 #define         TLAN_NET_CFG_TCLK       0x4000
 #define         TLAN_NET_CFG_BIT        0x2000
 #define         TLAN_NET_CFG_RXCRC      0x1000
@@ -372,7 +376,7 @@ typedef struct tlan_private_tag {
 /* Generic MII/PHY Registers */
 #define MII_GEN_CTL                     0x00
-#define         MII_GC_RESET            0x8000
+#define MII_GC_RESET            0x8000
 #define         MII_GC_LOOPBK           0x4000
 #define         MII_GC_SPEEDSEL         0x2000
 #define         MII_GC_AUTOENB          0x1000
@@ -397,9 +401,9 @@ typedef struct tlan_private_tag {
 #define         MII_GS_EXTCAP           0x0001
 #define MII_GEN_ID_HI                   0x02
 #define MII_GEN_ID_LO                   0x03
-#define         MII_GIL_OUI             0xFC00
+#define MII_GIL_OUI             0xFC00
-#define         MII_GIL_MODEL           0x03F0
+#define MII_GIL_MODEL           0x03F0
-#define         MII_GIL_REVISION        0x000F
+#define MII_GIL_REVISION        0x000F
 #define MII_AN_ADV                      0x04
 #define MII_AN_LPA                      0x05
 #define MII_AN_EXP                      0x06
@@ -408,7 +412,7 @@ typedef struct tlan_private_tag {
 #define TLAN_TLPHY_ID                   0x10
 #define TLAN_TLPHY_CTL                  0x11
-#define         TLAN_TC_IGLINK          0x8000
+#define TLAN_TC_IGLINK          0x8000
 #define         TLAN_TC_SWAPOL          0x4000
 #define         TLAN_TC_AUISEL          0x2000
 #define         TLAN_TC_SQEEN           0x1000
@@ -435,41 +439,41 @@ typedef struct tlan_private_tag {
 #define LEVEL1_ID1                      0x7810
 #define LEVEL1_ID2                      0x0000
-#define CIRC_INC( a, b ) if ( ++a >= b ) a = 0
+#define CIRC_INC(a, b) if (++a >= b) a = 0
 /* Routines to access internal registers. */
-static inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr)
+static inline u8 tlan_dio_read8(u16 base_addr, u16 internal_addr)
 {
        outw(internal_addr, base_addr + TLAN_DIO_ADR);
        return inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3));
-} /* TLan_DioRead8 */
+}
-static inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr)
+static inline u16 tlan_dio_read16(u16 base_addr, u16 internal_addr)
 {
        outw(internal_addr, base_addr + TLAN_DIO_ADR);
        return inw((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x2));
-} /* TLan_DioRead16 */
+}
-static inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr)
+static inline u32 tlan_dio_read32(u16 base_addr, u16 internal_addr)
 {
        outw(internal_addr, base_addr + TLAN_DIO_ADR);
        return inl(base_addr + TLAN_DIO_DATA);
-} /* TLan_DioRead32 */
+}
-static inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data)
+static inline void tlan_dio_write8(u16 base_addr, u16 internal_addr, u8 data)
 {
        outw(internal_addr, base_addr + TLAN_DIO_ADR);
        outb(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x3));
@@ -479,7 +483,7 @@ static inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data)
-static inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data)
+static inline void tlan_dio_write16(u16 base_addr, u16 internal_addr, u16 data)
 {
        outw(internal_addr, base_addr + TLAN_DIO_ADR);
        outw(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
@@ -489,16 +493,16 @@ static inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data)
-static inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
+static inline void tlan_dio_write32(u16 base_addr, u16 internal_addr, u32 data)
 {
        outw(internal_addr, base_addr + TLAN_DIO_ADR);
        outl(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
 }
-#define TLan_ClearBit( bit, port )      outb_p(inb_p(port) & ~bit, port)
+#define tlan_clear_bit(bit, port)       outb_p(inb_p(port) & ~bit, port)
-#define TLan_GetBit( bit, port )        ((int) (inb_p(port) & bit))
+#define tlan_get_bit(bit, port) ((int) (inb_p(port) & bit))
-#define TLan_SetBit( bit, port )        outb_p(inb_p(port) | bit, port)
+#define tlan_set_bit(bit, port) outb_p(inb_p(port) | bit, port)
 /*
 * given 6 bytes, view them as 8 6-bit numbers and return the XOR of those
@@ -506,37 +510,37 @@ static inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
 *
 * The original code was:
 *
- * u32  xor( u32 a, u32 b ) {   return ( ( a && ! b ) || ( ! a && b ) ); }
+ * u32  xor(u32 a, u32 b) {     return ((a && !b ) || (! a && b )); }
 *
- * #define XOR8( a, b, c, d, e, f, g, h )       \
+ * #define XOR8(a, b, c, d, e, f, g, h) \
- *      xor( a, xor( b, xor( c, xor( d, xor( e, xor( f, xor( g, h ) ) ) ) ) ) )
+ *      xor(a, xor(b, xor(c, xor(d, xor(e, xor(f, xor(g, h)) ) ) ) ) )
- * #define DA( a, bit )         ( ( (u8) a[bit/8] ) & ( (u8) ( 1 << bit%8 ) ) )
+ * #define DA(a, bit)           (( (u8) a[bit/8] ) & ( (u8) (1 << bit%8)) )
 *
- *      hash  = XOR8( DA(a,0), DA(a, 6), DA(a,12), DA(a,18), DA(a,24),
+ *      hash  = XOR8(DA(a,0), DA(a, 6), DA(a,12), DA(a,18), DA(a,24),
- *                    DA(a,30), DA(a,36), DA(a,42) );
+ *                    DA(a,30), DA(a,36), DA(a,42));
- *      hash |= XOR8( DA(a,1), DA(a, 7), DA(a,13), DA(a,19), DA(a,25),
+ *      hash |= XOR8(DA(a,1), DA(a, 7), DA(a,13), DA(a,19), DA(a,25),
- *                    DA(a,31), DA(a,37), DA(a,43) ) << 1;
+ *                    DA(a,31), DA(a,37), DA(a,43)) << 1;
- *      hash |= XOR8( DA(a,2), DA(a, 8), DA(a,14), DA(a,20), DA(a,26),
+ *      hash |= XOR8(DA(a,2), DA(a, 8), DA(a,14), DA(a,20), DA(a,26),
- *                    DA(a,32), DA(a,38), DA(a,44) ) << 2;
+ *                    DA(a,32), DA(a,38), DA(a,44)) << 2;
- *      hash |= XOR8( DA(a,3), DA(a, 9), DA(a,15), DA(a,21), DA(a,27),
+ *      hash |= XOR8(DA(a,3), DA(a, 9), DA(a,15), DA(a,21), DA(a,27),
- *                    DA(a,33), DA(a,39), DA(a,45) ) << 3;
+ *                    DA(a,33), DA(a,39), DA(a,45)) << 3;
- *      hash |= XOR8( DA(a,4), DA(a,10), DA(a,16), DA(a,22), DA(a,28),
+ *      hash |= XOR8(DA(a,4), DA(a,10), DA(a,16), DA(a,22), DA(a,28),
- *                    DA(a,34), DA(a,40), DA(a,46) ) << 4;
+ *                    DA(a,34), DA(a,40), DA(a,46)) << 4;
- *      hash |= XOR8( DA(a,5), DA(a,11), DA(a,17), DA(a,23), DA(a,29),
+ *      hash |= XOR8(DA(a,5), DA(a,11), DA(a,17), DA(a,23), DA(a,29),
- *                    DA(a,35), DA(a,41), DA(a,47) ) << 5;
+ *                    DA(a,35), DA(a,41), DA(a,47)) << 5;
 *
 */
-static inline u32 TLan_HashFunc( const u8 *a )
+static inline u32 tlan_hash_func(const u8 *a)
 {
-        u8     hash;
+        u8     hash;
-        hash = (a[0]^a[3]);             /* & 077 */
+        hash = (a[0]^a[3]);             /* & 077 */
-        hash ^= ((a[0]^a[3])>>6);       /* & 003 */
+        hash ^= ((a[0]^a[3])>>6);       /* & 003 */
-        hash ^= ((a[1]^a[4])<<2);       /* & 074 */
+        hash ^= ((a[1]^a[4])<<2);       /* & 074 */
-        hash ^= ((a[1]^a[4])>>4);       /* & 017 */
+        hash ^= ((a[1]^a[4])>>4);       /* & 017 */
-        hash ^= ((a[2]^a[5])<<4);       /* & 060 */
+        hash ^= ((a[2]^a[5])<<4);       /* & 060 */
-        hash ^= ((a[2]^a[5])>>2);       /* & 077 */
+        hash ^= ((a[2]^a[5])>>2);       /* & 077 */
-        return hash & 077;
+        return hash & 077;
 }
 #endif
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index b100bd50a0d7..55786a0efc41 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1142,7 +1142,7 @@ static int tun_get_iff(struct net *net, struct tun_struct *tun,
 * privs required. */
 static int set_offload(struct net_device *dev, unsigned long arg)
 {
-        unsigned int old_features, features;
+        u32 old_features, features;
        old_features = dev->features;
        /* Unset features, set them as we chew on the arg. */
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index a3c46f6a15e7..7fa5ec2de942 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -123,12 +123,11 @@ static const int multicast_filter_limit = 32;
 #include <linux/in6.h>
 #include <linux/dma-mapping.h>
 #include <linux/firmware.h>
-#include <generated/utsrelease.h>
 #include "typhoon.h"
 MODULE_AUTHOR("David Dillow <dave@thedillows.org>");
-MODULE_VERSION(UTS_RELEASE);
+MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
 MODULE_FIRMWARE(FIRMWARE_NAME);
 MODULE_DESCRIPTION("3Com Typhoon Family (3C990, 3CR990, and variants)");
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index d776c4a8d3c1..7113168473cf 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1,7 +1,7 @@
 /*
 * cdc_ncm.c
 *
- * Copyright (C) ST-Ericsson 2010
+ * Copyright (C) ST-Ericsson 2010-2011
 * Contact: Alexey Orishko <alexey.orishko@stericsson.com>
 * Original author: Hans Petter Selasky <hans.petter.selasky@stericsson.com>
 *
@@ -54,7 +54,7 @@
 #include <linux/usb/usbnet.h>
 #include <linux/usb/cdc.h>
-#define DRIVER_VERSION                          "30-Nov-2010"
+#define DRIVER_VERSION                          "7-Feb-2011"
 /* CDC NCM subclass 3.2.1 */
 #define USB_CDC_NCM_NDP16_LENGTH_MIN            0x10
@@ -77,6 +77,9 @@
 */
 #define CDC_NCM_DPT_DATAGRAMS_MAX               32
+/* Maximum amount of IN datagrams in NTB */
+#define CDC_NCM_DPT_DATAGRAMS_IN_MAX            0 /* unlimited */
 /* Restart the timer, if amount of datagrams is less than given value */
 #define CDC_NCM_RESTART_TIMER_DATAGRAM_CNT      3
@@ -85,11 +88,6 @@
        (sizeof(struct usb_cdc_ncm_nth16) + sizeof(struct usb_cdc_ncm_ndp16) + \
        (CDC_NCM_DPT_DATAGRAMS_MAX + 1) * sizeof(struct usb_cdc_ncm_dpe16))
-struct connection_speed_change {
-        __le32  USBitRate; /* holds 3GPP downlink value, bits per second */
-        __le32  DSBitRate; /* holds 3GPP uplink value, bits per second */
-} __attribute__ ((packed));
 struct cdc_ncm_data {
        struct usb_cdc_ncm_nth16 nth16;
        struct usb_cdc_ncm_ndp16 ndp16;
@@ -198,10 +196,10 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
 {
        struct usb_cdc_notification req;
        u32 val;
-        __le16 max_datagram_size;
        u8 flags;
        u8 iface_no;
        int err;
+        u16 ntb_fmt_supported;
        iface_no = ctx->control->cur_altsetting->desc.bInterfaceNumber;
@@ -223,6 +221,9 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
        ctx->tx_remainder = le16_to_cpu(ctx->ncm_parm.wNdpOutPayloadRemainder);
        ctx->tx_modulus = le16_to_cpu(ctx->ncm_parm.wNdpOutDivisor);
        ctx->tx_ndp_modulus = le16_to_cpu(ctx->ncm_parm.wNdpOutAlignment);
+        /* devices prior to NCM Errata shall set this field to zero */
+        ctx->tx_max_datagrams = le16_to_cpu(ctx->ncm_parm.wNtbOutMaxDatagrams);
+        ntb_fmt_supported = le16_to_cpu(ctx->ncm_parm.bmNtbFormatsSupported);
        if (ctx->func_desc != NULL)
                flags = ctx->func_desc->bmNetworkCapabilities;
@@ -231,22 +232,58 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
        pr_debug("dwNtbInMaxSize=%u dwNtbOutMaxSize=%u "
                 "wNdpOutPayloadRemainder=%u wNdpOutDivisor=%u "
-                 "wNdpOutAlignment=%u flags=0x%x\n",
+                 "wNdpOutAlignment=%u wNtbOutMaxDatagrams=%u flags=0x%x\n",
                 ctx->rx_max, ctx->tx_max, ctx->tx_remainder, ctx->tx_modulus,
-                 ctx->tx_ndp_modulus, flags);
+                 ctx->tx_ndp_modulus, ctx->tx_max_datagrams, flags);
-        /* max count of tx datagrams without terminating NULL entry */
+        /* max count of tx datagrams */
-        ctx->tx_max_datagrams = CDC_NCM_DPT_DATAGRAMS_MAX;
+        if ((ctx->tx_max_datagrams == 0) ||
+                        (ctx->tx_max_datagrams > CDC_NCM_DPT_DATAGRAMS_MAX))
+                ctx->tx_max_datagrams = CDC_NCM_DPT_DATAGRAMS_MAX;
        /* verify maximum size of received NTB in bytes */
-        if ((ctx->rx_max <
+        if (ctx->rx_max < USB_CDC_NCM_NTB_MIN_IN_SIZE) {
-            (CDC_NCM_MIN_HDR_SIZE + CDC_NCM_MIN_DATAGRAM_SIZE)) ||
+                pr_debug("Using min receive length=%d\n",
-            (ctx->rx_max > CDC_NCM_NTB_MAX_SIZE_RX)) {
+                                                USB_CDC_NCM_NTB_MIN_IN_SIZE);
+                ctx->rx_max = USB_CDC_NCM_NTB_MIN_IN_SIZE;
+        }
+        if (ctx->rx_max > CDC_NCM_NTB_MAX_SIZE_RX) {
                pr_debug("Using default maximum receive length=%d\n",
                                                CDC_NCM_NTB_MAX_SIZE_RX);
                ctx->rx_max = CDC_NCM_NTB_MAX_SIZE_RX;
        }
+        /* inform device about NTB input size changes */
+        if (ctx->rx_max != le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize)) {
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
+                                                        USB_RECIP_INTERFACE;
+                req.bNotificationType = USB_CDC_SET_NTB_INPUT_SIZE;
+                req.wValue = 0;
+                req.wIndex = cpu_to_le16(iface_no);
+                if (flags & USB_CDC_NCM_NCAP_NTB_INPUT_SIZE) {
+                        struct usb_cdc_ncm_ndp_input_size ndp_in_sz;
+                        req.wLength = 8;
+                        ndp_in_sz.dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
+                        ndp_in_sz.wNtbInMaxDatagrams =
+                                        cpu_to_le16(CDC_NCM_DPT_DATAGRAMS_MAX);
+                        ndp_in_sz.wReserved = 0;
+                        err = cdc_ncm_do_request(ctx, &req, &ndp_in_sz, 0, NULL,
+                                                                        1000);
+                } else {
+                        __le32 dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
+                        req.wLength = 4;
+                        err = cdc_ncm_do_request(ctx, &req, &dwNtbInMaxSize, 0,
+                                                                NULL, 1000);
+                }
+                if (err)
+                        pr_debug("Setting NTB Input Size failed\n");
+        }
        /* verify maximum size of transmitted NTB in bytes */
        if ((ctx->tx_max <
            (CDC_NCM_MIN_HDR_SIZE + CDC_NCM_MIN_DATAGRAM_SIZE)) ||
@@ -297,47 +334,84 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
        /* additional configuration */
        /* set CRC Mode */
-        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE;
+        if (flags & USB_CDC_NCM_NCAP_CRC_MODE) {
-        req.bNotificationType = USB_CDC_SET_CRC_MODE;
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
-        req.wValue = cpu_to_le16(USB_CDC_NCM_CRC_NOT_APPENDED);
+                                                        USB_RECIP_INTERFACE;
-        req.wIndex = cpu_to_le16(iface_no);
+                req.bNotificationType = USB_CDC_SET_CRC_MODE;
-        req.wLength = 0;
+                req.wValue = cpu_to_le16(USB_CDC_NCM_CRC_NOT_APPENDED);
+                req.wIndex = cpu_to_le16(iface_no);
-        err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
+                req.wLength = 0;
-        if (err)
-                pr_debug("Setting CRC mode off failed\n");
+                err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
+                if (err)
+                        pr_debug("Setting CRC mode off failed\n");
+        }
-        /* set NTB format */
+        /* set NTB format, if both formats are supported */
-        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE;
+        if (ntb_fmt_supported & USB_CDC_NCM_NTH32_SIGN) {
-        req.bNotificationType = USB_CDC_SET_NTB_FORMAT;
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
-        req.wValue = cpu_to_le16(USB_CDC_NCM_NTB16_FORMAT);
+                                                        USB_RECIP_INTERFACE;
-        req.wIndex = cpu_to_le16(iface_no);
+                req.bNotificationType = USB_CDC_SET_NTB_FORMAT;
-        req.wLength = 0;
+                req.wValue = cpu_to_le16(USB_CDC_NCM_NTB16_FORMAT);
+                req.wIndex = cpu_to_le16(iface_no);
+                req.wLength = 0;
+                err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
+                if (err)
+                        pr_debug("Setting NTB format to 16-bit failed\n");
+        }
-        err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
+        ctx->max_datagram_size = CDC_NCM_MIN_DATAGRAM_SIZE;
-        if (err)
-                pr_debug("Setting NTB format to 16-bit failed\n");
        /* set Max Datagram Size (MTU) */
-        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_IN | USB_RECIP_INTERFACE;
+        if (flags & USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE) {
-        req.bNotificationType = USB_CDC_GET_MAX_DATAGRAM_SIZE;
+                __le16 max_datagram_size;
-        req.wValue = 0;
+                u16 eth_max_sz = le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);
-        req.wIndex = cpu_to_le16(iface_no);
-        req.wLength = cpu_to_le16(2);
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_IN |
+                                                        USB_RECIP_INTERFACE;
+                req.bNotificationType = USB_CDC_GET_MAX_DATAGRAM_SIZE;
+                req.wValue = 0;
+                req.wIndex = cpu_to_le16(iface_no);
+                req.wLength = cpu_to_le16(2);
+                err = cdc_ncm_do_request(ctx, &req, &max_datagram_size, 0, NULL,
+                                                                        1000);
+                if (err) {
+                        pr_debug("GET_MAX_DATAGRAM_SIZE failed, use size=%u\n",
+                                                CDC_NCM_MIN_DATAGRAM_SIZE);
+                } else {
+                        ctx->max_datagram_size = le16_to_cpu(max_datagram_size);
+                        /* Check Eth descriptor value */
+                        if (eth_max_sz < CDC_NCM_MAX_DATAGRAM_SIZE) {
+                                if (ctx->max_datagram_size > eth_max_sz)
+                                        ctx->max_datagram_size = eth_max_sz;
+                        } else {
+                                if (ctx->max_datagram_size >
+                                                CDC_NCM_MAX_DATAGRAM_SIZE)
+                                        ctx->max_datagram_size =
+                                                CDC_NCM_MAX_DATAGRAM_SIZE;
+                        }
-        err = cdc_ncm_do_request(ctx, &req, &max_datagram_size, 0, NULL, 1000);
+                        if (ctx->max_datagram_size < CDC_NCM_MIN_DATAGRAM_SIZE)
-        if (err) {
+                                ctx->max_datagram_size =
-                pr_debug(" GET_MAX_DATAGRAM_SIZE failed, using size=%u\n",
+                                        CDC_NCM_MIN_DATAGRAM_SIZE;
-                         CDC_NCM_MIN_DATAGRAM_SIZE);
-                /* use default */
+                        /* if value changed, update device */
-                ctx->max_datagram_size = CDC_NCM_MIN_DATAGRAM_SIZE;
+                        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
-        } else {
+                                                        USB_RECIP_INTERFACE;
-                ctx->max_datagram_size = le16_to_cpu(max_datagram_size);
+                        req.bNotificationType = USB_CDC_SET_MAX_DATAGRAM_SIZE;
+                        req.wValue = 0;
+                        req.wIndex = cpu_to_le16(iface_no);
+                        req.wLength = 2;
+                        max_datagram_size = cpu_to_le16(ctx->max_datagram_size);
+                        err = cdc_ncm_do_request(ctx, &req, &max_datagram_size,
+                                                                0, NULL, 1000);
+                        if (err)
+                                pr_debug("SET_MAX_DATAGRAM_SIZE failed\n");
+                }
-                if (ctx->max_datagram_size < CDC_NCM_MIN_DATAGRAM_SIZE)
-                        ctx->max_datagram_size = CDC_NCM_MIN_DATAGRAM_SIZE;
-                else if (ctx->max_datagram_size > CDC_NCM_MAX_DATAGRAM_SIZE)
-                        ctx->max_datagram_size = CDC_NCM_MAX_DATAGRAM_SIZE;
        }
        if (ctx->netdev->mtu != (ctx->max_datagram_size - ETH_HLEN))
@@ -466,19 +540,13 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
                        ctx->ether_desc =
                                        (const struct usb_cdc_ether_desc *)buf;
                        dev->hard_mtu =
                                le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);
-                        if (dev->hard_mtu <
+                        if (dev->hard_mtu < CDC_NCM_MIN_DATAGRAM_SIZE)
-                            (CDC_NCM_MIN_DATAGRAM_SIZE - ETH_HLEN))
+                                dev->hard_mtu = CDC_NCM_MIN_DATAGRAM_SIZE;
-                                dev->hard_mtu =
+                        else if (dev->hard_mtu > CDC_NCM_MAX_DATAGRAM_SIZE)
-                                        CDC_NCM_MIN_DATAGRAM_SIZE - ETH_HLEN;
+                                dev->hard_mtu = CDC_NCM_MAX_DATAGRAM_SIZE;
-                        else if (dev->hard_mtu >
-                                 (CDC_NCM_MAX_DATAGRAM_SIZE - ETH_HLEN))
-                                dev->hard_mtu =
-                                        CDC_NCM_MAX_DATAGRAM_SIZE - ETH_HLEN;
                        break;
                case USB_CDC_NCM_TYPE:
@@ -628,13 +696,13 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
        u32 offset;
        u32 last_offset;
        u16 n = 0;
-        u8 timeout = 0;
+        u8 ready2send = 0;
        /* if there is a remaining skb, it gets priority */
        if (skb != NULL)
                swap(skb, ctx->tx_rem_skb);
        else
-                timeout = 1;
+                ready2send = 1;
        /*
         * +----------------+
@@ -682,9 +750,10 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
        for (; n < ctx->tx_max_datagrams; n++) {
                /* check if end of transmit buffer is reached */
-                if (offset >= ctx->tx_max)
+                if (offset >= ctx->tx_max) {
+                        ready2send = 1;
                        break;
+                }
                /* compute maximum buffer size */
                rem = ctx->tx_max - offset;
@@ -711,9 +780,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
                                }
                                ctx->tx_rem_skb = skb;
                                skb = NULL;
+                                ready2send = 1;
-                                /* loop one more time */
-                                timeout = 1;
                        }
                        break;
                }
@@ -756,7 +823,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
                ctx->tx_curr_last_offset = last_offset;
                goto exit_no_skb;
-        } else if ((n < ctx->tx_max_datagrams) && (timeout == 0)) {
+        } else if ((n < ctx->tx_max_datagrams) && (ready2send == 0)) {
                /* wait for more frames */
                /* push variables */
                ctx->tx_curr_skb = skb_out;
@@ -813,7 +880,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
                                        cpu_to_le16(sizeof(ctx->tx_ncm.nth16));
        ctx->tx_ncm.nth16.wSequence = cpu_to_le16(ctx->tx_seq);
        ctx->tx_ncm.nth16.wBlockLength = cpu_to_le16(last_offset);
-        ctx->tx_ncm.nth16.wFpIndex = ALIGN(sizeof(struct usb_cdc_ncm_nth16),
+        ctx->tx_ncm.nth16.wNdpIndex = ALIGN(sizeof(struct usb_cdc_ncm_nth16),
                                                        ctx->tx_ndp_modulus);
        memcpy(skb_out->data, &(ctx->tx_ncm.nth16), sizeof(ctx->tx_ncm.nth16));
@@ -825,13 +892,13 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
        rem = sizeof(ctx->tx_ncm.ndp16) + ((ctx->tx_curr_frame_num + 1) *
                                        sizeof(struct usb_cdc_ncm_dpe16));
        ctx->tx_ncm.ndp16.wLength = cpu_to_le16(rem);
-        ctx->tx_ncm.ndp16.wNextFpIndex = 0; /* reserved */
+        ctx->tx_ncm.ndp16.wNextNdpIndex = 0; /* reserved */
-        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wFpIndex,
+        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wNdpIndex,
                                                &(ctx->tx_ncm.ndp16),
                                                sizeof(ctx->tx_ncm.ndp16));
-        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wFpIndex +
+        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wNdpIndex +
                                        sizeof(ctx->tx_ncm.ndp16),
                                        &(ctx->tx_ncm.dpe16),
                                        (ctx->tx_curr_frame_num + 1) *
@@ -868,15 +935,19 @@ static void cdc_ncm_tx_timeout(unsigned long arg)
        if (ctx->tx_timer_pending != 0) {
                ctx->tx_timer_pending--;
                restart = 1;
-        } else
+        } else {
                restart = 0;
+        }
        spin_unlock(&ctx->mtx);
-        if (restart)
+        if (restart) {
+                spin_lock(&ctx->mtx);
                cdc_ncm_tx_timeout_start(ctx);
-        else if (ctx->netdev != NULL)
+                spin_unlock(&ctx->mtx);
+        } else if (ctx->netdev != NULL) {
                usbnet_start_xmit(NULL, ctx->netdev);
+        }
 }
 static struct sk_buff *
@@ -900,7 +971,6 @@ cdc_ncm_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
        skb_out = cdc_ncm_fill_tx_frame(ctx, skb);
        if (ctx->tx_curr_skb != NULL)
                need_timer = 1;
-        spin_unlock(&ctx->mtx);
        /* Start timer, if there is a remaining skb */
        if (need_timer)
@@ -908,6 +978,8 @@ cdc_ncm_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
        if (skb_out)
                dev->net->stats.tx_packets += ctx->tx_curr_frame_num;
+        spin_unlock(&ctx->mtx);
        return skb_out;
 error:
@@ -956,7 +1028,7 @@ static int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in)
                goto error;
        }
-        temp = le16_to_cpu(ctx->rx_ncm.nth16.wFpIndex);
+        temp = le16_to_cpu(ctx->rx_ncm.nth16.wNdpIndex);
        if ((temp + sizeof(ctx->rx_ncm.ndp16)) > actlen) {
                pr_debug("invalid DPT16 index\n");
                goto error;
@@ -1020,8 +1092,8 @@ static int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in)
                if (((offset + temp) > actlen) ||
                    (temp > CDC_NCM_MAX_DATAGRAM_SIZE) || (temp < ETH_HLEN)) {
                        pr_debug("invalid frame detected (ignored)"
-                                "offset[%u]=%u, length=%u, skb=%p\n",
+                                        "offset[%u]=%u, length=%u, skb=%p\n",
-                                                        x, offset, temp, skb_in);
+                                        x, offset, temp, skb_in);
                        if (!x)
                                goto error;
                        break;
@@ -1043,10 +1115,10 @@ error:
 static void
 cdc_ncm_speed_change(struct cdc_ncm_ctx *ctx,
-                     struct connection_speed_change *data)
+                     struct usb_cdc_speed_change *data)
 {
-        uint32_t rx_speed = le32_to_cpu(data->USBitRate);
+        uint32_t rx_speed = le32_to_cpu(data->DLBitRRate);
-        uint32_t tx_speed = le32_to_cpu(data->DSBitRate);
+        uint32_t tx_speed = le32_to_cpu(data->ULBitRate);
        /*
         * Currently the USB-NET API does not support reporting the actual
@@ -1087,7 +1159,7 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
        /* test for split data in 8-byte chunks */
        if (test_and_clear_bit(EVENT_STS_SPLIT, &dev->flags)) {
                cdc_ncm_speed_change(ctx,
-                      (struct connection_speed_change *)urb->transfer_buffer);
+                      (struct usb_cdc_speed_change *)urb->transfer_buffer);
                return;
        }
@@ -1115,12 +1187,12 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
                break;
        case USB_CDC_NOTIFY_SPEED_CHANGE:
-                if (urb->actual_length <
+                if (urb->actual_length < (sizeof(*event) +
-                    (sizeof(*event) + sizeof(struct connection_speed_change)))
+                                        sizeof(struct usb_cdc_speed_change)))
                        set_bit(EVENT_STS_SPLIT, &dev->flags);
                else
                        cdc_ncm_speed_change(ctx,
-                                (struct connection_speed_change *) &event[1]);
+                                (struct usb_cdc_speed_change *) &event[1]);
                break;
        default:
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index bed8fcedff49..6d83812603b6 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2628,15 +2628,15 @@ exit:
 static void hso_free_tiomget(struct hso_serial *serial)
 {
-        struct hso_tiocmget *tiocmget = serial->tiocmget;
+        struct hso_tiocmget *tiocmget;
+        if (!serial)
+                return;
+        tiocmget = serial->tiocmget;
        if (tiocmget) {
-                if (tiocmget->urb) {
+                usb_free_urb(tiocmget->urb);
-                        usb_free_urb(tiocmget->urb);
+                tiocmget->urb = NULL;
-                        tiocmget->urb = NULL;
-                }
                serial->tiocmget = NULL;
                kfree(tiocmget);
        }
 }
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 5e98643a4a21..7dc84971f26f 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -406,6 +406,7 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth,
        if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) {
                err("Firmware too big: %zu", fw->size);
+                release_firmware(fw);
                return -ENOSPC;
        }
        data_len = fw->size;
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index ed9a41643ff4..95c41d56631c 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -931,8 +931,10 @@ fail_halt:
                if (urb != NULL) {
                        clear_bit (EVENT_RX_MEMORY, &dev->flags);
                        status = usb_autopm_get_interface(dev->intf);
-                        if (status < 0)
+                        if (status < 0) {
+                                usb_free_urb(urb);
                                goto fail_lowmem;
+                        }
                        if (rx_submit (dev, urb, GFP_KERNEL) == -ENOLINK)
                                resched = 0;
                        usb_autopm_put_interface(dev->intf);
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index cc83fa71c3ff..105d7f0630cc 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -403,17 +403,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
        if (tb[IFLA_ADDRESS] == NULL)
                random_ether_addr(dev->dev_addr);
-        if (tb[IFLA_IFNAME])
-                nla_strlcpy(dev->name, tb[IFLA_IFNAME], IFNAMSIZ);
-        else
-                snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d");
-        if (strchr(dev->name, '%')) {
-                err = dev_alloc_name(dev, dev->name);
-                if (err < 0)
-                        goto err_alloc_name;
-        }
        err = register_netdevice(dev);
        if (err < 0)
                goto err_register_dev;
@@ -433,7 +422,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
 err_register_dev:
        /* nothing to do */
-err_alloc_name:
 err_configure_peer:
        unregister_netdevice(peer);
        return err;
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 09cac704fdd7..0d6fec6b7d93 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2923,6 +2923,7 @@ static u16 wol_calc_crc(int size, u8 *pattern, u8 *mask_pattern)
 static int velocity_set_wol(struct velocity_info *vptr)
 {
        struct mac_regs __iomem *regs = vptr->mac_regs;
+        enum speed_opt spd_dpx = vptr->options.spd_dpx;
        static u8 buf[256];
        int i;
@@ -2968,6 +2969,12 @@ static int velocity_set_wol(struct velocity_info *vptr)
        writew(0x0FFF, &regs->WOLSRClr);
+        if (spd_dpx == SPD_DPX_1000_FULL)
+                goto mac_done;
+        if (spd_dpx != SPD_DPX_AUTO)
+                goto advertise_done;
        if (vptr->mii_status & VELOCITY_AUTONEG_ENABLE) {
                if (PHYID_GET_PHY_ID(vptr->phy_id) == PHYID_CICADA_CS8201)
                        MII_REG_BITS_ON(AUXCR_MDPPS, MII_NCONFIG, vptr->mac_regs);
@@ -2978,6 +2985,7 @@ static int velocity_set_wol(struct velocity_info *vptr)
        if (vptr->mii_status & VELOCITY_SPEED_1000)
                MII_REG_BITS_ON(BMCR_ANRESTART, MII_BMCR, vptr->mac_regs);
+advertise_done:
        BYTE_REG_BITS_ON(CHIPGCR_FCMODE, &regs->CHIPGCR);
        {
@@ -2987,6 +2995,7 @@ static int velocity_set_wol(struct velocity_info *vptr)
                writeb(GCR, &regs->CHIPGCR);
        }
+mac_done:
        BYTE_REG_BITS_OFF(ISR_PWEI, &regs->ISR);
        /* Turn on SWPTAG just before entering power mode */
        BYTE_REG_BITS_ON(STICKHW_SWPTAG, &regs->STICKHW);
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index aa2e69b9ff61..d7227539484e 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -361,7 +361,7 @@ enum  velocity_owner {
 #define MAC_REG_CHIPGSR     0x9C
 #define MAC_REG_TESTCFG     0x9D
 #define MAC_REG_DEBUG       0x9E
-#define MAC_REG_CHIPGCR     0x9F
+#define MAC_REG_CHIPGCR     0x9F        /* Chip Operation and Diagnostic Control */
 #define MAC_REG_WOLCR0_SET  0xA0
 #define MAC_REG_WOLCR1_SET  0xA1
 #define MAC_REG_PWCFG_SET   0xA2
@@ -848,10 +848,10 @@ enum  velocity_owner {
 *      Bits in CHIPGCR register
 */
-#define CHIPGCR_FCGMII      0x80        /* enable GMII mode */
+#define CHIPGCR_FCGMII      0x80        /* force GMII (else MII only) */
-#define CHIPGCR_FCFDX       0x40
+#define CHIPGCR_FCFDX       0x40        /* force full duplex */
 #define CHIPGCR_FCRESV      0x20
-#define CHIPGCR_FCMODE      0x10
+#define CHIPGCR_FCMODE      0x10        /* enable MAC forced mode */
 #define CHIPGCR_LPSOPT      0x08
 #define CHIPGCR_TM1US       0x04
 #define CHIPGCR_TM0US       0x02
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 90a23e410d1b..82dba5aaf423 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -446,6 +446,20 @@ static void skb_recv_done(struct virtqueue *rvq)
        }
 }
+static void virtnet_napi_enable(struct virtnet_info *vi)
+{
+        napi_enable(&vi->napi);
+        /* If all buffers were filled by other side before we napi_enabled, we
+         * won't get another interrupt, so process any outstanding packets
+         * now.  virtnet_poll wants re-enable the queue, so we disable here.
+         * We synchronize against interrupts via NAPI_STATE_SCHED */
+        if (napi_schedule_prep(&vi->napi)) {
+                virtqueue_disable_cb(vi->rvq);
+                __napi_schedule(&vi->napi);
+        }
+}
 static void refill_work(struct work_struct *work)
 {
        struct virtnet_info *vi;
@@ -454,7 +468,7 @@ static void refill_work(struct work_struct *work)
        vi = container_of(work, struct virtnet_info, refill.work);
        napi_disable(&vi->napi);
        still_empty = !try_fill_recv(vi, GFP_KERNEL);
-        napi_enable(&vi->napi);
+        virtnet_napi_enable(vi);
        /* In theory, this can happen: if we don't get any buffers in
         * we will *never* try to fill again. */
@@ -638,16 +652,7 @@ static int virtnet_open(struct net_device *dev)
 {
        struct virtnet_info *vi = netdev_priv(dev);
-        napi_enable(&vi->napi);
+        virtnet_napi_enable(vi);
-        /* If all buffers were filled by other side before we napi_enabled, we
-         * won't get another interrupt, so process any outstanding packets
-         * now.  virtnet_poll wants re-enable the queue, so we disable here.
-         * We synchronize against interrupts via NAPI_STATE_SCHED */
-        if (napi_schedule_prep(&vi->napi)) {
-                virtqueue_disable_cb(vi->rvq);
-                __napi_schedule(&vi->napi);
-        }
        return 0;
 }
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index d143e8b72b5b..cc14b4a75048 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -48,6 +48,9 @@ static atomic_t devices_found;
 static int enable_mq = 1;
 static int irq_share_mode;
+static void
+vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac);
 /*
 *    Enable/Disable the given intr
 */
@@ -139,9 +142,13 @@ vmxnet3_check_link(struct vmxnet3_adapter *adapter, bool affectTxQueue)
 {
        u32 ret;
        int i;
+        unsigned long flags;
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_LINK);
        ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
        adapter->link_speed = ret >> 16;
        if (ret & 1) { /* Link is up. */
                printk(KERN_INFO "%s: NIC Link is Up %d Mbps\n",
@@ -183,8 +190,10 @@ vmxnet3_process_events(struct vmxnet3_adapter *adapter)
        /* Check if there is an error on xmit/recv queues */
        if (events & (VMXNET3_ECR_TQERR | VMXNET3_ECR_RQERR)) {
+                spin_lock(&adapter->cmd_lock);
                VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                       VMXNET3_CMD_GET_QUEUE_STATUS);
+                spin_unlock(&adapter->cmd_lock);
                for (i = 0; i < adapter->num_tx_queues; i++)
                        if (adapter->tqd_start[i].status.stopped)
@@ -804,30 +813,25 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                                   skb_transport_header(skb))->doff * 4;
                ctx->copy_size = ctx->eth_ip_hdr_size + ctx->l4_hdr_size;
        } else {
-                unsigned int pull_size;
                if (skb->ip_summed == CHECKSUM_PARTIAL) {
                        ctx->eth_ip_hdr_size = skb_checksum_start_offset(skb);
                        if (ctx->ipv4) {
                                struct iphdr *iph = (struct iphdr *)
                                                    skb_network_header(skb);
-                                if (iph->protocol == IPPROTO_TCP) {
+                                if (iph->protocol == IPPROTO_TCP)
-                                        pull_size = ctx->eth_ip_hdr_size +
-                                                    sizeof(struct tcphdr);
-                                        if (unlikely(!pskb_may_pull(skb,
-                                                                pull_size))) {
-                                                goto err;
-                                        }
                                        ctx->l4_hdr_size = ((struct tcphdr *)
                                           skb_transport_header(skb))->doff * 4;
-                                } else if (iph->protocol == IPPROTO_UDP) {
+                                else if (iph->protocol == IPPROTO_UDP)
+                                        /*
+                                         * Use tcp header size so that bytes to
+                                         * be copied are more than required by
+                                         * the device.
+                                         */
                                        ctx->l4_hdr_size =
-                                                        sizeof(struct udphdr);
+                                                        sizeof(struct tcphdr);
-                                } else {
+                                else
                                        ctx->l4_hdr_size = 0;
-                                }
                        } else {
                                /* for simplicity, don't copy L4 headers */
                                ctx->l4_hdr_size = 0;
@@ -1859,18 +1863,14 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
        struct Vmxnet3_DriverShared *shared = adapter->shared;
        u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+        unsigned long flags;
        if (grp) {
                /* add vlan rx stripping. */
                if (adapter->netdev->features & NETIF_F_HW_VLAN_RX) {
                        int i;
-                        struct Vmxnet3_DSDevRead *devRead = &shared->devRead;
                        adapter->vlan_grp = grp;
-                        /* update FEATURES to device */
-                        devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
-                        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
-                                               VMXNET3_CMD_UPDATE_FEATURE);
                        /*
                         *  Clear entire vfTable; then enable untagged pkts.
                         *  Note: setting one entry in vfTable to non-zero turns
@@ -1880,8 +1880,10 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                                vfTable[i] = 0;
                        VMXNET3_SET_VFTABLE_ENTRY(vfTable, 0);
+                        spin_lock_irqsave(&adapter->cmd_lock, flags);
                        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                               VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+                        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
                } else {
                        printk(KERN_ERR "%s: vlan_rx_register when device has "
                               "no NETIF_F_HW_VLAN_RX\n", netdev->name);
@@ -1900,13 +1902,10 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                                 */
                                vfTable[i] = 0;
                        }
+                        spin_lock_irqsave(&adapter->cmd_lock, flags);
                        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                               VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+                        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
-                        /* update FEATURES to device */
-                        devRead->misc.uptFeatures &= ~UPT1_F_RXVLAN;
-                        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
-                                               VMXNET3_CMD_UPDATE_FEATURE);
                }
        }
 }
@@ -1939,10 +1938,13 @@ vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 {
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
        u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+        unsigned long flags;
        VMXNET3_SET_VFTABLE_ENTRY(vfTable, vid);
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                               VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 }
@@ -1951,10 +1953,13 @@ vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
 {
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
        u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+        unsigned long flags;
        VMXNET3_CLEAR_VFTABLE_ENTRY(vfTable, vid);
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                               VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 }
@@ -1985,6 +1990,7 @@ static void
 vmxnet3_set_mc(struct net_device *netdev)
 {
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        unsigned long flags;
        struct Vmxnet3_RxFilterConf *rxConf =
                                        &adapter->shared->devRead.rxFilterConf;
        u8 *new_table = NULL;
@@ -2020,6 +2026,7 @@ vmxnet3_set_mc(struct net_device *netdev)
                rxConf->mfTablePA = 0;
        }
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        if (new_mode != rxConf->rxMode) {
                rxConf->rxMode = cpu_to_le32(new_mode);
                VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
@@ -2028,6 +2035,7 @@ vmxnet3_set_mc(struct net_device *netdev)
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                               VMXNET3_CMD_UPDATE_MAC_FILTERS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
        kfree(new_table);
 }
@@ -2080,10 +2088,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
                devRead->misc.uptFeatures |= UPT1_F_LRO;
                devRead->misc.maxNumRxSG = cpu_to_le16(1 + MAX_SKB_FRAGS);
        }
-        if ((adapter->netdev->features & NETIF_F_HW_VLAN_RX) &&
+        if (adapter->netdev->features & NETIF_F_HW_VLAN_RX)
-            adapter->vlan_grp) {
                devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
-        }
        devRead->misc.mtu = cpu_to_le32(adapter->netdev->mtu);
        devRead->misc.queueDescPA = cpu_to_le64(adapter->queue_desc_pa);
@@ -2168,6 +2174,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
        /* rx filter settings */
        devRead->rxFilterConf.rxMode = 0;
        vmxnet3_restore_vlan(adapter);
+        vmxnet3_write_mac_addr(adapter, adapter->netdev->dev_addr);
        /* the rest are already zeroed */
 }
@@ -2177,6 +2185,7 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
 {
        int err, i;
        u32 ret;
+        unsigned long flags;
        dev_dbg(&adapter->netdev->dev, "%s: skb_buf_size %d, rx_buf_per_pkt %d,"
                " ring sizes %u %u %u\n", adapter->netdev->name,
@@ -2206,9 +2215,11 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
                               adapter->shared_pa));
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAH, VMXNET3_GET_ADDR_HI(
                               adapter->shared_pa));
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                               VMXNET3_CMD_ACTIVATE_DEV);
        ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
        if (ret != 0) {
                printk(KERN_ERR "Failed to activate dev %s: error %u\n",
@@ -2255,7 +2266,10 @@ rq_err:
 void
 vmxnet3_reset_dev(struct vmxnet3_adapter *adapter)
 {
+        unsigned long flags;
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_RESET_DEV);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 }
@@ -2263,12 +2277,15 @@ int
 vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter)
 {
        int i;
+        unsigned long flags;
        if (test_and_set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state))
                return 0;
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                               VMXNET3_CMD_QUIESCE_DEV);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
        vmxnet3_disable_all_intrs(adapter);
        for (i = 0; i < adapter->num_rx_queues; i++)
@@ -2426,7 +2443,7 @@ vmxnet3_adjust_rx_ring_size(struct vmxnet3_adapter *adapter)
        sz = adapter->rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN;
        ring0_size = adapter->rx_queue[0].rx_ring[0].size;
        ring0_size = (ring0_size + sz - 1) / sz * sz;
-        ring0_size = min_t(u32, rq->rx_ring[0].size, VMXNET3_RX_RING_MAX_SIZE /
+        ring0_size = min_t(u32, ring0_size, VMXNET3_RX_RING_MAX_SIZE /
                           sz * sz);
        ring1_size = adapter->rx_queue[0].rx_ring[1].size;
        comp_size = ring0_size + ring1_size;
@@ -2695,7 +2712,7 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter,
                        break;
                } else {
                        /* If fails to enable required number of MSI-x vectors
-                         * try enabling 3 of them. One each for rx, tx and event
+                         * try enabling minimum number of vectors required.
                         */
                        vectors = vector_threshold;
                        printk(KERN_ERR "Failed to enable %d MSI-X for %s, try"
@@ -2718,9 +2735,11 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
        u32 cfg;
        /* intr settings */
+        spin_lock(&adapter->cmd_lock);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                               VMXNET3_CMD_GET_CONF_INTR);
        cfg = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+        spin_unlock(&adapter->cmd_lock);
        adapter->intr.type = cfg & 0x3;
        adapter->intr.mask_mode = (cfg >> 2) & 0x3;
@@ -2755,7 +2774,7 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
                 */
                if (err == VMXNET3_LINUX_MIN_MSIX_VECT) {
                        if (adapter->share_intr != VMXNET3_INTR_BUDDYSHARE
-                            || adapter->num_rx_queues != 2) {
+                            || adapter->num_rx_queues != 1) {
                                adapter->share_intr = VMXNET3_INTR_TXSHARE;
                                printk(KERN_ERR "Number of rx queues : 1\n");
                                adapter->num_rx_queues = 1;
@@ -2905,6 +2924,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
        adapter->netdev = netdev;
        adapter->pdev = pdev;
+        spin_lock_init(&adapter->cmd_lock);
        adapter->shared = pci_alloc_consistent(adapter->pdev,
                          sizeof(struct Vmxnet3_DriverShared),
                          &adapter->shared_pa);
@@ -3108,11 +3128,15 @@ vmxnet3_suspend(struct device *device)
        u8 *arpreq;
        struct in_device *in_dev;
        struct in_ifaddr *ifa;
+        unsigned long flags;
        int i = 0;
        if (!netif_running(netdev))
                return 0;
+        for (i = 0; i < adapter->num_rx_queues; i++)
+                napi_disable(&adapter->rx_queue[i].napi);
        vmxnet3_disable_all_intrs(adapter);
        vmxnet3_free_irqs(adapter);
        vmxnet3_free_intr_resources(adapter);
@@ -3188,8 +3212,10 @@ skip_arp:
        adapter->shared->devRead.pmConfDesc.confPA = cpu_to_le64(virt_to_phys(
                                                                 pmConf));
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                               VMXNET3_CMD_UPDATE_PMCFG);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
        pci_save_state(pdev);
        pci_enable_wake(pdev, pci_choose_state(pdev, PMSG_SUSPEND),
@@ -3204,7 +3230,8 @@ skip_arp:
 static int
 vmxnet3_resume(struct device *device)
 {
-        int err;
+        int err, i = 0;
+        unsigned long flags;
        struct pci_dev *pdev = to_pci_dev(device);
        struct net_device *netdev = pci_get_drvdata(pdev);
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
@@ -3232,10 +3259,14 @@ vmxnet3_resume(struct device *device)
        pci_enable_wake(pdev, PCI_D0, 0);
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                               VMXNET3_CMD_UPDATE_PMCFG);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
        vmxnet3_alloc_intr_resources(adapter);
        vmxnet3_request_irqs(adapter);
+        for (i = 0; i < adapter->num_rx_queues; i++)
+                napi_enable(&adapter->rx_queue[i].napi);
        vmxnet3_enable_all_intrs(adapter);
        return 0;
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 8e17fc8a7fe7..81254be85b92 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -45,6 +45,7 @@ static int
 vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
 {
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        unsigned long flags;
        if (adapter->rxcsum != val) {
                adapter->rxcsum = val;
@@ -56,8 +57,10 @@ vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
                                adapter->shared->devRead.misc.uptFeatures &=
                                ~UPT1_F_RXCSUM;
+                        spin_lock_irqsave(&adapter->cmd_lock, flags);
                        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                               VMXNET3_CMD_UPDATE_FEATURE);
+                        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
                }
        }
        return 0;
@@ -68,76 +71,78 @@ vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
 static const struct vmxnet3_stat_desc
 vmxnet3_tq_dev_stats[] = {
        /* description,         offset */
-        { "TSO pkts tx",        offsetof(struct UPT1_TxStats, TSOPktsTxOK) },
+        { "Tx Queue#",        0 },
-        { "TSO bytes tx",       offsetof(struct UPT1_TxStats, TSOBytesTxOK) },
+        { "  TSO pkts tx",      offsetof(struct UPT1_TxStats, TSOPktsTxOK) },
-        { "ucast pkts tx",      offsetof(struct UPT1_TxStats, ucastPktsTxOK) },
+        { "  TSO bytes tx",     offsetof(struct UPT1_TxStats, TSOBytesTxOK) },
-        { "ucast bytes tx",     offsetof(struct UPT1_TxStats, ucastBytesTxOK) },
+        { "  ucast pkts tx",    offsetof(struct UPT1_TxStats, ucastPktsTxOK) },
-        { "mcast pkts tx",      offsetof(struct UPT1_TxStats, mcastPktsTxOK) },
+        { "  ucast bytes tx",   offsetof(struct UPT1_TxStats, ucastBytesTxOK) },
-        { "mcast bytes tx",     offsetof(struct UPT1_TxStats, mcastBytesTxOK) },
+        { "  mcast pkts tx",    offsetof(struct UPT1_TxStats, mcastPktsTxOK) },
-        { "bcast pkts tx",      offsetof(struct UPT1_TxStats, bcastPktsTxOK) },
+        { "  mcast bytes tx",   offsetof(struct UPT1_TxStats, mcastBytesTxOK) },
-        { "bcast bytes tx",     offsetof(struct UPT1_TxStats, bcastBytesTxOK) },
+        { "  bcast pkts tx",    offsetof(struct UPT1_TxStats, bcastPktsTxOK) },
-        { "pkts tx err",        offsetof(struct UPT1_TxStats, pktsTxError) },
+        { "  bcast bytes tx",   offsetof(struct UPT1_TxStats, bcastBytesTxOK) },
-        { "pkts tx discard",    offsetof(struct UPT1_TxStats, pktsTxDiscard) },
+        { "  pkts tx err",      offsetof(struct UPT1_TxStats, pktsTxError) },
+        { "  pkts tx discard",  offsetof(struct UPT1_TxStats, pktsTxDiscard) },
 };
 /* per tq stats maintained by the driver */
 static const struct vmxnet3_stat_desc
 vmxnet3_tq_driver_stats[] = {
        /* description,         offset */
-        {"drv dropped tx total", offsetof(struct vmxnet3_tq_driver_stats,
+        {"  drv dropped tx total",      offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_total) },
+                                                 drop_total) },
-        { "   too many frags",  offsetof(struct vmxnet3_tq_driver_stats,
+        { "     too many frags", offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_too_many_frags) },
+                                          drop_too_many_frags) },
-        { "   giant hdr",       offsetof(struct vmxnet3_tq_driver_stats,
+        { "     giant hdr",     offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_oversized_hdr) },
+                                         drop_oversized_hdr) },
-        { "   hdr err",         offsetof(struct vmxnet3_tq_driver_stats,
+        { "     hdr err",       offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_hdr_inspect_err) },
+                                         drop_hdr_inspect_err) },
-        { "   tso",             offsetof(struct vmxnet3_tq_driver_stats,
+        { "     tso",           offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_tso) },
+                                         drop_tso) },
-        { "ring full",          offsetof(struct vmxnet3_tq_driver_stats,
+        { "  ring full",        offsetof(struct vmxnet3_tq_driver_stats,
-                                        tx_ring_full) },
+                                         tx_ring_full) },
-        { "pkts linearized",    offsetof(struct vmxnet3_tq_driver_stats,
+        { "  pkts linearized",  offsetof(struct vmxnet3_tq_driver_stats,
-                                        linearized) },
+                                         linearized) },
-        { "hdr cloned",         offsetof(struct vmxnet3_tq_driver_stats,
+        { "  hdr cloned",       offsetof(struct vmxnet3_tq_driver_stats,
-                                        copy_skb_header) },
+                                         copy_skb_header) },
-        { "giant hdr",          offsetof(struct vmxnet3_tq_driver_stats,
+        { "  giant hdr",        offsetof(struct vmxnet3_tq_driver_stats,
-                                        oversized_hdr) },
+                                         oversized_hdr) },
 };
 /* per rq stats maintained by the device */
 static const struct vmxnet3_stat_desc
 vmxnet3_rq_dev_stats[] = {
-        { "LRO pkts rx",        offsetof(struct UPT1_RxStats, LROPktsRxOK) },
+        { "Rx Queue#",        0 },
-        { "LRO byte rx",        offsetof(struct UPT1_RxStats, LROBytesRxOK) },
+        { "  LRO pkts rx",      offsetof(struct UPT1_RxStats, LROPktsRxOK) },
-        { "ucast pkts rx",      offsetof(struct UPT1_RxStats, ucastPktsRxOK) },
+        { "  LRO byte rx",      offsetof(struct UPT1_RxStats, LROBytesRxOK) },
-        { "ucast bytes rx",     offsetof(struct UPT1_RxStats, ucastBytesRxOK) },
+        { "  ucast pkts rx",    offsetof(struct UPT1_RxStats, ucastPktsRxOK) },
-        { "mcast pkts rx",      offsetof(struct UPT1_RxStats, mcastPktsRxOK) },
+        { "  ucast bytes rx",   offsetof(struct UPT1_RxStats, ucastBytesRxOK) },
-        { "mcast bytes rx",     offsetof(struct UPT1_RxStats, mcastBytesRxOK) },
+        { "  mcast pkts rx",    offsetof(struct UPT1_RxStats, mcastPktsRxOK) },
-        { "bcast pkts rx",      offsetof(struct UPT1_RxStats, bcastPktsRxOK) },
+        { "  mcast bytes rx",   offsetof(struct UPT1_RxStats, mcastBytesRxOK) },
-        { "bcast bytes rx",     offsetof(struct UPT1_RxStats, bcastBytesRxOK) },
+        { "  bcast pkts rx",    offsetof(struct UPT1_RxStats, bcastPktsRxOK) },
-        { "pkts rx out of buf", offsetof(struct UPT1_RxStats, pktsRxOutOfBuf) },
+        { "  bcast bytes rx",   offsetof(struct UPT1_RxStats, bcastBytesRxOK) },
-        { "pkts rx err",        offsetof(struct UPT1_RxStats, pktsRxError) },
+        { "  pkts rx OOB",      offsetof(struct UPT1_RxStats, pktsRxOutOfBuf) },
+        { "  pkts rx err",      offsetof(struct UPT1_RxStats, pktsRxError) },
 };
 /* per rq stats maintained by the driver */
 static const struct vmxnet3_stat_desc
 vmxnet3_rq_driver_stats[] = {
        /* description,         offset */
-        { "drv dropped rx total", offsetof(struct vmxnet3_rq_driver_stats,
+        { "  drv dropped rx total", offsetof(struct vmxnet3_rq_driver_stats,
-                                           drop_total) },
+                                             drop_total) },
-        { "   err",            offsetof(struct vmxnet3_rq_driver_stats,
+        { "     err",           offsetof(struct vmxnet3_rq_driver_stats,
-                                        drop_err) },
+                                         drop_err) },
-        { "   fcs",            offsetof(struct vmxnet3_rq_driver_stats,
+        { "     fcs",           offsetof(struct vmxnet3_rq_driver_stats,
-                                        drop_fcs) },
+                                         drop_fcs) },
-        { "rx buf alloc fail", offsetof(struct vmxnet3_rq_driver_stats,
+        { "  rx buf alloc fail", offsetof(struct vmxnet3_rq_driver_stats,
-                                        rx_buf_alloc_failure) },
+                                          rx_buf_alloc_failure) },
 };
 /* gloabl stats maintained by the driver */
 static const struct vmxnet3_stat_desc
 vmxnet3_global_stats[] = {
        /* description,         offset */
-        { "tx timeout count",   offsetof(struct vmxnet3_adapter,
+        { "tx timeout count",   offsetof(struct vmxnet3_adapter,
                                         tx_timeout_count) }
 };
@@ -151,12 +156,15 @@ vmxnet3_get_stats(struct net_device *netdev)
        struct UPT1_TxStats *devTxStats;
        struct UPT1_RxStats *devRxStats;
        struct net_device_stats *net_stats = &netdev->stats;
+        unsigned long flags;
        int i;
        adapter = netdev_priv(netdev);
        /* Collect the dev stats into the shared area */
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
        memset(net_stats, 0, sizeof(*net_stats));
        for (i = 0; i < adapter->num_tx_queues; i++) {
@@ -193,12 +201,15 @@ vmxnet3_get_stats(struct net_device *netdev)
 static int
 vmxnet3_get_sset_count(struct net_device *netdev, int sset)
 {
+        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
        switch (sset) {
        case ETH_SS_STATS:
-                return ARRAY_SIZE(vmxnet3_tq_dev_stats) +
+                return (ARRAY_SIZE(vmxnet3_tq_dev_stats) +
-                        ARRAY_SIZE(vmxnet3_tq_driver_stats) +
+                        ARRAY_SIZE(vmxnet3_tq_driver_stats)) *
-                        ARRAY_SIZE(vmxnet3_rq_dev_stats) +
+                       adapter->num_tx_queues +
-                        ARRAY_SIZE(vmxnet3_rq_driver_stats) +
+                       (ARRAY_SIZE(vmxnet3_rq_dev_stats) +
+                        ARRAY_SIZE(vmxnet3_rq_driver_stats)) *
+                       adapter->num_rx_queues +
                        ARRAY_SIZE(vmxnet3_global_stats);
        default:
                return -EOPNOTSUPP;
@@ -206,10 +217,16 @@ vmxnet3_get_sset_count(struct net_device *netdev, int sset)
 }
+/* Should be multiple of 4 */
+#define NUM_TX_REGS     8
+#define NUM_RX_REGS     12
 static int
 vmxnet3_get_regs_len(struct net_device *netdev)
 {
-        return 20 * sizeof(u32);
+        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        return (adapter->num_tx_queues * NUM_TX_REGS * sizeof(u32) +
+                adapter->num_rx_queues * NUM_RX_REGS * sizeof(u32));
 }
@@ -240,29 +257,37 @@ vmxnet3_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
 static void
 vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf)
 {
+         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
        if (stringset == ETH_SS_STATS) {
-                int i;
+                int i, j;
+                for (j = 0; j < adapter->num_tx_queues; j++) {
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++) {
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++) {
-                        memcpy(buf, vmxnet3_tq_dev_stats[i].desc,
+                                memcpy(buf, vmxnet3_tq_dev_stats[i].desc,
-                               ETH_GSTRING_LEN);
+                                       ETH_GSTRING_LEN);
-                        buf += ETH_GSTRING_LEN;
+                                buf += ETH_GSTRING_LEN;
-                }
+                        }
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++) {
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats);
-                        memcpy(buf, vmxnet3_tq_driver_stats[i].desc,
+                             i++) {
-                               ETH_GSTRING_LEN);
+                                memcpy(buf, vmxnet3_tq_driver_stats[i].desc,
-                        buf += ETH_GSTRING_LEN;
+                                       ETH_GSTRING_LEN);
-                }
+                                buf += ETH_GSTRING_LEN;
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++) {
+                        }
-                        memcpy(buf, vmxnet3_rq_dev_stats[i].desc,
-                               ETH_GSTRING_LEN);
-                        buf += ETH_GSTRING_LEN;
                }
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++) {
-                        memcpy(buf, vmxnet3_rq_driver_stats[i].desc,
+                for (j = 0; j < adapter->num_rx_queues; j++) {
-                               ETH_GSTRING_LEN);
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++) {
-                        buf += ETH_GSTRING_LEN;
+                                memcpy(buf, vmxnet3_rq_dev_stats[i].desc,
+                                       ETH_GSTRING_LEN);
+                                buf += ETH_GSTRING_LEN;
+                        }
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats);
+                             i++) {
+                                memcpy(buf, vmxnet3_rq_driver_stats[i].desc,
+                                       ETH_GSTRING_LEN);
+                                buf += ETH_GSTRING_LEN;
+                        }
                }
                for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++) {
                        memcpy(buf, vmxnet3_global_stats[i].desc,
                                ETH_GSTRING_LEN);
@@ -277,6 +302,7 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data)
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
        u8 lro_requested = (data & ETH_FLAG_LRO) == 0 ? 0 : 1;
        u8 lro_present = (netdev->features & NETIF_F_LRO) == 0 ? 0 : 1;
+        unsigned long flags;
        if (data & ~ETH_FLAG_LRO)
                return -EOPNOTSUPP;
@@ -292,8 +318,10 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data)
                else
                        adapter->shared->devRead.misc.uptFeatures &=
                                                        ~UPT1_F_LRO;
+                spin_lock_irqsave(&adapter->cmd_lock, flags);
                VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                       VMXNET3_CMD_UPDATE_FEATURE);
+                spin_unlock_irqrestore(&adapter->cmd_lock, flags);
        }
        return 0;
 }
@@ -303,30 +331,41 @@ vmxnet3_get_ethtool_stats(struct net_device *netdev,
                          struct ethtool_stats *stats, u64  *buf)
 {
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        unsigned long flags;
        u8 *base;
        int i;
        int j = 0;
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
        /* this does assume each counter is 64-bit wide */
-/* TODO change this for multiple queues */
+        for (j = 0; j < adapter->num_tx_queues; j++) {
+                base = (u8 *)&adapter->tqd_start[j].stats;
-        base = (u8 *)&adapter->tqd_start[j].stats;
+                *buf++ = (u64)j;
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++)
+                for (i = 1; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++)
-                *buf++ = *(u64 *)(base + vmxnet3_tq_dev_stats[i].offset);
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_tq_dev_stats[i].offset);
-        base = (u8 *)&adapter->tx_queue[j].stats;
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++)
+                base = (u8 *)&adapter->tx_queue[j].stats;
-                *buf++ = *(u64 *)(base + vmxnet3_tq_driver_stats[i].offset);
+                for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++)
+                        *buf++ = *(u64 *)(base +
-        base = (u8 *)&adapter->rqd_start[j].stats;
+                                          vmxnet3_tq_driver_stats[i].offset);
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++)
+        }
-                *buf++ = *(u64 *)(base + vmxnet3_rq_dev_stats[i].offset);
-        base = (u8 *)&adapter->rx_queue[j].stats;
+        for (j = 0; j < adapter->num_tx_queues; j++) {
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++)
+                base = (u8 *)&adapter->rqd_start[j].stats;
-                *buf++ = *(u64 *)(base + vmxnet3_rq_driver_stats[i].offset);
+                *buf++ = (u64) j;
+                for (i = 1; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++)
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_rq_dev_stats[i].offset);
+                base = (u8 *)&adapter->rx_queue[j].stats;
+                for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++)
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_rq_driver_stats[i].offset);
+        }
        base = (u8 *)adapter;
        for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++)
@@ -339,7 +378,7 @@ vmxnet3_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p)
 {
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
        u32 *buf = p;
-        int i = 0;
+        int i = 0, j = 0;
        memset(p, 0, vmxnet3_get_regs_len(netdev));
@@ -348,31 +387,35 @@ vmxnet3_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p)
        /* Update vmxnet3_get_regs_len if we want to dump more registers */
        /* make each ring use multiple of 16 bytes */
-/* TODO change this for multiple queues */
+        for (i = 0; i < adapter->num_tx_queues; i++) {
-        buf[0] = adapter->tx_queue[i].tx_ring.next2fill;
+                buf[j++] = adapter->tx_queue[i].tx_ring.next2fill;
-        buf[1] = adapter->tx_queue[i].tx_ring.next2comp;
+                buf[j++] = adapter->tx_queue[i].tx_ring.next2comp;
-        buf[2] = adapter->tx_queue[i].tx_ring.gen;
+                buf[j++] = adapter->tx_queue[i].tx_ring.gen;
-        buf[3] = 0;
+                buf[j++] = 0;
-        buf[4] = adapter->tx_queue[i].comp_ring.next2proc;
+                buf[j++] = adapter->tx_queue[i].comp_ring.next2proc;
-        buf[5] = adapter->tx_queue[i].comp_ring.gen;
+                buf[j++] = adapter->tx_queue[i].comp_ring.gen;
-        buf[6] = adapter->tx_queue[i].stopped;
+                buf[j++] = adapter->tx_queue[i].stopped;
-        buf[7] = 0;
+                buf[j++] = 0;
+        }
-        buf[8] = adapter->rx_queue[i].rx_ring[0].next2fill;
-        buf[9] = adapter->rx_queue[i].rx_ring[0].next2comp;
+        for (i = 0; i < adapter->num_rx_queues; i++) {
-        buf[10] = adapter->rx_queue[i].rx_ring[0].gen;
+                buf[j++] = adapter->rx_queue[i].rx_ring[0].next2fill;
-        buf[11] = 0;
+                buf[j++] = adapter->rx_queue[i].rx_ring[0].next2comp;
+                buf[j++] = adapter->rx_queue[i].rx_ring[0].gen;
-        buf[12] = adapter->rx_queue[i].rx_ring[1].next2fill;
+                buf[j++] = 0;
-        buf[13] = adapter->rx_queue[i].rx_ring[1].next2comp;
-        buf[14] = adapter->rx_queue[i].rx_ring[1].gen;
+                buf[j++] = adapter->rx_queue[i].rx_ring[1].next2fill;
-        buf[15] = 0;
+                buf[j++] = adapter->rx_queue[i].rx_ring[1].next2comp;
+                buf[j++] = adapter->rx_queue[i].rx_ring[1].gen;
-        buf[16] = adapter->rx_queue[i].comp_ring.next2proc;
+                buf[j++] = 0;
-        buf[17] = adapter->rx_queue[i].comp_ring.gen;
-        buf[18] = 0;
+                buf[j++] = adapter->rx_queue[i].comp_ring.next2proc;
-        buf[19] = 0;
+                buf[j++] = adapter->rx_queue[i].comp_ring.gen;
+                buf[j++] = 0;
+                buf[j++] = 0;
+        }
 }
@@ -574,6 +617,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
                      const struct ethtool_rxfh_indir *p)
 {
        unsigned int i;
+        unsigned long flags;
        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
        struct UPT1_RSSConf *rssConf = adapter->rss_conf;
@@ -592,8 +636,10 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
        for (i = 0; i < rssConf->indTableSize; i++)
                rssConf->indTable[i] = p->ring_index[i];
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                               VMXNET3_CMD_UPDATE_RSSIDT);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
        return 0;
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 7fadeed37f03..fb5d245ac878 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -68,10 +68,10 @@
 /*
 * Version numbers
 */
-#define VMXNET3_DRIVER_VERSION_STRING   "1.0.16.0-k"
+#define VMXNET3_DRIVER_VERSION_STRING   "1.0.25.0-k"
 /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
-#define VMXNET3_DRIVER_VERSION_NUM      0x01001000
+#define VMXNET3_DRIVER_VERSION_NUM      0x01001900
 #if defined(CONFIG_PCI_MSI)
        /* RSS only makes sense if MSI-X is supported. */
@@ -289,7 +289,7 @@ struct vmxnet3_rx_queue {
 #define VMXNET3_LINUX_MAX_MSIX_VECT     (VMXNET3_DEVICE_MAX_TX_QUEUES + \
                                         VMXNET3_DEVICE_MAX_RX_QUEUES + 1)
-#define VMXNET3_LINUX_MIN_MSIX_VECT     3    /* 1 for each : tx, rx and event */
+#define VMXNET3_LINUX_MIN_MSIX_VECT     2 /* 1 for tx-rx pair and 1 for event */
 struct vmxnet3_intr {
@@ -317,6 +317,7 @@ struct vmxnet3_adapter {
        struct vmxnet3_rx_queue         rx_queue[VMXNET3_DEVICE_MAX_RX_QUEUES];
        struct vlan_group               *vlan_grp;
        struct vmxnet3_intr             intr;
+        spinlock_t                      cmd_lock;
        struct Vmxnet3_DriverShared     *shared;
        struct Vmxnet3_PMConf           *pm_conf;
        struct Vmxnet3_TxQueueDesc      *tqd_start;     /* all tx queue desc */
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index 01c05f53e2f9..e74e4b42592d 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -387,8 +387,8 @@ vxge_hw_vpath_eprom_img_ver_get(struct __vxge_hw_device *hldev,
                data1 = steer_ctrl = 0;
                status = vxge_hw_vpath_fw_api(vpath,
-                        VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO,
                        VXGE_HW_FW_API_GET_EPROM_REV,
+                        VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO,
                        0, &data0, &data1, &steer_ctrl);
                if (status != VXGE_HW_OK)
                        break;
@@ -2868,6 +2868,8 @@ __vxge_hw_ring_create(struct __vxge_hw_vpath_handle *vp,
        ring->rxd_init = attr->rxd_init;
        ring->rxd_term = attr->rxd_term;
        ring->buffer_mode = config->buffer_mode;
+        ring->tim_rti_cfg1_saved = vp->vpath->tim_rti_cfg1_saved;
+        ring->tim_rti_cfg3_saved = vp->vpath->tim_rti_cfg3_saved;
        ring->rxds_limit = config->rxds_limit;
        ring->rxd_size = vxge_hw_ring_rxd_size_get(config->buffer_mode);
@@ -3511,6 +3513,8 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
        /* apply "interrupts per txdl" attribute */
        fifo->interrupt_type = VXGE_HW_FIFO_TXD_INT_TYPE_UTILZ;
+        fifo->tim_tti_cfg1_saved = vpath->tim_tti_cfg1_saved;
+        fifo->tim_tti_cfg3_saved = vpath->tim_tti_cfg3_saved;
        if (fifo->config->intr)
                fifo->interrupt_type = VXGE_HW_FIFO_TXD_INT_TYPE_PER_LIST;
@@ -3690,7 +3694,7 @@ __vxge_hw_vpath_rts_table_get(struct __vxge_hw_vpath_handle *vp,
        if (status != VXGE_HW_OK)
                goto exit;
-        if ((rts_table != VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DA) ||
+        if ((rts_table != VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DA) &&
            (rts_table !=
             VXGE_HW_RTS_ACS_STEER_CTRL_DATA_STRUCT_SEL_RTH_MULTI_IT))
                *data1 = 0;
@@ -4377,6 +4381,8 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
                }
                writeq(val64, &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
+                vpath->tim_tti_cfg1_saved = val64;
                val64 = readq(&vp_reg->tim_cfg2_int_num[VXGE_HW_VPATH_INTR_TX]);
                if (config->tti.uec_a != VXGE_HW_USE_FLASH_DEFAULT) {
@@ -4433,6 +4439,7 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
                }
                writeq(val64, &vp_reg->tim_cfg3_int_num[VXGE_HW_VPATH_INTR_TX]);
+                vpath->tim_tti_cfg3_saved = val64;
        }
        if (config->ring.enable == VXGE_HW_RING_ENABLE) {
@@ -4481,6 +4488,8 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
                }
                writeq(val64, &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_RX]);
+                vpath->tim_rti_cfg1_saved = val64;
                val64 = readq(&vp_reg->tim_cfg2_int_num[VXGE_HW_VPATH_INTR_RX]);
                if (config->rti.uec_a != VXGE_HW_USE_FLASH_DEFAULT) {
@@ -4537,6 +4546,7 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
                }
                writeq(val64, &vp_reg->tim_cfg3_int_num[VXGE_HW_VPATH_INTR_RX]);
+                vpath->tim_rti_cfg3_saved = val64;
        }
        val64 = 0;
@@ -4555,26 +4565,6 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
        return status;
 }
-void vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id)
-{
-        struct __vxge_hw_virtualpath *vpath;
-        struct vxge_hw_vpath_reg __iomem *vp_reg;
-        struct vxge_hw_vp_config *config;
-        u64 val64;
-        vpath = &hldev->virtual_paths[vp_id];
-        vp_reg = vpath->vp_reg;
-        config = vpath->vp_config;
-        if (config->fifo.enable == VXGE_HW_FIFO_ENABLE &&
-            config->tti.timer_ci_en != VXGE_HW_TIM_TIMER_CI_ENABLE) {
-                config->tti.timer_ci_en = VXGE_HW_TIM_TIMER_CI_ENABLE;
-                val64 = readq(&vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
-                val64 |= VXGE_HW_TIM_CFG1_INT_NUM_TIMER_CI;
-                writeq(val64, &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
-        }
-}
 /*
 * __vxge_hw_vpath_initialize
 * This routine is the final phase of init which initializes the
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h
index e249e288d160..3c53aa732c9d 100644
--- a/drivers/net/vxge/vxge-config.h
+++ b/drivers/net/vxge/vxge-config.h
@@ -682,6 +682,10 @@ struct __vxge_hw_virtualpath {
        u32                             vsport_number;
        u32                             max_kdfc_db;
        u32                             max_nofl_db;
+        u64                             tim_tti_cfg1_saved;
+        u64                             tim_tti_cfg3_saved;
+        u64                             tim_rti_cfg1_saved;
+        u64                             tim_rti_cfg3_saved;
        struct __vxge_hw_ring *____cacheline_aligned ringh;
        struct __vxge_hw_fifo *____cacheline_aligned fifoh;
@@ -921,6 +925,9 @@ struct __vxge_hw_ring {
        u32                                     doorbell_cnt;
        u32                                     total_db_cnt;
        u64                                     rxds_limit;
+        u32                                     rtimer;
+        u64                                     tim_rti_cfg1_saved;
+        u64                                     tim_rti_cfg3_saved;
        enum vxge_hw_status (*callback)(
                        struct __vxge_hw_ring *ringh,
@@ -1000,6 +1007,9 @@ struct __vxge_hw_fifo {
        u32                                     per_txdl_space;
        u32                                     vp_id;
        u32                                     tx_intr_num;
+        u32                                     rtimer;
+        u64                                     tim_tti_cfg1_saved;
+        u64                                     tim_tti_cfg3_saved;
        enum vxge_hw_status (*callback)(
                        struct __vxge_hw_fifo *fifo_handle,
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index c81a6512c683..e40f619b62b1 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -371,9 +371,6 @@ vxge_rx_1b_compl(struct __vxge_hw_ring *ringh, void *dtr,
        struct vxge_hw_ring_rxd_info ext_info;
        vxge_debug_entryexit(VXGE_TRACE, "%s: %s:%d",
                ring->ndev->name, __func__, __LINE__);
-        ring->pkts_processed = 0;
-        vxge_hw_ring_replenish(ringh);
        do {
                prefetch((char *)dtr + L1_CACHE_BYTES);
@@ -1588,6 +1585,36 @@ static int vxge_reset_vpath(struct vxgedev *vdev, int vp_id)
        return ret;
 }
+/* Configure CI */
+static void vxge_config_ci_for_tti_rti(struct vxgedev *vdev)
+{
+        int i = 0;
+        /* Enable CI for RTI */
+        if (vdev->config.intr_type == MSI_X) {
+                for (i = 0; i < vdev->no_of_vpath; i++) {
+                        struct __vxge_hw_ring *hw_ring;
+                        hw_ring = vdev->vpaths[i].ring.handle;
+                        vxge_hw_vpath_dynamic_rti_ci_set(hw_ring);
+                }
+        }
+        /* Enable CI for TTI */
+        for (i = 0; i < vdev->no_of_vpath; i++) {
+                struct __vxge_hw_fifo *hw_fifo = vdev->vpaths[i].fifo.handle;
+                vxge_hw_vpath_tti_ci_set(hw_fifo);
+                /*
+                 * For Inta (with or without napi), Set CI ON for only one
+                 * vpath. (Have only one free running timer).
+                 */
+                if ((vdev->config.intr_type == INTA) && (i == 0))
+                        break;
+        }
+        return;
+}
 static int do_vxge_reset(struct vxgedev *vdev, int event)
 {
        enum vxge_hw_status status;
@@ -1753,6 +1780,9 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
                netif_tx_wake_all_queues(vdev->ndev);
        }
+        /* configure CI */
+        vxge_config_ci_for_tti_rti(vdev);
 out:
        vxge_debug_entryexit(VXGE_TRACE,
                "%s:%d  Exiting...", __func__, __LINE__);
@@ -1793,22 +1823,29 @@ static void vxge_reset(struct work_struct *work)
 */
 static int vxge_poll_msix(struct napi_struct *napi, int budget)
 {
-        struct vxge_ring *ring =
+        struct vxge_ring *ring = container_of(napi, struct vxge_ring, napi);
-                container_of(napi, struct vxge_ring, napi);
+        int pkts_processed;
        int budget_org = budget;
-        ring->budget = budget;
+        ring->budget = budget;
+        ring->pkts_processed = 0;
        vxge_hw_vpath_poll_rx(ring->handle);
+        pkts_processed = ring->pkts_processed;
        if (ring->pkts_processed < budget_org) {
                napi_complete(napi);
                /* Re enable the Rx interrupts for the vpath */
                vxge_hw_channel_msix_unmask(
                                (struct __vxge_hw_channel *)ring->handle,
                                ring->rx_vector_no);
+                mmiowb();
        }
-        return ring->pkts_processed;
+        /* We are copying and returning the local variable, in case if after
+         * clearing the msix interrupt above, if the interrupt fires right
+         * away which can preempt this NAPI thread */
+        return pkts_processed;
 }
 static int vxge_poll_inta(struct napi_struct *napi, int budget)
@@ -1824,6 +1861,7 @@ static int vxge_poll_inta(struct napi_struct *napi, int budget)
        for (i = 0; i < vdev->no_of_vpath; i++) {
                ring = &vdev->vpaths[i].ring;
                ring->budget = budget;
+                ring->pkts_processed = 0;
                vxge_hw_vpath_poll_rx(ring->handle);
                pkts_processed += ring->pkts_processed;
                budget -= ring->pkts_processed;
@@ -2054,6 +2092,7 @@ static int vxge_open_vpaths(struct vxgedev *vdev)
                                        netdev_get_tx_queue(vdev->ndev, 0);
                        vpath->fifo.indicate_max_pkts =
                                vdev->config.fifo_indicate_max_pkts;
+                        vpath->fifo.tx_vector_no = 0;
                        vpath->ring.rx_vector_no = 0;
                        vpath->ring.rx_csum = vdev->rx_csum;
                        vpath->ring.rx_hwts = vdev->rx_hwts;
@@ -2079,6 +2118,61 @@ static int vxge_open_vpaths(struct vxgedev *vdev)
        return VXGE_HW_OK;
 }
+/**
+ *  adaptive_coalesce_tx_interrupts - Changes the interrupt coalescing
+ *  if the interrupts are not within a range
+ *  @fifo: pointer to transmit fifo structure
+ *  Description: The function changes boundary timer and restriction timer
+ *  value depends on the traffic
+ *  Return Value: None
+ */
+static void adaptive_coalesce_tx_interrupts(struct vxge_fifo *fifo)
+{
+        fifo->interrupt_count++;
+        if (jiffies > fifo->jiffies + HZ / 100) {
+                struct __vxge_hw_fifo *hw_fifo = fifo->handle;
+                fifo->jiffies = jiffies;
+                if (fifo->interrupt_count > VXGE_T1A_MAX_TX_INTERRUPT_COUNT &&
+                    hw_fifo->rtimer != VXGE_TTI_RTIMER_ADAPT_VAL) {
+                        hw_fifo->rtimer = VXGE_TTI_RTIMER_ADAPT_VAL;
+                        vxge_hw_vpath_dynamic_tti_rtimer_set(hw_fifo);
+                } else if (hw_fifo->rtimer != 0) {
+                        hw_fifo->rtimer = 0;
+                        vxge_hw_vpath_dynamic_tti_rtimer_set(hw_fifo);
+                }
+                fifo->interrupt_count = 0;
+        }
+}
+/**
+ *  adaptive_coalesce_rx_interrupts - Changes the interrupt coalescing
+ *  if the interrupts are not within a range
+ *  @ring: pointer to receive ring structure
+ *  Description: The function increases of decreases the packet counts within
+ *  the ranges of traffic utilization, if the interrupts due to this ring are
+ *  not within a fixed range.
+ *  Return Value: Nothing
+ */
+static void adaptive_coalesce_rx_interrupts(struct vxge_ring *ring)
+{
+        ring->interrupt_count++;
+        if (jiffies > ring->jiffies + HZ / 100) {
+                struct __vxge_hw_ring *hw_ring = ring->handle;
+                ring->jiffies = jiffies;
+                if (ring->interrupt_count > VXGE_T1A_MAX_INTERRUPT_COUNT &&
+                    hw_ring->rtimer != VXGE_RTI_RTIMER_ADAPT_VAL) {
+                        hw_ring->rtimer = VXGE_RTI_RTIMER_ADAPT_VAL;
+                        vxge_hw_vpath_dynamic_rti_rtimer_set(hw_ring);
+                } else if (hw_ring->rtimer != 0) {
+                        hw_ring->rtimer = 0;
+                        vxge_hw_vpath_dynamic_rti_rtimer_set(hw_ring);
+                }
+                ring->interrupt_count = 0;
+        }
+}
 /*
 *  vxge_isr_napi
 *  @irq: the irq of the device.
@@ -2139,24 +2233,39 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id)
 #ifdef CONFIG_PCI_MSI
-static irqreturn_t
+static irqreturn_t vxge_tx_msix_handle(int irq, void *dev_id)
-vxge_tx_msix_handle(int irq, void *dev_id)
 {
        struct vxge_fifo *fifo = (struct vxge_fifo *)dev_id;
+        adaptive_coalesce_tx_interrupts(fifo);
+        vxge_hw_channel_msix_mask((struct __vxge_hw_channel *)fifo->handle,
+                                  fifo->tx_vector_no);
+        vxge_hw_channel_msix_clear((struct __vxge_hw_channel *)fifo->handle,
+                                   fifo->tx_vector_no);
        VXGE_COMPLETE_VPATH_TX(fifo);
+        vxge_hw_channel_msix_unmask((struct __vxge_hw_channel *)fifo->handle,
+                                    fifo->tx_vector_no);
+        mmiowb();
        return IRQ_HANDLED;
 }
-static irqreturn_t
+static irqreturn_t vxge_rx_msix_napi_handle(int irq, void *dev_id)
-vxge_rx_msix_napi_handle(int irq, void *dev_id)
 {
        struct vxge_ring *ring = (struct vxge_ring *)dev_id;
-        /* MSIX_IDX for Rx is 1 */
+        adaptive_coalesce_rx_interrupts(ring);
        vxge_hw_channel_msix_mask((struct __vxge_hw_channel *)ring->handle,
-                                        ring->rx_vector_no);
+                                  ring->rx_vector_no);
+        vxge_hw_channel_msix_clear((struct __vxge_hw_channel *)ring->handle,
+                                   ring->rx_vector_no);
        napi_schedule(&ring->napi);
        return IRQ_HANDLED;
@@ -2173,14 +2282,20 @@ vxge_alarm_msix_handle(int irq, void *dev_id)
                VXGE_HW_VPATH_MSIX_ACTIVE) + VXGE_ALARM_MSIX_ID;
        for (i = 0; i < vdev->no_of_vpath; i++) {
+                /* Reduce the chance of loosing alarm interrupts by masking
+                 * the vector. A pending bit will be set if an alarm is
+                 * generated and on unmask the interrupt will be fired.
+                 */
                vxge_hw_vpath_msix_mask(vdev->vpaths[i].handle, msix_id);
+                vxge_hw_vpath_msix_clear(vdev->vpaths[i].handle, msix_id);
+                mmiowb();
                status = vxge_hw_vpath_alarm_process(vdev->vpaths[i].handle,
                        vdev->exec_mode);
                if (status == VXGE_HW_OK) {
                        vxge_hw_vpath_msix_unmask(vdev->vpaths[i].handle,
-                                        msix_id);
+                                                  msix_id);
+                        mmiowb();
                        continue;
                }
                vxge_debug_intr(VXGE_ERR,
@@ -2299,6 +2414,9 @@ static int vxge_enable_msix(struct vxgedev *vdev)
                        vpath->ring.rx_vector_no = (vpath->device_id *
                                                VXGE_HW_VPATH_MSIX_ACTIVE) + 1;
+                        vpath->fifo.tx_vector_no = (vpath->device_id *
+                                                VXGE_HW_VPATH_MSIX_ACTIVE);
                        vxge_hw_vpath_msix_set(vpath->handle, tim_msix_id,
                                               VXGE_ALARM_MSIX_ID);
                }
@@ -2474,8 +2592,9 @@ INTA_MODE:
                        "%s:vxge:INTA", vdev->ndev->name);
                vxge_hw_device_set_intr_type(vdev->devh,
                        VXGE_HW_INTR_MODE_IRQLINE);
-                vxge_hw_vpath_tti_ci_set(vdev->devh,
-                        vdev->vpaths[0].device_id);
+                vxge_hw_vpath_tti_ci_set(vdev->vpaths[0].fifo.handle);
                ret = request_irq((int) vdev->pdev->irq,
                        vxge_isr_napi,
                        IRQF_SHARED, vdev->desc[0], vdev);
@@ -2745,6 +2864,10 @@ static int vxge_open(struct net_device *dev)
        }
        netif_tx_start_all_queues(vdev->ndev);
+        /* configure CI */
+        vxge_config_ci_for_tti_rti(vdev);
        goto out0;
 out2:
@@ -3348,7 +3471,7 @@ static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
                vxge_debug_init(VXGE_ERR,
                        "%s: vpath memory allocation failed",
                        vdev->ndev->name);
-                ret = -ENODEV;
+                ret = -ENOMEM;
                goto _out1;
        }
@@ -3369,11 +3492,11 @@ static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
        if (vdev->config.gro_enable)
                ndev->features |= NETIF_F_GRO;
-        if (register_netdev(ndev)) {
+        ret = register_netdev(ndev);
+        if (ret) {
                vxge_debug_init(vxge_hw_device_trace_level_get(hldev),
                        "%s: %s : device registration failed!",
                        ndev->name, __func__);
-                ret = -ENODEV;
                goto _out2;
        }
@@ -3444,6 +3567,11 @@ static void vxge_device_unregister(struct __vxge_hw_device *hldev)
        /* in 2.6 will call stop() if device is up */
        unregister_netdev(dev);
+        kfree(vdev->vpaths);
+        /* we are safe to free it now */
+        free_netdev(dev);
        vxge_debug_init(vdev->level_trace, "%s: ethernet device unregistered",
                        buf);
        vxge_debug_entryexit(vdev->level_trace, "%s: %s:%d  Exiting...", buf,
@@ -3799,7 +3927,7 @@ static void __devinit vxge_device_config_init(
                break;
        case MSI_X:
-                device_config->intr_mode = VXGE_HW_INTR_MODE_MSIX;
+                device_config->intr_mode = VXGE_HW_INTR_MODE_MSIX_ONE_SHOT;
                break;
        }
@@ -4335,10 +4463,10 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                goto _exit1;
        }
-        if (pci_request_region(pdev, 0, VXGE_DRIVER_NAME)) {
+        ret = pci_request_region(pdev, 0, VXGE_DRIVER_NAME);
+        if (ret) {
                vxge_debug_init(VXGE_ERR,
                        "%s : request regions failed", __func__);
-                ret = -ENODEV;
                goto _exit1;
        }
@@ -4446,7 +4574,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                        if (!img[i].is_valid)
                                break;
                        vxge_debug_init(VXGE_TRACE, "%s: EPROM %d, version "
-                                        "%d.%d.%d.%d\n", VXGE_DRIVER_NAME, i,
+                                        "%d.%d.%d.%d", VXGE_DRIVER_NAME, i,
                                        VXGE_EPROM_IMG_MAJOR(img[i].version),
                                        VXGE_EPROM_IMG_MINOR(img[i].version),
                                        VXGE_EPROM_IMG_FIX(img[i].version),
@@ -4643,8 +4771,9 @@ _exit6:
 _exit5:
        vxge_device_unregister(hldev);
 _exit4:
-        pci_disable_sriov(pdev);
+        pci_set_drvdata(pdev, NULL);
        vxge_hw_device_terminate(hldev);
+        pci_disable_sriov(pdev);
 _exit3:
        iounmap(attr.bar0);
 _exit2:
@@ -4655,7 +4784,7 @@ _exit0:
        kfree(ll_config);
        kfree(device_config);
        driver_config->config_dev_cnt--;
-        pci_set_drvdata(pdev, NULL);
+        driver_config->total_dev_cnt--;
        return ret;
 }
@@ -4668,45 +4797,34 @@ _exit0:
 static void __devexit vxge_remove(struct pci_dev *pdev)
 {
        struct __vxge_hw_device *hldev;
-        struct vxgedev *vdev = NULL;
+        struct vxgedev *vdev;
-        struct net_device *dev;
+        int i;
-        int i = 0;
        hldev = pci_get_drvdata(pdev);
        if (hldev == NULL)
                return;
-        dev = hldev->ndev;
+        vdev = netdev_priv(hldev->ndev);
-        vdev = netdev_priv(dev);
        vxge_debug_entryexit(vdev->level_trace, "%s:%d", __func__, __LINE__);
        vxge_debug_init(vdev->level_trace, "%s : removing PCI device...",
                        __func__);
-        vxge_device_unregister(hldev);
-        for (i = 0; i < vdev->no_of_vpath; i++) {
+        for (i = 0; i < vdev->no_of_vpath; i++)
                vxge_free_mac_add_list(&vdev->vpaths[i]);
-                vdev->vpaths[i].mcast_addr_cnt = 0;
-                vdev->vpaths[i].mac_addr_cnt = 0;
-        }
-        kfree(vdev->vpaths);
+        vxge_device_unregister(hldev);
+        pci_set_drvdata(pdev, NULL);
+        /* Do not call pci_disable_sriov here, as it will break child devices */
+        vxge_hw_device_terminate(hldev);
        iounmap(vdev->bar0);
+        pci_release_region(pdev, 0);
-        /* we are safe to free it now */
+        pci_disable_device(pdev);
-        free_netdev(dev);
+        driver_config->config_dev_cnt--;
+        driver_config->total_dev_cnt--;
        vxge_debug_init(vdev->level_trace, "%s:%d Device unregistered",
                        __func__, __LINE__);
-        vxge_hw_device_terminate(hldev);
-        pci_disable_device(pdev);
-        pci_release_region(pdev, 0);
-        pci_set_drvdata(pdev, NULL);
        vxge_debug_entryexit(vdev->level_trace, "%s:%d  Exiting...", __func__,
                             __LINE__);
 }
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h
index 5746fedc356f..40474f0da576 100644
--- a/drivers/net/vxge/vxge-main.h
+++ b/drivers/net/vxge/vxge-main.h
@@ -59,11 +59,13 @@
 #define VXGE_TTI_LTIMER_VAL     1000
 #define VXGE_T1A_TTI_LTIMER_VAL 80
 #define VXGE_TTI_RTIMER_VAL     0
+#define VXGE_TTI_RTIMER_ADAPT_VAL       10
 #define VXGE_T1A_TTI_RTIMER_VAL 400
 #define VXGE_RTI_BTIMER_VAL     250
 #define VXGE_RTI_LTIMER_VAL     100
 #define VXGE_RTI_RTIMER_VAL     0
-#define VXGE_FIFO_INDICATE_MAX_PKTS VXGE_DEF_FIFO_LENGTH
+#define VXGE_RTI_RTIMER_ADAPT_VAL       15
+#define VXGE_FIFO_INDICATE_MAX_PKTS     VXGE_DEF_FIFO_LENGTH
 #define VXGE_ISR_POLLING_CNT    8
 #define VXGE_MAX_CONFIG_DEV     0xFF
 #define VXGE_EXEC_MODE_DISABLE  0
@@ -107,6 +109,14 @@
 #define RTI_T1A_RX_UFC_C        50
 #define RTI_T1A_RX_UFC_D        60
+/*
+ * The interrupt rate is maintained at 3k per second with the moderation
+ * parameters for most traffic but not all. This is the maximum interrupt
+ * count allowed per function with INTA or per vector in the case of
+ * MSI-X in a 10 millisecond time period. Enabled only for Titan 1A.
+ */
+#define VXGE_T1A_MAX_INTERRUPT_COUNT    100
+#define VXGE_T1A_MAX_TX_INTERRUPT_COUNT 200
 /* Milli secs timer period */
 #define VXGE_TIMER_DELAY                10000
@@ -247,6 +257,11 @@ struct vxge_fifo {
        int tx_steering_type;
        int indicate_max_pkts;
+        /* Adaptive interrupt moderation parameters used in T1A */
+        unsigned long interrupt_count;
+        unsigned long jiffies;
+        u32 tx_vector_no;
        /* Tx stats */
        struct vxge_fifo_stats stats;
 } ____cacheline_aligned;
@@ -271,6 +286,10 @@ struct vxge_ring {
         */
        int driver_id;
+        /* Adaptive interrupt moderation parameters used in T1A */
+        unsigned long interrupt_count;
+        unsigned long jiffies;
        /* copy of the flag indicating whether rx_csum is to be used */
        u32 rx_csum:1,
            rx_hwts:1;
@@ -286,7 +305,7 @@ struct vxge_ring {
        int vlan_tag_strip;
        struct vlan_group *vlgrp;
-        int rx_vector_no;
+        u32 rx_vector_no;
        enum vxge_hw_status last_status;
        /* Rx stats */
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c
index 4c10d6c4075f..8674f331311c 100644
--- a/drivers/net/vxge/vxge-traffic.c
+++ b/drivers/net/vxge/vxge-traffic.c
@@ -218,6 +218,68 @@ exit:
        return status;
 }
+void vxge_hw_vpath_tti_ci_set(struct __vxge_hw_fifo *fifo)
+{
+        struct vxge_hw_vpath_reg __iomem *vp_reg;
+        struct vxge_hw_vp_config *config;
+        u64 val64;
+        if (fifo->config->enable != VXGE_HW_FIFO_ENABLE)
+                return;
+        vp_reg = fifo->vp_reg;
+        config = container_of(fifo->config, struct vxge_hw_vp_config, fifo);
+        if (config->tti.timer_ci_en != VXGE_HW_TIM_TIMER_CI_ENABLE) {
+                config->tti.timer_ci_en = VXGE_HW_TIM_TIMER_CI_ENABLE;
+                val64 = readq(&vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
+                val64 |= VXGE_HW_TIM_CFG1_INT_NUM_TIMER_CI;
+                fifo->tim_tti_cfg1_saved = val64;
+                writeq(val64, &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
+        }
+}
+void vxge_hw_vpath_dynamic_rti_ci_set(struct __vxge_hw_ring *ring)
+{
+        u64 val64 = ring->tim_rti_cfg1_saved;
+        val64 |= VXGE_HW_TIM_CFG1_INT_NUM_TIMER_CI;
+        ring->tim_rti_cfg1_saved = val64;
+        writeq(val64, &ring->vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_RX]);
+}
+void vxge_hw_vpath_dynamic_tti_rtimer_set(struct __vxge_hw_fifo *fifo)
+{
+        u64 val64 = fifo->tim_tti_cfg3_saved;
+        u64 timer = (fifo->rtimer * 1000) / 272;
+        val64 &= ~VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_VAL(0x3ffffff);
+        if (timer)
+                val64 |= VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_VAL(timer) |
+                        VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_EVENT_SF(5);
+        writeq(val64, &fifo->vp_reg->tim_cfg3_int_num[VXGE_HW_VPATH_INTR_TX]);
+        /* tti_cfg3_saved is not updated again because it is
+         * initialized at one place only - init time.
+         */
+}
+void vxge_hw_vpath_dynamic_rti_rtimer_set(struct __vxge_hw_ring *ring)
+{
+        u64 val64 = ring->tim_rti_cfg3_saved;
+        u64 timer = (ring->rtimer * 1000) / 272;
+        val64 &= ~VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_VAL(0x3ffffff);
+        if (timer)
+                val64 |= VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_VAL(timer) |
+                        VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_EVENT_SF(4);
+        writeq(val64, &ring->vp_reg->tim_cfg3_int_num[VXGE_HW_VPATH_INTR_RX]);
+        /* rti_cfg3_saved is not updated again because it is
+         * initialized at one place only - init time.
+         */
+}
 /**
 * vxge_hw_channel_msix_mask - Mask MSIX Vector.
 * @channeh: Channel for rx or tx handle
@@ -254,6 +316,23 @@ vxge_hw_channel_msix_unmask(struct __vxge_hw_channel *channel, int msix_id)
 }
 /**
+ * vxge_hw_channel_msix_clear - Unmask the MSIX Vector.
+ * @channel: Channel for rx or tx handle
+ * @msix_id:  MSI ID
+ *
+ * The function unmasks the msix interrupt for the given msix_id
+ * if configured in MSIX oneshot mode
+ *
+ * Returns: 0
+ */
+void vxge_hw_channel_msix_clear(struct __vxge_hw_channel *channel, int msix_id)
+{
+        __vxge_hw_pio_mem_write32_upper(
+                (u32) vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
+                &channel->common_reg->clr_msix_one_shot_vec[msix_id % 4]);
+}
+/**
 * vxge_hw_device_set_intr_type - Updates the configuration
 *              with new interrupt type.
 * @hldev: HW device handle.
@@ -2191,19 +2270,14 @@ vxge_hw_vpath_msix_set(struct __vxge_hw_vpath_handle *vp, int *tim_msix_id,
        if (vpath->hldev->config.intr_mode ==
                                        VXGE_HW_INTR_MODE_MSIX_ONE_SHOT) {
                __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(
+                                VXGE_HW_ONE_SHOT_VECT0_EN_ONE_SHOT_VECT0_EN,
+                                0, 32), &vp_reg->one_shot_vect0_en);
+                __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(
                                VXGE_HW_ONE_SHOT_VECT1_EN_ONE_SHOT_VECT1_EN,
                                0, 32), &vp_reg->one_shot_vect1_en);
-        }
-        if (vpath->hldev->config.intr_mode ==
-                VXGE_HW_INTR_MODE_MSIX_ONE_SHOT) {
                __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(
                                VXGE_HW_ONE_SHOT_VECT2_EN_ONE_SHOT_VECT2_EN,
                                0, 32), &vp_reg->one_shot_vect2_en);
-                __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(
-                                VXGE_HW_ONE_SHOT_VECT3_EN_ONE_SHOT_VECT3_EN,
-                                0, 32), &vp_reg->one_shot_vect3_en);
        }
 }
@@ -2229,6 +2303,32 @@ vxge_hw_vpath_msix_mask(struct __vxge_hw_vpath_handle *vp, int msix_id)
 }
 /**
+ * vxge_hw_vpath_msix_clear - Clear MSIX Vector.
+ * @vp: Virtual Path handle.
+ * @msix_id:  MSI ID
+ *
+ * The function clears the msix interrupt for the given msix_id
+ *
+ * Returns: 0,
+ * Otherwise, VXGE_HW_ERR_WRONG_IRQ if the msix index is out of range
+ * status.
+ * See also:
+ */
+void vxge_hw_vpath_msix_clear(struct __vxge_hw_vpath_handle *vp, int msix_id)
+{
+        struct __vxge_hw_device *hldev = vp->vpath->hldev;
+        if ((hldev->config.intr_mode == VXGE_HW_INTR_MODE_MSIX_ONE_SHOT))
+                __vxge_hw_pio_mem_write32_upper(
+                        (u32) vxge_bVALn(vxge_mBIT((msix_id >> 2)), 0, 32),
+                        &hldev->common_reg->clr_msix_one_shot_vec[msix_id % 4]);
+        else
+                __vxge_hw_pio_mem_write32_upper(
+                        (u32) vxge_bVALn(vxge_mBIT((msix_id >> 2)), 0, 32),
+                        &hldev->common_reg->clear_msix_mask_vect[msix_id % 4]);
+}
+/**
 * vxge_hw_vpath_msix_unmask - Unmask the MSIX Vector.
 * @vp: Virtual Path handle.
 * @msix_id:  MSI ID
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h
index d48486d6afa1..9d9dfda4c7ab 100644
--- a/drivers/net/vxge/vxge-traffic.h
+++ b/drivers/net/vxge/vxge-traffic.h
@@ -2142,6 +2142,10 @@ void vxge_hw_device_clear_tx_rx(
 *  Virtual Paths
 */
+void vxge_hw_vpath_dynamic_rti_rtimer_set(struct __vxge_hw_ring *ring);
+void vxge_hw_vpath_dynamic_tti_rtimer_set(struct __vxge_hw_fifo *fifo);
 u32 vxge_hw_vpath_id(
        struct __vxge_hw_vpath_handle *vpath_handle);
@@ -2245,6 +2249,8 @@ void
 vxge_hw_vpath_msix_mask(struct __vxge_hw_vpath_handle *vpath_handle,
                        int msix_id);
+void vxge_hw_vpath_msix_clear(struct __vxge_hw_vpath_handle *vp, int msix_id);
 void vxge_hw_device_flush_io(struct __vxge_hw_device *devh);
 void
@@ -2270,6 +2276,9 @@ void
 vxge_hw_channel_msix_unmask(struct __vxge_hw_channel *channelh, int msix_id);
 void
+vxge_hw_channel_msix_clear(struct __vxge_hw_channel *channelh, int msix_id);
+void
 vxge_hw_channel_dtr_try_complete(struct __vxge_hw_channel *channel,
                                 void **dtrh);
@@ -2282,7 +2291,8 @@ vxge_hw_channel_dtr_free(struct __vxge_hw_channel *channel, void *dtrh);
 int
 vxge_hw_channel_dtr_count(struct __vxge_hw_channel *channel);
-void
+void vxge_hw_vpath_tti_ci_set(struct __vxge_hw_fifo *fifo);
-vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id);
+void vxge_hw_vpath_dynamic_rti_ci_set(struct __vxge_hw_ring *ring);
 #endif
diff --git a/drivers/net/vxge/vxge-version.h b/drivers/net/vxge/vxge-version.h
index ad2f99b9bcf3..581e21525e85 100644
--- a/drivers/net/vxge/vxge-version.h
+++ b/drivers/net/vxge/vxge-version.h
@@ -16,8 +16,8 @@
 #define VXGE_VERSION_MAJOR      "2"
 #define VXGE_VERSION_MINOR      "5"
-#define VXGE_VERSION_FIX        "1"
+#define VXGE_VERSION_FIX        "2"
-#define VXGE_VERSION_BUILD      "22082"
+#define VXGE_VERSION_BUILD      "22259"
 #define VXGE_VERSION_FOR        "k"
 #define VXGE_FW_VER(maj, min, bld) (((maj) << 16) + ((min) << 8) + (bld))
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 5b6932c2193a..166e9f742596 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -402,72 +402,6 @@ static void iwl3945_accumulative_statistics(struct iwl_priv *priv,
 }
 #endif
-/**
- * iwl3945_good_plcp_health - checks for plcp error.
- *
- * When the plcp error is exceeding the thresholds, reset the radio
- * to improve the throughput.
- */
-static bool iwl3945_good_plcp_health(struct iwl_priv *priv,
-                                struct iwl_rx_packet *pkt)
-{
-        bool rc = true;
-        struct iwl3945_notif_statistics current_stat;
-        int combined_plcp_delta;
-        unsigned int plcp_msec;
-        unsigned long plcp_received_jiffies;
-        if (priv->cfg->base_params->plcp_delta_threshold ==
-            IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE) {
-                IWL_DEBUG_RADIO(priv, "plcp_err check disabled\n");
-                return rc;
-        }
-        memcpy(&current_stat, pkt->u.raw, sizeof(struct
-                        iwl3945_notif_statistics));
-        /*
-         * check for plcp_err and trigger radio reset if it exceeds
-         * the plcp error threshold plcp_delta.
-         */
-        plcp_received_jiffies = jiffies;
-        plcp_msec = jiffies_to_msecs((long) plcp_received_jiffies -
-                                        (long) priv->plcp_jiffies);
-        priv->plcp_jiffies = plcp_received_jiffies;
-        /*
-         * check to make sure plcp_msec is not 0 to prevent division
-         * by zero.
-         */
-        if (plcp_msec) {
-                combined_plcp_delta =
-                        (le32_to_cpu(current_stat.rx.ofdm.plcp_err) -
-                        le32_to_cpu(priv->_3945.statistics.rx.ofdm.plcp_err));
-                if ((combined_plcp_delta > 0) &&
-                        ((combined_plcp_delta * 100) / plcp_msec) >
-                        priv->cfg->base_params->plcp_delta_threshold) {
-                        /*
-                         * if plcp_err exceed the threshold, the following
-                         * data is printed in csv format:
-                         *    Text: plcp_err exceeded %d,
-                         *    Received ofdm.plcp_err,
-                         *    Current ofdm.plcp_err,
-                         *    combined_plcp_delta,
-                         *    plcp_msec
-                         */
-                        IWL_DEBUG_RADIO(priv, "plcp_err exceeded %u, "
-                                "%u, %d, %u mSecs\n",
-                                priv->cfg->base_params->plcp_delta_threshold,
-                                le32_to_cpu(current_stat.rx.ofdm.plcp_err),
-                                combined_plcp_delta, plcp_msec);
-                        /*
-                         * Reset the RF radio due to the high plcp
-                         * error rate
-                         */
-                        rc = false;
-                }
-        }
-        return rc;
-}
 void iwl3945_hw_rx_statistics(struct iwl_priv *priv,
                struct iwl_rx_mem_buffer *rxb)
 {
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 546de5749824..da1f12120346 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -120,6 +120,9 @@ struct netfront_info {
        unsigned long rx_pfn_array[NET_RX_RING_SIZE];
        struct multicall_entry rx_mcl[NET_RX_RING_SIZE+1];
        struct mmu_update rx_mmu[NET_RX_RING_SIZE];
+        /* Statistics */
+        int rx_gso_checksum_fixup;
 };
 struct netfront_rx_info {
@@ -770,11 +773,29 @@ static RING_IDX xennet_fill_frags(struct netfront_info *np,
        return cons;
 }
-static int skb_checksum_setup(struct sk_buff *skb)
+static int checksum_setup(struct net_device *dev, struct sk_buff *skb)
 {
        struct iphdr *iph;
        unsigned char *th;
        int err = -EPROTO;
+        int recalculate_partial_csum = 0;
+        /*
+         * A GSO SKB must be CHECKSUM_PARTIAL. However some buggy
+         * peers can fail to set NETRXF_csum_blank when sending a GSO
+         * frame. In this case force the SKB to CHECKSUM_PARTIAL and
+         * recalculate the partial checksum.
+         */
+        if (skb->ip_summed != CHECKSUM_PARTIAL && skb_is_gso(skb)) {
+                struct netfront_info *np = netdev_priv(dev);
+                np->rx_gso_checksum_fixup++;
+                skb->ip_summed = CHECKSUM_PARTIAL;
+                recalculate_partial_csum = 1;
+        }
+        /* A non-CHECKSUM_PARTIAL SKB does not require setup. */
+        if (skb->ip_summed != CHECKSUM_PARTIAL)
+                return 0;
        if (skb->protocol != htons(ETH_P_IP))
                goto out;
@@ -788,9 +809,23 @@ static int skb_checksum_setup(struct sk_buff *skb)
        switch (iph->protocol) {
        case IPPROTO_TCP:
                skb->csum_offset = offsetof(struct tcphdr, check);
+                if (recalculate_partial_csum) {
+                        struct tcphdr *tcph = (struct tcphdr *)th;
+                        tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                                         skb->len - iph->ihl*4,
+                                                         IPPROTO_TCP, 0);
+                }
                break;
        case IPPROTO_UDP:
                skb->csum_offset = offsetof(struct udphdr, check);
+                if (recalculate_partial_csum) {
+                        struct udphdr *udph = (struct udphdr *)th;
+                        udph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                                         skb->len - iph->ihl*4,
+                                                         IPPROTO_UDP, 0);
+                }
                break;
        default:
                if (net_ratelimit())
@@ -829,13 +864,11 @@ static int handle_incoming_queue(struct net_device *dev,
                /* Ethernet work: Delayed to here as it peeks the header. */
                skb->protocol = eth_type_trans(skb, dev);
-                if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                if (checksum_setup(dev, skb)) {
-                        if (skb_checksum_setup(skb)) {
+                        kfree_skb(skb);
-                                kfree_skb(skb);
+                        packets_dropped++;
-                                packets_dropped++;
+                        dev->stats.rx_errors++;
-                                dev->stats.rx_errors++;
+                        continue;
-                                continue;
-                        }
                }
                dev->stats.rx_packets++;
@@ -1632,12 +1665,59 @@ static void netback_changed(struct xenbus_device *dev,
        }
 }
+static const struct xennet_stat {
+        char name[ETH_GSTRING_LEN];
+        u16 offset;
+} xennet_stats[] = {
+        {
+                "rx_gso_checksum_fixup",
+                offsetof(struct netfront_info, rx_gso_checksum_fixup)
+        },
+};
+static int xennet_get_sset_count(struct net_device *dev, int string_set)
+{
+        switch (string_set) {
+        case ETH_SS_STATS:
+                return ARRAY_SIZE(xennet_stats);
+        default:
+                return -EINVAL;
+        }
+}
+static void xennet_get_ethtool_stats(struct net_device *dev,
+                                     struct ethtool_stats *stats, u64 * data)
+{
+        void *np = netdev_priv(dev);
+        int i;
+        for (i = 0; i < ARRAY_SIZE(xennet_stats); i++)
+                data[i] = *(int *)(np + xennet_stats[i].offset);
+}
+static void xennet_get_strings(struct net_device *dev, u32 stringset, u8 * data)
+{
+        int i;
+        switch (stringset) {
+        case ETH_SS_STATS:
+                for (i = 0; i < ARRAY_SIZE(xennet_stats); i++)
+                        memcpy(data + i * ETH_GSTRING_LEN,
+                               xennet_stats[i].name, ETH_GSTRING_LEN);
+                break;
+        }
+}
 static const struct ethtool_ops xennet_ethtool_ops =
 {
        .set_tx_csum = ethtool_op_set_tx_csum,
        .set_sg = xennet_set_sg,
        .set_tso = xennet_set_tso,
        .get_link = ethtool_op_get_link,
+        .get_sset_count = xennet_get_sset_count,
+        .get_ethtool_stats = xennet_get_ethtool_stats,
+        .get_strings = xennet_get_strings,
 };
 #ifdef CONFIG_SYSFS