/spare/repo/netdev-2.6 branch 'ieee80211'

9 files changed, 47 insertions, 39 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 7b293f01c9ed..34b80de34fae 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1897,6 +1897,7 @@ static int cp_resume (struct pci_dev *pdev)
 {
         struct net_device *dev;
         struct cp_private *cp;
+        unsigned long flags;
 
         dev = pci_get_drvdata (pdev);
         cp  = netdev_priv(dev);
@@ -1910,6 +1911,12 @@ static int cp_resume (struct pci_dev *pdev)
         
         cp_init_hw (cp);
         netif_start_queue (dev);
+
+        spin_lock_irqsave (&cp->lock, flags);
+
+        mii_check_media(&cp->mii_if, netif_msg_link(cp), FALSE);
+
+        spin_unlock_irqrestore (&cp->lock, flags);
         
         return 0;
 }
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8a835eb58808..8edb6936fb9b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1145,7 +1145,7 @@ config IBMVETH
           be called ibmveth.
 
 config IBM_EMAC
-        tristate "IBM PPC4xx EMAC driver support"
+        bool "IBM PPC4xx EMAC driver support"
         depends on 4xx
         select CRC32
         ---help---
@@ -1154,7 +1154,7 @@ config IBM_EMAC
 
 config IBM_EMAC_ERRMSG
         bool "Verbose error messages"
-        depends on IBM_EMAC
+        depends on IBM_EMAC && BROKEN
 
 config IBM_EMAC_RXB
         int "Number of receive buffers"
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 5fddc0ff8878..6440a892bb81 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -48,6 +48,10 @@
  *                        net_device_stats
  *                      * introduced tx_timeout function
  *                      * reworked locking
+ *
+ *        01-Jul-2005   Ben Dooks <ben@simtec.co.uk>
+ *                      * fixed spinlock call without pointer
+ *                      * ensure spinlock is initialised
  */
 
 #include <linux/module.h>
@@ -148,7 +152,6 @@ static int dm9000_probe(struct device *);
 static int dm9000_open(struct net_device *);
 static int dm9000_start_xmit(struct sk_buff *, struct net_device *);
 static int dm9000_stop(struct net_device *);
-static int dm9000_do_ioctl(struct net_device *, struct ifreq *, int);
 
 
 static void dm9000_timer(unsigned long);
@@ -322,7 +325,7 @@ static void dm9000_timeout(struct net_device *dev)
 
         /* Save previous register address */
         reg_save = readb(db->io_addr);
-        spin_lock_irqsave(db->lock,flags);
+        spin_lock_irqsave(&db->lock,flags);
 
         netif_stop_queue(dev);
         dm9000_reset(db);
@@ -333,7 +336,7 @@ static void dm9000_timeout(struct net_device *dev)
 
         /* Restore previous register address */
         writeb(reg_save, db->io_addr);
-        spin_unlock_irqrestore(db->lock,flags);
+        spin_unlock_irqrestore(&db->lock,flags);
 }
 
 
@@ -387,8 +390,6 @@ dm9000_probe(struct device *dev)
         int i;
         u32 id_val;
 
