xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	arch/microblaze/include/asm/socket.h
This commit is contained in:
David S. Miller
2009-08-12 17:44:53 -07:00
parent 07f6642ee9 9799218ae3
commit aa11d958d1
1599 changed files with 38227 additions and 25978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/fealnx.c
View File

@@ -1210,17 +1210,20 @@ static void fealnx_tx_timeout(struct net_device *dev)
unsigned long flags;
int i;
printk(KERN_WARNING "%s: Transmit timed out, status %8.8x,"
" resetting...\n", dev->name, ioread32(ioaddr + ISR));
printk(KERN_WARNING
"%s: Transmit timed out, status %8.8x, resetting...\n",
dev->name, ioread32(ioaddr + ISR));
{
printk(KERN_DEBUG " Rx ring %p: ", np->rx_ring);
for (i = 0; i < RX_RING_SIZE; i++)
printk(" %8.8x", (unsigned int) np->rx_ring[i].status);
printk("\n" KERN_DEBUG " Tx ring %p: ", np->tx_ring);
printk(KERN_CONT " %8.8x",
(unsigned int) np->rx_ring[i].status);
printk(KERN_CONT "\n");
printk(KERN_DEBUG " Tx ring %p: ", np->tx_ring);
for (i = 0; i < TX_RING_SIZE; i++)
printk(" %4.4x", np->tx_ring[i].status);
printk("\n");
printk(KERN_CONT " %4.4x", np->tx_ring[i].status);
printk(KERN_CONT "\n");
}
spin_lock_irqsave(&np->lock, flags);