Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  sis190: scheduling while atomic error
  sis190: mdio operation failure is not correctly detected
  sis190: remove duplicate INIT_WORK
  sis190: add cmos ram access code for the SiS19x/968 chipset pair
  [INET]: Fix truesize setting in ip_append_data
  [NETNS]: Re-export init_net via EXPORT_SYMBOL.
  iwlwifi: fix possible read attempt on ucode that is not available
  [IPV4]: Add missing skb->truesize increment in ip_append_page().
  [TULIP] DMFE: Fix SROM parsing regression.
  [BLUETOOTH]: Move children of connection device to NULL before connection down.

4 files changed, 23 insertions, 14 deletions

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 7eab072ae792..b570402f7fed 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -372,7 +372,7 @@ static void __mdio_cmd(void __iomem *ioaddr, u32 ctl)
                 msleep(1);
         }
 
-        if (i > 999)
+        if (i > 99)
                 printk(KERN_ERR PFX "PHY command failed !\n");
 }
 
@@ -847,10 +847,8 @@ static void sis190_soft_reset(void __iomem *ioaddr)
 {
         SIS_W32(IntrControl, 0x8000);
         SIS_PCI_COMMIT();
-        msleep(1);
         SIS_W32(IntrControl, 0x0);
         sis190_asic_down(ioaddr);
-        msleep(1);
 }
 
 static void sis190_hw_start(struct net_device *dev)
@@ -1041,8 +1039,6 @@ static int sis190_open(struct net_device *dev)
         if (rc < 0)
                 goto err_free_rx_1;
 
-        INIT_WORK(&tp->phy_task, sis190_phy_task);
-
         sis190_request_timer(dev);
 
         rc = request_irq(dev->irq, sis190_interrupt, IRQF_SHARED, dev->name, dev);
@@ -1549,28 +1545,31 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
 }
 
 /**
- *      sis190_get_mac_addr_from_apc - Get MAC address for SiS965 model
+ *      sis190_get_mac_addr_from_apc - Get MAC address for SiS96x model
  *      @pdev: PCI device
  *      @dev:  network device to get address for
  *
- *      SiS965 model, use APC CMOS RAM to store MAC address.
+ *      SiS96x model, use APC CMOS RAM to store MAC address.
  *      APC CMOS RAM is accessed through ISA bridge.
  *      MAC address is read into @net_dev->dev_addr.
  */
 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
                                                   struct net_device *dev)
 {
+        static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
         struct sis190_private *tp = netdev_priv(dev);
         struct pci_dev *isa_bridge;
         u8 reg, tmp8;
-        int i;
+        unsigned int i;
 
         net_probe(tp, KERN_INFO "%s: Read MAC address from APC.\n",
                   pci_name(pdev));
 
-        isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0965, NULL);
-        if (!isa_bridge)
-                isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0966, NULL);
+        for (i = 0; i < ARRAY_SIZE(ids); i++) {
+                isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, ids[i], NULL);
+                if (isa_bridge)
+                        break;
+        }
 
         if (!isa_bridge) {
                 net_probe(tp, KERN_INFO "%s: Can not find ISA bridge.\n",
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index b4891caeae5a..656200472fa1 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -1909,7 +1909,7 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
         if ( ( (int) srom[18] & 0xff) == SROM_V41_CODE) {
                 /* SROM V4.01 */
                 /* Get NIC support media mode */
-                db->NIC_capability = le16_to_cpup((__le16 *)srom + 34/2);
+                db->NIC_capability = le16_to_cpup((__le16 *) (srom + 34));
                 db->PHY_reg4 = 0;
                 for (tmp_reg = 1; tmp_reg < 0x10; tmp_reg <<= 1) {
                         switch( db->NIC_capability & tmp_reg ) {
@@ -1921,8 +1921,8 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
                 }
 
                 /* Media Mode Force or not check */
-                dmfe_mode = le32_to_cpup((__le32 *)srom + 34/4) &
-                                le32_to_cpup((__le32 *)srom + 36/4);
+                dmfe_mode = (le32_to_cpup((__le32 *) (srom + 34)) &
+                             le32_to_cpup((__le32 *) (srom + 36)));
                 switch(dmfe_mode) {
                 case 0x4: dmfe_media_mode = DMFE_100MHF; break; /* 100MHF */
                 case 0x2: dmfe_media_mode = DMFE_10MFD; break;  /* 10MFD */
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 1a6b0e0edf6f..0b3ec7e4d93b 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6342,6 +6342,11 @@ static int __iwl_up(struct iwl_priv *priv)
                 return 0;
         }
 
+        if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
+                IWL_ERROR("ucode not available for device bringup\n");
+                return -EIO;
+        }
+
         iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
 
         rc = iwl_hw_nic_init(priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 6cd57c220631..15a45f471710 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -6698,6 +6698,11 @@ static int __iwl_up(struct iwl_priv *priv)
                 return 0;
         }
 
+        if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
+                IWL_ERROR("ucode not available for device bringup\n");
+                return -EIO;
+        }
+
         iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
 
         rc = iwl_hw_nic_init(priv);