7 files changed, 26 insertions, 21 deletions

diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index c39ab803c5d8..c27cfcef45fa 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -34,7 +34,7 @@
  *
  *
  */
-
+#include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index b261be147e7b..c302b1a30cba 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -335,11 +335,11 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
         hwm = min(hwm, MAC_RXFIFO_SIZE - 8192);
         lwm = min(3 * (int)mtu, MAC_RXFIFO_SIZE / 4);
 
-        v = t3_read_reg(adap, A_XGM_RXFIFO_CFG + mac->offset);
         if (adap->params.rev == T3_REV_B2 &&
             (t3_read_reg(adap, A_XGM_RX_CTRL + mac->offset) & F_RXEN)) {
                 disable_exact_filters(mac);
-                t3_set_reg_field(adap, A_XGM_RXFIFO_CFG + mac->offset,
+                v = t3_read_reg(adap, A_XGM_RX_CFG + mac->offset);
+                t3_set_reg_field(adap, A_XGM_RX_CFG + mac->offset,
                                  F_ENHASHMCAST | F_COPYALLFRAMES, F_DISBCAST);
 
                 /* drain rx FIFO */
@@ -347,11 +347,12 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
                                     A_XGM_RX_MAX_PKT_SIZE_ERR_CNT +
                                     mac->offset,
                                     1 << 31, 1, 20, 5)) {
-                        t3_write_reg(adap, A_XGM_RXFIFO_CFG + mac->offset, v);
+                        t3_write_reg(adap, A_XGM_RX_CFG + mac->offset, v);
                         enable_exact_filters(mac);
                         return -EIO;
                 }
                 t3_write_reg(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset, mtu);
+                t3_write_reg(adap, A_XGM_RX_CFG + mac->offset, v);
                 enable_exact_filters(mac);
         } else
                 t3_write_reg(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset, mtu);
@@ -362,6 +363,7 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
          */
         hwm = rx_fifo_hwm(mtu);
         lwm = min(3 * (int)mtu, MAC_RXFIFO_SIZE / 4);
+        v = t3_read_reg(adap, A_XGM_RXFIFO_CFG + mac->offset);
         v &= ~V_RXFIFOPAUSELWM(M_RXFIFOPAUSELWM);
         v |= V_RXFIFOPAUSELWM(lwm / 8);
         if (G_RXFIFOPAUSEHWM(v))
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 9043bf4aa49e..2803b370ba01 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -416,6 +416,13 @@ static int __init smsc_ircc_legacy_probe(void)
 {
         int ret = 0;
 
+#ifdef CONFIG_PCI
+        if (smsc_ircc_preconfigure_subsystems(ircc_cfg, ircc_fir, ircc_sir, ircc_dma, ircc_irq) < 0) {
+                /* Ignore errors from preconfiguration */
+                IRDA_ERROR("%s, Preconfiguration failed !\n", driver_name);
+        }
+#endif
+
         if (ircc_fir > 0 && ircc_sir > 0) {
                 IRDA_MESSAGE(" Overriding FIR address 0x%04x\n", ircc_fir);
                 IRDA_MESSAGE(" Overriding SIR address 0x%04x\n", ircc_sir);
@@ -459,13 +466,6 @@ static int __init smsc_ircc_init(void)
                 return ret;
         }
 
-#ifdef CONFIG_PCI
-        if (smsc_ircc_preconfigure_subsystems(ircc_cfg, ircc_fir, ircc_sir, ircc_dma, ircc_irq) < 0) {
-                /* Ignore errors from preconfiguration */
-                IRDA_ERROR("%s, Preconfiguration failed !\n", driver_name);
-        }
-#endif
-
         dev_count = 0;
 
         if (smsc_nopnp || !pnp_platform_devices ||
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 5d658bc9791c..e8f55d8ed7a9 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -19,7 +19,7 @@ menuconfig NET_PCMCIA
 
           If unsure, say N.
 
-if NET_PCMCIA
+if NET_PCMCIA && PCMCIA
 
 config PCMCIA_3C589
         tristate "3Com 3c589 PCMCIA support"
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index fc4aee96cdfd..fc2f0e695a13 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -131,7 +131,8 @@ static int mdio_bus_match(struct device *dev, struct device_driver *drv)
         struct phy_device *phydev = to_phy_device(dev);
         struct phy_driver *phydrv = to_phy_driver(drv);
 
-        return (phydrv->phy_id == (phydev->phy_id & phydrv->phy_id_mask));
+        return ((phydrv->phy_id & phydrv->phy_id_mask) ==
+                (phydev->phy_id & phydrv->phy_id_mask));
 }
 
 /* Suspend and resume.  Copied from platform_suspend and
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 792716beb052..596222b260d6 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -84,7 +84,7 @@ static int vsc824x_config_intr(struct phy_device *phydev)
 
 /* Vitesse 824x */
 static struct phy_driver vsc8244_driver = {
-        .phy_id         = 0x000fc6c2,
+        .phy_id         = 0x000fc6c0,
         .name           = "Vitesse VSC8244",
         .phy_id_mask    = 0x000fffc0,
         .features       = PHY_GBIT_FEATURES,
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index c6ba3dee8ae0..09078ff84cd2 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2868,6 +2868,7 @@ static void tx_intr_handler(struct fifo_info *fifo_data)
         struct tx_curr_get_info get_info, put_info;
         struct sk_buff *skb;
         struct TxD *txdlp;
+        u8 err_mask;
 
         get_info = fifo_data->tx_curr_get_info;
         memcpy(&put_info, &fifo_data->tx_curr_put_info, sizeof(put_info));
@@ -2886,8 +2887,8 @@ static void tx_intr_handler(struct fifo_info *fifo_data)
                         }
 
                         /* update t_code statistics */
-                        err >>= 48;
-                        switch(err) {
+                        err_mask = err >> 48;
+                        switch(err_mask) {
                                 case 2:
                                         nic->mac_control.stats_info->sw_stat.
                                                         tx_buf_abort_cnt++;
@@ -6805,6 +6806,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
         u16 l3_csum, l4_csum;
         unsigned long long err = rxdp->Control_1 & RXD_T_CODE;
         struct lro *lro;
+        u8 err_mask;
 
         skb->dev = dev;
 
@@ -6813,8 +6815,8 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                 if (err & 0x1) {
                         sp->mac_control.stats_info->sw_stat.parity_err_cnt++;
                 }
-                err >>= 48;
-                switch(err) {
+                err_mask = err >> 48;
+                switch(err_mask) {
                         case 1:
                                 sp->mac_control.stats_info->sw_stat.
                                 rx_parity_err_cnt++;
@@ -6867,9 +6869,9 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                 * Note that in this case, since checksum will be incorrect,
                 * stack will validate the same.
                 */
-                if (err != 0x5) {
-                        DBG_PRINT(ERR_DBG, "%s: Rx error Value: 0x%llx\n",
-                                dev->name, err);
+                if (err_mask != 0x5) {
+                        DBG_PRINT(ERR_DBG, "%s: Rx error Value: 0x%x\n",
+                                dev->name, err_mask);
                         sp->stats.rx_crc_errors++;
                         sp->mac_control.stats_info->sw_stat.mem_freed 
                                 += skb->truesize;