-        printk(KERN_INFO "%s Ethernet Driver\n", CARDNAME);
-
         /* Init network device */
         ndev = alloc_etherdev(sizeof (struct board_info));
         if (!ndev) {
@@ -405,6 +406,8 @@ dm9000_probe(struct device *dev)
         db = (struct board_info *) ndev->priv;
         memset(db, 0, sizeof (*db));
 
+        spin_lock_init(&db->lock);
+
         if (pdev->num_resources < 2) {
                 ret = -ENODEV;
                 goto out;
@@ -541,7 +544,6 @@ dm9000_probe(struct device *dev)
         ndev->stop               = &dm9000_stop;
         ndev->get_stats          = &dm9000_get_stats;
         ndev->set_multicast_list = &dm9000_hash_table;
-        ndev->do_ioctl           = &dm9000_do_ioctl;
 
 #ifdef DM9000_PROGRAM_EEPROM
         program_eeprom(db);
@@ -612,7 +614,7 @@ dm9000_open(struct net_device *dev)
 
         /* set and active a timer process */
         init_timer(&db->timer);
-        db->timer.expires  = DM9000_TIMER_WUT * 2;
+        db->timer.expires  = DM9000_TIMER_WUT;
         db->timer.data     = (unsigned long) dev;
         db->timer.function = &dm9000_timer;
         add_timer(&db->timer);
@@ -845,15 +847,6 @@ dm9000_get_stats(struct net_device *dev)
         return &db->stats;
 }
 
-/*
- *  Process the upper socket ioctl command
- */
-static int
-dm9000_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-        PRINTK1("entering %s\n",__FUNCTION__);
-        return 0;
-}
 
 /*
  *  A periodic timer routine
@@ -864,21 +857,11 @@ dm9000_timer(unsigned long data)
 {
         struct net_device *dev = (struct net_device *) data;
         board_info_t *db = (board_info_t *) dev->priv;
-        u8 reg_save;
-        unsigned long flags;
 
         PRINTK3("dm9000_timer()\n");
 
-        spin_lock_irqsave(db->lock,flags);
-        /* Save previous register address */
-        reg_save = readb(db->io_addr);
-
         mii_check_media(&db->mii, netif_msg_link(db), 0);
 
-        /* Restore previous register address */
-        writeb(reg_save, db->io_addr);
-        spin_unlock_irqrestore(db->lock,flags);
-
         /* Set timer again */
         db->timer.expires = DM9000_TIMER_WUT;
         add_timer(&db->timer);
@@ -1098,9 +1081,14 @@ dm9000_phy_read(struct net_device *dev, int phy_reg_unused, int reg)
 {
         board_info_t *db = (board_info_t *) dev->priv;
         unsigned long flags;
+        unsigned int reg_save;
         int ret;
 
         spin_lock_irqsave(&db->lock,flags);
+
+        /* Save previous register address */
+        reg_save = readb(db->io_addr);
+
         /* Fill the phyxcer register into REG_0C */
         iow(db, DM9000_EPAR, DM9000_PHY | reg);
 
@@ -1111,6 +1099,9 @@ dm9000_phy_read(struct net_device *dev, int phy_reg_unused, int reg)
         /* The read data keeps on REG_0D & REG_0E */
         ret = (ior(db, DM9000_EPDRH) << 8) | ior(db, DM9000_EPDRL);
 
+        /* restore the previous address */
+        writeb(reg_save, db->io_addr);
+
         spin_unlock_irqrestore(&db->lock,flags);
 
         return ret;
@@ -1124,9 +1115,13 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
 {
         board_info_t *db = (board_info_t *) dev->priv;
         unsigned long flags;
+        unsigned long reg_save;
 
         spin_lock_irqsave(&db->lock,flags);
 
+        /* Save previous register address */
+        reg_save = readb(db->io_addr);
+
         /* Fill the phyxcer register into REG_0C */
         iow(db, DM9000_EPAR, DM9000_PHY | reg);
 
@@ -1138,6 +1133,9 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
         udelay(500);            /* Wait write complete */
         iow(db, DM9000_EPCR, 0x0);      /* Clear phyxcer write command */
 
+        /* restore the previous address */
+        writeb(reg_save, db->io_addr);
+
         spin_unlock_irqrestore(&db->lock,flags);
 }
 
@@ -1202,6 +1200,8 @@ static struct device_driver dm9000_driver = {
 static int __init
 dm9000_init(void)
 {
+        printk(KERN_INFO "%s Ethernet Driver\n", CARDNAME);
+
         return driver_register(&dm9000_driver); /* search board and register */
 }
 
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 6482d994d489..c7fb3675c09d 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -1712,11 +1712,10 @@ struct mal_commac_ops emac_commac_ops = {
 };
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-static int emac_netpoll(struct net_device *ndev)
+static void emac_netpoll(struct net_device *ndev)
 {
         emac_rxeob_dev((void *)ndev, 0);
         emac_txeob_dev((void *)ndev, 0);
-        return 0;
 }
 #endif
 
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index d520b5920d6c..49e5467bdd73 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -499,7 +499,7 @@ static int ioc3_mdio_read(struct net_device *dev, int phy, int reg)
         ioc3_w_micr((phy << MICR_PHYADDR_SHIFT) | reg | MICR_READTRIG);
         while (ioc3_r_micr() & MICR_BUSY);
 
-        return ioc3_r_micr() & MIDR_DATA_MASK;
+        return ioc3_r_midr_r() & MIDR_DATA_MASK;
 }
 
 static void ioc3_mdio_write(struct net_device *dev, int phy, int reg, int data)
@@ -1291,7 +1291,6 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         dev->features           = NETIF_F_IP_CSUM;
 #endif
 
-        ioc3_setup_duplex(ip);
         sw_physid1 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID1);
         sw_physid2 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID2);
 
