Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

drivers/net/amd8111e.c

@@ -953,7 +953,7 @@ static char* amd8111e_read_regs(struct amd8111e_priv* lp)
      	reg_buff = kmalloc( AMD8111E_REG_DUMP_LEN,GFP_KERNEL);
 	if(NULL == reg_buff)
 		return NULL;
-    	for( i=0; i< AMD8111E_REG_DUMP_LEN;i+=4);
+    	for (i=0; i < AMD8111E_REG_DUMP_LEN; i+=4)
 		reg_buff[i]= readl(mmio + i);	
 	return reg_buff;
 }

drivers/net/arlan.c

@@ -2045,7 +2045,7 @@ int init_module(void)
 void cleanup_module(void)
 {
 	int i = 0;
-	struct arlan_private ap;
+	struct arlan_private *ap;
 
 	ARLAN_DEBUG_ENTRY("cleanup_module");
 

drivers/net/fc/iph5526.c

@@ -3769,7 +3769,7 @@ struct pci_dev *pdev = NULL;
 	for (i = 0; i <= MAX_FC_CARDS; i++) 
 		fc[i] = NULL;
 
-	for (i = 0; i < clone_list[i].vendor_id != 0; i++)
+	for (i = 0; clone_list[i].vendor_id != 0; i++)
 	while ((pdev = pci_find_device(clone_list[i].vendor_id, clone_list[i].device_id, pdev))) {
 		unsigned short pci_command;
 		if (pci_enable_device(pdev))

drivers/net/tg3.c

@@ -6479,8 +6479,11 @@ static int __devinit tg3_test_dma(struct tg3 *tp)
 	}
 #endif
 
-	/* Remove this if it causes problems for some boards. */
-	tp->dma_rwctrl |= DMA_RWCTRL_USE_MEM_READ_MULT;
+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) {
+		/* Remove this if it causes problems for some boards. */
+		tp->dma_rwctrl |= DMA_RWCTRL_USE_MEM_READ_MULT;
+	}
 
 	tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);
 

drivers/net/tokenring/smctr.c

@@ -3064,7 +3064,7 @@ static int smctr_load_node_addr(struct net_device *dev)
         __u8 r;
 
         /* Check if node address has been specified by user. (non-0) */
-        for(i = 0; ((i < 6) && (dev->dev_addr[i] == 0)); i++);
+        for(i = 0; ((i < 6) && (dev->dev_addr[i] == 0)); i++)
         {
                 if(i != 6)
                 {