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

Conflicts:
	arch/microblaze/include/asm/socket.h

1 files changed, 13 insertions, 10 deletions

diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 4e8d3728e820..635341d6a028 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -173,8 +173,8 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 
 static const char version[] __devinitconst =
 KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "  Written by Donald Becker\n"
-KERN_INFO "   Some modifications by Eric kasten <kasten@nscl.msu.edu>\n"
-KERN_INFO "   Further modifications by Keith Underwood <keithu@parl.clemson.edu>\n";
+"   Some modifications by Eric kasten <kasten@nscl.msu.edu>\n"
+"   Further modifications by Keith Underwood <keithu@parl.clemson.edu>\n";
 
 
 /* IP_MF appears to be only defined in <netinet/ip.h>, however,
@@ -1080,11 +1080,14 @@ static void hamachi_tx_timeout(struct net_device *dev)
         {
                 printk(KERN_DEBUG "  Rx ring %p: ", hmp->rx_ring);
                 for (i = 0; i < RX_RING_SIZE; i++)
-                        printk(" %8.8x", le32_to_cpu(hmp->rx_ring[i].status_n_length));
-                printk("\n"KERN_DEBUG"  Tx ring %p: ", hmp->tx_ring);
+                        printk(KERN_CONT " %8.8x",
+                               le32_to_cpu(hmp->rx_ring[i].status_n_length));
+                printk(KERN_CONT "\n");
+                printk(KERN_DEBUG"  Tx ring %p: ", hmp->tx_ring);
                 for (i = 0; i < TX_RING_SIZE; i++)
-                        printk(" %4.4x", le32_to_cpu(hmp->tx_ring[i].status_n_length));
-                printk("\n");
+                        printk(KERN_CONT " %4.4x",
+                               le32_to_cpu(hmp->tx_ring[i].status_n_length));
+                printk(KERN_CONT "\n");
         }
 
         /* Reinit the hardware and make sure the Rx and Tx processes
@@ -1753,13 +1756,13 @@ static int hamachi_close(struct net_device *dev)
 
 #ifdef __i386__
         if (hamachi_debug > 2) {
-                printk("\n"KERN_DEBUG"  Tx ring at %8.8x:\n",
+                printk(KERN_DEBUG "  Tx ring at %8.8x:\n",
                            (int)hmp->tx_ring_dma);
                 for (i = 0; i < TX_RING_SIZE; i++)
-                        printk(" %c #%d desc. %8.8x %8.8x.\n",
+                        printk(KERN_DEBUG " %c #%d desc. %8.8x %8.8x.\n",
                                    readl(ioaddr + TxCurPtr) == (long)&hmp->tx_ring[i] ? '>' : ' ',
                                    i, hmp->tx_ring[i].status_n_length, hmp->tx_ring[i].addr);
-                printk("\n"KERN_DEBUG "  Rx ring %8.8x:\n",
+                printk(KERN_DEBUG "  Rx ring %8.8x:\n",
                            (int)hmp->rx_ring_dma);
                 for (i = 0; i < RX_RING_SIZE; i++) {
                         printk(KERN_DEBUG " %c #%d desc. %4.4x %8.8x\n",
@@ -1770,7 +1773,7 @@ static int hamachi_close(struct net_device *dev)
                                         u16 *addr = (u16 *)
                                                 hmp->rx_skbuff[i]->data;
                                         int j;
-
+                                        printk(KERN_DEBUG "Addr: ");
                                         for (j = 0; j < 0x50; j++)
                                                 printk(" %4.4x", addr[j]);
                                         printk("\n");