aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/3c507.c4
-rw-r--r--drivers/net/amd8111e.c4
-rw-r--r--drivers/net/at1700.c2
-rw-r--r--drivers/net/pppol2tp.c2
-rw-r--r--drivers/net/qla3xxx.c2
-rw-r--r--drivers/net/rrunner.c2
-rw-r--r--drivers/net/s2io.c6
-rw-r--r--drivers/net/sis900.c6
-rw-r--r--drivers/net/smc9194.c2
-rw-r--r--drivers/net/via-rhine.c2
10 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 964d31ac9449..f90ede931489 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -747,7 +747,7 @@ static void init_82586_mem(struct net_device *dev)
747 int boguscnt = 50; 747 int boguscnt = 50;
748 while (readw(shmem+iSCB_STATUS) == 0) 748 while (readw(shmem+iSCB_STATUS) == 0)
749 if (--boguscnt == 0) { 749 if (--boguscnt == 0) {
750 printk("%s: i82586 initialization timed out with status %04x," 750 printk("%s: i82586 initialization timed out with status %04x, "
751 "cmd %04x.\n", dev->name, 751 "cmd %04x.\n", dev->name,
752 readw(shmem+iSCB_STATUS), readw(shmem+iSCB_CMD)); 752 readw(shmem+iSCB_STATUS), readw(shmem+iSCB_CMD));
753 break; 753 break;
@@ -832,7 +832,7 @@ static void el16_rx(struct net_device *dev)
832 832
833 if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22 833 if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22
834 || (pkt_len & 0xC000) != 0xC000) { 834 || (pkt_len & 0xC000) != 0xC000) {
835 printk("%s: Rx frame at %#x corrupted, status %04x cmd %04x" 835 printk("%s: Rx frame at %#x corrupted, status %04x cmd %04x "
836 "next %04x data-buf @%04x %04x.\n", dev->name, rx_head, 836 "next %04x data-buf @%04x %04x.\n", dev->name, rx_head,
837 frame_status, rfd_cmd, next_rx_frame, data_buffer_addr, 837 frame_status, rfd_cmd, next_rx_frame, data_buffer_addr,
838 pkt_len); 838 pkt_len);
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index e7fdd81919bd..85f7276aaba5 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1945,13 +1945,13 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
1945 1945
1946 err = pci_enable_device(pdev); 1946 err = pci_enable_device(pdev);
1947 if(err){ 1947 if(err){
1948 printk(KERN_ERR "amd8111e: Cannot enable new PCI device," 1948 printk(KERN_ERR "amd8111e: Cannot enable new PCI device, "
1949 "exiting.\n"); 1949 "exiting.\n");
1950 return err; 1950 return err;
1951 } 1951 }
1952 1952
1953 if(!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)){ 1953 if(!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)){
1954 printk(KERN_ERR "amd8111e: Cannot find PCI base address" 1954 printk(KERN_ERR "amd8111e: Cannot find PCI base address, "
1955 "exiting.\n"); 1955 "exiting.\n");
1956 err = -ENODEV; 1956 err = -ENODEV;
1957 goto err_disable_pdev; 1957 goto err_disable_pdev;
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index b032c1bf492f..97041715e8c9 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -465,7 +465,7 @@ found:
465 /* Snarf the interrupt vector now. */ 465 /* Snarf the interrupt vector now. */
466 ret = request_irq(irq, &net_interrupt, 0, DRV_NAME, dev); 466 ret = request_irq(irq, &net_interrupt, 0, DRV_NAME, dev);
467 if (ret) { 467 if (ret) {
468 printk (" AT1700 at %#3x is unusable due to a conflict on" 468 printk (" AT1700 at %#3x is unusable due to a conflict on "
469 "IRQ %d.\n", ioaddr, irq); 469 "IRQ %d.\n", ioaddr, irq);
470 goto err_mca; 470 goto err_mca;
471 } 471 }
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index a7556cd2df79..1b51bb668d39 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -2489,7 +2489,7 @@ static void __exit pppol2tp_exit(void)
2489module_init(pppol2tp_init); 2489module_init(pppol2tp_init);
2490module_exit(pppol2tp_exit); 2490module_exit(pppol2tp_exit);
2491 2491
2492MODULE_AUTHOR("Martijn van Oosterhout <kleptog@svana.org>," 2492MODULE_AUTHOR("Martijn van Oosterhout <kleptog@svana.org>, "
2493 "James Chapman <jchapman@katalix.com>"); 2493 "James Chapman <jchapman@katalix.com>");
2494MODULE_DESCRIPTION("PPP over L2TP over UDP"); 2494MODULE_DESCRIPTION("PPP over L2TP over UDP");
2495MODULE_LICENSE("GPL"); 2495MODULE_LICENSE("GPL");
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index cf0774de6c41..00f2fddff1f2 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -711,7 +711,7 @@ static int ql_mii_write_reg_ex(struct ql3_adapter *qdev,
711 if (ql_wait_for_mii_ready(qdev)) { 711 if (ql_wait_for_mii_ready(qdev)) {
712 if (netif_msg_link(qdev)) 712 if (netif_msg_link(qdev))
713 printk(KERN_WARNING PFX 713 printk(KERN_WARNING PFX
714 "%s: Timed out waiting for management port to" 714 "%s: Timed out waiting for management port to "
715 "get free before issuing command.\n", 715 "get free before issuing command.\n",
716 qdev->ndev->name); 716 qdev->ndev->name);
717 return -1; 717 return -1;
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 55a590ab1e17..3dd8f1342f70 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -877,7 +877,7 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
877 dev->name); 877 dev->name);
878 goto drop; 878 goto drop;
879 case E_FLG_SYN_ERR: 879 case E_FLG_SYN_ERR:
880 printk(KERN_WARNING "%s: Flag sync. lost during" 880 printk(KERN_WARNING "%s: Flag sync. lost during "
881 "packet\n", dev->name); 881 "packet\n", dev->name);
882 goto drop; 882 goto drop;
883 case E_RX_INV_BUF: 883 case E_RX_INV_BUF:
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 644d71bfb640..5defb0b17258 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3772,7 +3772,7 @@ static int s2io_test_msi(struct s2io_nic *sp)
3772 3772
3773 if (!sp->msi_detected) { 3773 if (!sp->msi_detected) {
3774 /* MSI(X) test failed, go back to INTx mode */ 3774 /* MSI(X) test failed, go back to INTx mode */
3775 DBG_PRINT(ERR_DBG, "%s: PCI %s: No interrupt was generated" 3775 DBG_PRINT(ERR_DBG, "%s: PCI %s: No interrupt was generated "
3776 "using MSI(X) during test\n", sp->dev->name, 3776 "using MSI(X) during test\n", sp->dev->name,
3777 pci_name(pdev)); 3777 pci_name(pdev));
3778 3778
@@ -6868,7 +6868,7 @@ static int s2io_add_isr(struct s2io_nic * sp)
6868 /* If either data or addr is zero print it */ 6868 /* If either data or addr is zero print it */
6869 if(!(sp->msix_info[i].addr && 6869 if(!(sp->msix_info[i].addr &&
6870 sp->msix_info[i].data)) { 6870 sp->msix_info[i].data)) {
6871 DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx" 6871 DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx "
6872 "Data:0x%lx\n",sp->desc[i], 6872 "Data:0x%lx\n",sp->desc[i],
6873 (unsigned long long) 6873 (unsigned long long)
6874 sp->msix_info[i].addr, 6874 sp->msix_info[i].addr,
@@ -6886,7 +6886,7 @@ static int s2io_add_isr(struct s2io_nic * sp)
6886 /* If either data or addr is zero print it */ 6886 /* If either data or addr is zero print it */
6887 if(!(sp->msix_info[i].addr && 6887 if(!(sp->msix_info[i].addr &&
6888 sp->msix_info[i].data)) { 6888 sp->msix_info[i].data)) {
6889 DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx" 6889 DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx "
6890 "Data:0x%lx\n",sp->desc[i], 6890 "Data:0x%lx\n",sp->desc[i],
6891 (unsigned long long) 6891 (unsigned long long)
6892 sp->msix_info[i].addr, 6892 sp->msix_info[i].addr,
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 0857d2c88aa0..ec95e493ac1c 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -419,7 +419,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
419 419
420 i = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK); 420 i = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);
421 if(i){ 421 if(i){
422 printk(KERN_ERR "sis900.c: architecture does not support" 422 printk(KERN_ERR "sis900.c: architecture does not support "
423 "32bit PCI busmaster DMA\n"); 423 "32bit PCI busmaster DMA\n");
424 return i; 424 return i;
425 } 425 }
@@ -1667,7 +1667,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)
1667 /* something strange happened !!! */ 1667 /* something strange happened !!! */
1668 if (status & HIBERR) { 1668 if (status & HIBERR) {
1669 if(netif_msg_intr(sis_priv)) 1669 if(netif_msg_intr(sis_priv))
1670 printk(KERN_INFO "%s: Abnormal interrupt," 1670 printk(KERN_INFO "%s: Abnormal interrupt, "
1671 "status %#8.8x.\n", net_dev->name, status); 1671 "status %#8.8x.\n", net_dev->name, status);
1672 break; 1672 break;
1673 } 1673 }
@@ -1820,7 +1820,7 @@ refill_rx_ring:
1820 * how the hardware will react to this kind 1820 * how the hardware will react to this kind
1821 * of degenerated buffer */ 1821 * of degenerated buffer */
1822 if (netif_msg_rx_err(sis_priv)) 1822 if (netif_msg_rx_err(sis_priv))
1823 printk(KERN_INFO "%s: Memory squeeze," 1823 printk(KERN_INFO "%s: Memory squeeze, "
1824 "deferring packet.\n", 1824 "deferring packet.\n",
1825 net_dev->name); 1825 net_dev->name);
1826 net_dev->stats.rx_dropped++; 1826 net_dev->stats.rx_dropped++;
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index cb2698de5190..de67744c4a2a 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -906,7 +906,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
906 SMC_SELECT_BANK(1); 906 SMC_SELECT_BANK(1);
907 base_address_register = inw( ioaddr + BASE ); 907 base_address_register = inw( ioaddr + BASE );
908 if ( ioaddr != ( base_address_register >> 3 & 0x3E0 ) ) { 908 if ( ioaddr != ( base_address_register >> 3 & 0x3E0 ) ) {
909 printk(CARDNAME ": IOADDR %x doesn't match configuration (%x)." 909 printk(CARDNAME ": IOADDR %x doesn't match configuration (%x). "
910 "Probably not a SMC chip\n", 910 "Probably not a SMC chip\n",
911 ioaddr, base_address_register >> 3 & 0x3E0 ); 911 ioaddr, base_address_register >> 3 & 0x3E0 );
912 /* well, the base address register didn't match. Must not have 912 /* well, the base address register didn't match. Must not have
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 07263cd93f9c..87c180b563d3 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -1338,7 +1338,7 @@ static irqreturn_t rhine_interrupt(int irq, void *dev_instance)
1338 if (debug > 2 && 1338 if (debug > 2 &&
1339 ioread8(ioaddr+ChipCmd) & CmdTxOn) 1339 ioread8(ioaddr+ChipCmd) & CmdTxOn)
1340 printk(KERN_WARNING "%s: " 1340 printk(KERN_WARNING "%s: "
1341 "rhine_interrupt() Tx engine" 1341 "rhine_interrupt() Tx engine "
1342 "still on.\n", dev->name); 1342 "still on.\n", dev->name);
1343 } 1343 }
1344 rhine_tx(dev); 1344 rhine_tx(dev);