@@ -1300,6 +1299,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto out_stop;
 
         mii_check_media(&ip->mii, 1, 1);
+        ioc3_setup_duplex(ip);
 
         vendor = (sw_physid1 << 12) | (sw_physid2 >> 4);
         model  = (sw_physid2 >> 4) & 0x3f;
@@ -1524,7 +1524,7 @@ static void ioc3_get_drvinfo (struct net_device *dev,
         struct ethtool_drvinfo *info)
 {
         struct ioc3_private *ip = netdev_priv(dev);
-                                                                                
+
         strcpy (info->driver, IOC3_NAME);
         strcpy (info->version, IOC3_VERSION);
         strcpy (info->bus_info, pci_name(ip->pdev));
@@ -1550,7 +1550,7 @@ static int ioc3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         spin_lock_irq(&ip->ioc3_lock);
         rc = mii_ethtool_sset(&ip->mii, cmd);
         spin_unlock_irq(&ip->ioc3_lock);
-                                                                        
+
         return rc;
 }
 
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index b33111e21313..1f61f0cc95d8 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -214,7 +214,7 @@ struct net_device loopback_dev = {
         .ethtool_ops            = &loopback_ethtool_ops,
 };
 
-/* Setup and register the of the LOOPBACK device. */
+/* Setup and register the loopback device. */
 int __init loopback_init(void)
 {
         struct net_device_stats *stats;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 368b8fb14023..01419aff333e 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -66,8 +66,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.35"
-#define DRV_MODULE_RELDATE      "August 6, 2005"
+#define DRV_MODULE_VERSION      "3.36"
+#define DRV_MODULE_RELDATE      "August 19, 2005"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -8970,6 +8970,8 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
                 tp->phy_id = hw_phy_id;
                 if (hw_phy_id_masked == PHY_ID_BCM8002)
                         tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
+                else
+                        tp->tg3_flags2 &= ~TG3_FLG2_PHY_SERDES;
         } else {
                 if (tp->phy_id != PHY_ID_INVALID) {
                         /* Do nothing, phy ID already set up in
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index 23d0fa4bbceb..7e99e9f8045e 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -84,7 +84,7 @@ config 3C359
 
 config TMS380TR
         tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
-        depends on TR && (PCI || ISA)
+        depends on TR && (PCI || ISA && ISA_DMA_API)
         select FW_LOADER
         ---help---
           This driver provides generic support for token ring adapters
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index ff5b1b1de2fa..5d814dfc8bc0 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -374,7 +374,7 @@ config PCMCIA_HERMES
 
 config AIRO_CS
         tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
-        depends on NET_RADIO && PCMCIA
+        depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)
         ---help---
           This is the standard Linux driver to support Cisco/Aironet PCMCIA
           802.11 wireless cards.  This driver is the same as the Aironet