Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
  [IPV6]: Consolidate the ip6_pol_route_(input|output) pair
  [TCP]: Make snd_cwnd_cnt 32-bit
  [TCP]: Update the /proc/net/tcp documentation
  [NETNS]: Don't panic on creating the namespace's loopback
  [NEIGH]: Ensure that pneigh_lookup is protected with RTNL
  [INET]: kmalloc+memset -> kzalloc in frag_alloc_queue
  [ISDN]: Fix compile with CONFIG_ISDN_X25 disabled.
  [IPV6]: Replace sk_buff ** with sk_buff * in input handlers
  [SELINUX]: Update for netfilter ->hook() arg changes.
  [INET]: Consolidate the xxx_put
  [INET]: Small cleanup for xxx_put after evictor consolidation
  [INET]: Consolidate the xxx_evictor
  [INET]: Consolidate the xxx_frag_destroy
  [INET]: Consolidate xxx_the secret_rebuild
  [INET]: Consolidate the xxx_frag_kill
  [INET]: Collect common frag sysctl variables together
  [INET]: Collect frag queues management objects together
  [INET]: Move common fields from frag_queues in one place.
  [TG3]: Fix performance regression on 5705.
  [ISDN]: Remove local copy of device name to make sure renames work.
  ...

3 files changed, 22 insertions, 18 deletions

diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index be25aa33971c..662b8d16803c 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -265,17 +265,16 @@ static __net_init int loopback_net_init(struct net *net)
         if (err)
                 goto out_free_netdev;
 
-        err = 0;
         net->loopback_dev = dev;
+        return 0;
 
-out:
-        if (err)
-                panic("loopback: Failed to register netdevice: %d\n", err);
-        return err;
 
 out_free_netdev:
         free_netdev(dev);
-        goto out;
+out:
+        if (net == &init_net)
+                panic("loopback: Failed to register netdevice: %d\n", err);
+        return err;
 }
 
 static __net_exit void loopback_net_exit(struct net *net)
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 43bfe7e6b6f5..ed1f9bbb2a32 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -6123,19 +6123,19 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
         val = nr64(ESPC_PHY_TYPE);
         switch (np->port) {
         case 0:
-                val = (val & ESPC_PHY_TYPE_PORT0) >>
+                val8 = (val & ESPC_PHY_TYPE_PORT0) >>
                         ESPC_PHY_TYPE_PORT0_SHIFT;
                 break;
         case 1:
-                val = (val & ESPC_PHY_TYPE_PORT1) >>
+                val8 = (val & ESPC_PHY_TYPE_PORT1) >>
                         ESPC_PHY_TYPE_PORT1_SHIFT;
                 break;
         case 2:
-                val = (val & ESPC_PHY_TYPE_PORT2) >>
+                val8 = (val & ESPC_PHY_TYPE_PORT2) >>
                         ESPC_PHY_TYPE_PORT2_SHIFT;
                 break;
         case 3:
-                val = (val & ESPC_PHY_TYPE_PORT3) >>
+                val8 = (val & ESPC_PHY_TYPE_PORT3) >>
                         ESPC_PHY_TYPE_PORT3_SHIFT;
                 break;
         default:
@@ -6143,9 +6143,9 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
                         np->port);
                 return -EINVAL;
         }
-        niudbg(PROBE, "SPROM: PHY type %llx\n", (unsigned long long) val);
+        niudbg(PROBE, "SPROM: PHY type %x\n", val8);
 
-        switch (val) {
+        switch (val8) {
         case ESPC_PHY_TYPE_1G_COPPER:
                 /* 1G copper, MII */
                 np->flags &= ~(NIU_FLAGS_FIBER |
@@ -6175,8 +6175,7 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
                 break;
 
         default:
-                dev_err(np->device, PFX "Bogus SPROM phy type %llu\n",
-                        (unsigned long long) val);
+                dev_err(np->device, PFX "Bogus SPROM phy type %u\n", val8);
                 return -EINVAL;
         }
 
@@ -6213,7 +6212,7 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
         val = nr64(ESPC_MOD_STR_LEN);
         niudbg(PROBE, "SPROM: MOD_STR_LEN[%llu]\n",
                (unsigned long long) val);
-        if (val > 8 * 4)
+        if (val >= 8 * 4)
                 return -EINVAL;
 
         for (i = 0; i < val; i += 4) {
@@ -6229,7 +6228,7 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
         val = nr64(ESPC_BD_MOD_STR_LEN);
         niudbg(PROBE, "SPROM: BD_MOD_STR_LEN[%llu]\n",
                (unsigned long long) val);
-        if (val > 4 * 4)
+        if (val >= 4 * 4)
                 return -EINVAL;
 
         for (i = 0; i < val; i += 4) {
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 76efb3feffbf..014dc2cfe4d6 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -64,8 +64,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.83"
-#define DRV_MODULE_RELDATE      "October 10, 2007"
+#define DRV_MODULE_VERSION      "3.84"
+#define DRV_MODULE_RELDATE      "October 12, 2007"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -5056,6 +5056,12 @@ static void tg3_restore_pci_state(struct tg3 *tp)
 
         pci_write_config_dword(tp->pdev, TG3PCI_COMMAND, tp->pci_cmd);
 
+        if (!(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS)) {
+                pci_write_config_byte(tp->pdev, PCI_CACHE_LINE_SIZE,
+                                      tp->pci_cacheline_sz);
+                pci_write_config_byte(tp->pdev, PCI_LATENCY_TIMER,
+                                      tp->pci_lat_timer);
+        }
         /* Make sure PCI-X relaxed ordering bit is clear. */
         if (tp->pcix_cap) {
                 u16 pcix_cmd;