aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tokenring')
-rw-r--r--drivers/net/tokenring/3c359.c113
-rw-r--r--drivers/net/tokenring/ibmtr.c12
-rw-r--r--drivers/net/tokenring/lanstreamer.c59
-rw-r--r--drivers/net/tokenring/madgemc.c1
-rw-r--r--drivers/net/tokenring/olympic.c74
-rw-r--r--drivers/net/tokenring/smctr.c1
-rw-r--r--drivers/net/tokenring/tms380tr.c17
7 files changed, 139 insertions, 138 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 0fb930feea45..10800f16a231 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -63,6 +63,7 @@
63#include <linux/spinlock.h> 63#include <linux/spinlock.h>
64#include <linux/bitops.h> 64#include <linux/bitops.h>
65#include <linux/firmware.h> 65#include <linux/firmware.h>
66#include <linux/slab.h>
66 67
67#include <net/checksum.h> 68#include <net/checksum.h>
68 69
@@ -76,7 +77,7 @@ static char version[] __devinitdata =
76 77
77#define FW_NAME "3com/3C359.bin" 78#define FW_NAME "3com/3C359.bin"
78MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ; 79MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ;
79MODULE_DESCRIPTION("3Com 3C359 Velocity XL Token Ring Adapter Driver \n") ; 80MODULE_DESCRIPTION("3Com 3C359 Velocity XL Token Ring Adapter Driver\n") ;
80MODULE_FIRMWARE(FW_NAME); 81MODULE_FIRMWARE(FW_NAME);
81 82
82/* Module parameters */ 83/* Module parameters */
@@ -162,19 +163,19 @@ static void print_tx_state(struct net_device *dev)
162 u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 163 u8 __iomem *xl_mmio = xl_priv->xl_mmio ;
163 int i ; 164 int i ;
164 165
165 printk("tx_ring_head: %d, tx_ring_tail: %d, free_ent: %d \n",xl_priv->tx_ring_head, 166 printk("tx_ring_head: %d, tx_ring_tail: %d, free_ent: %d\n",xl_priv->tx_ring_head,
166 xl_priv->tx_ring_tail, xl_priv->free_ring_entries) ; 167 xl_priv->tx_ring_tail, xl_priv->free_ring_entries) ;
167 printk("Ring , Address , FSH , DnNextPtr, Buffer, Buffer_Len \n"); 168 printk("Ring , Address , FSH , DnNextPtr, Buffer, Buffer_Len\n");
168 for (i = 0; i < 16; i++) { 169 for (i = 0; i < 16; i++) {
169 txd = &(xl_priv->xl_tx_ring[i]) ; 170 txd = &(xl_priv->xl_tx_ring[i]) ;
170 printk("%d, %08lx, %08x, %08x, %08x, %08x \n", i, virt_to_bus(txd), 171 printk("%d, %08lx, %08x, %08x, %08x, %08x\n", i, virt_to_bus(txd),
171 txd->framestartheader, txd->dnnextptr, txd->buffer, txd->buffer_length ) ; 172 txd->framestartheader, txd->dnnextptr, txd->buffer, txd->buffer_length ) ;
172 } 173 }
173 174
174 printk("DNLISTPTR = %04x \n", readl(xl_mmio + MMIO_DNLISTPTR) ); 175 printk("DNLISTPTR = %04x\n", readl(xl_mmio + MMIO_DNLISTPTR) );
175 176
176 printk("DmaCtl = %04x \n", readl(xl_mmio + MMIO_DMA_CTRL) ); 177 printk("DmaCtl = %04x\n", readl(xl_mmio + MMIO_DMA_CTRL) );
177 printk("Queue status = %0x \n",netif_running(dev) ) ; 178 printk("Queue status = %0x\n",netif_running(dev) ) ;
178} 179}
179 180
180static void print_rx_state(struct net_device *dev) 181static void print_rx_state(struct net_device *dev)
@@ -185,19 +186,19 @@ static void print_rx_state(struct net_device *dev)
185 u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 186 u8 __iomem *xl_mmio = xl_priv->xl_mmio ;
186 int i ; 187 int i ;
187 188
188 printk("rx_ring_tail: %d \n", xl_priv->rx_ring_tail) ; 189 printk("rx_ring_tail: %d\n", xl_priv->rx_ring_tail);
189 printk("Ring , Address , FrameState , UPNextPtr, FragAddr, Frag_Len \n"); 190 printk("Ring , Address , FrameState , UPNextPtr, FragAddr, Frag_Len\n");
190 for (i = 0; i < 16; i++) { 191 for (i = 0; i < 16; i++) {
191 /* rxd = (struct xl_rx_desc *)xl_priv->rx_ring_dma_addr + (i * sizeof(struct xl_rx_desc)) ; */ 192 /* rxd = (struct xl_rx_desc *)xl_priv->rx_ring_dma_addr + (i * sizeof(struct xl_rx_desc)) ; */
192 rxd = &(xl_priv->xl_rx_ring[i]) ; 193 rxd = &(xl_priv->xl_rx_ring[i]) ;
193 printk("%d, %08lx, %08x, %08x, %08x, %08x \n", i, virt_to_bus(rxd), 194 printk("%d, %08lx, %08x, %08x, %08x, %08x\n", i, virt_to_bus(rxd),
194 rxd->framestatus, rxd->upnextptr, rxd->upfragaddr, rxd->upfraglen ) ; 195 rxd->framestatus, rxd->upnextptr, rxd->upfragaddr, rxd->upfraglen ) ;
195 } 196 }
196 197
197 printk("UPLISTPTR = %04x \n", readl(xl_mmio + MMIO_UPLISTPTR) ); 198 printk("UPLISTPTR = %04x\n", readl(xl_mmio + MMIO_UPLISTPTR));
198 199
199 printk("DmaCtl = %04x \n", readl(xl_mmio + MMIO_DMA_CTRL) ); 200 printk("DmaCtl = %04x\n", readl(xl_mmio + MMIO_DMA_CTRL));
200 printk("Queue status = %0x \n",netif_running(dev) ) ; 201 printk("Queue status = %0x\n",netif_running(dev));
201} 202}
202#endif 203#endif
203 204
@@ -390,7 +391,7 @@ static int __devinit xl_init(struct net_device *dev)
390 struct xl_private *xl_priv = netdev_priv(dev); 391 struct xl_private *xl_priv = netdev_priv(dev);
391 int err; 392 int err;
392 393
393 printk(KERN_INFO "%s \n", version); 394 printk(KERN_INFO "%s\n", version);
394 printk(KERN_INFO "%s: I/O at %hx, MMIO at %p, using irq %d\n", 395 printk(KERN_INFO "%s: I/O at %hx, MMIO at %p, using irq %d\n",
395 xl_priv->xl_card_name, (unsigned int)dev->base_addr ,xl_priv->xl_mmio, dev->irq); 396 xl_priv->xl_card_name, (unsigned int)dev->base_addr ,xl_priv->xl_mmio, dev->irq);
396 397
@@ -462,7 +463,7 @@ static int xl_hw_reset(struct net_device *dev)
462 writel( (IO_WORD_READ | PMBAR),xl_mmio + MMIO_MAC_ACCESS_CMD); 463 writel( (IO_WORD_READ | PMBAR),xl_mmio + MMIO_MAC_ACCESS_CMD);
463 464
464#if XL_DEBUG 465#if XL_DEBUG
465 printk(KERN_INFO "Read from PMBAR = %04x \n", readw(xl_mmio + MMIO_MACDATA)) ; 466 printk(KERN_INFO "Read from PMBAR = %04x\n", readw(xl_mmio + MMIO_MACDATA));
466#endif 467#endif
467 468
468 if ( readw( (xl_mmio + MMIO_MACDATA)) & PMB_CPHOLD ) { 469 if ( readw( (xl_mmio + MMIO_MACDATA)) & PMB_CPHOLD ) {
@@ -590,9 +591,9 @@ static int xl_hw_reset(struct net_device *dev)
590#if XL_DEBUG 591#if XL_DEBUG
591 writel(IO_WORD_READ | SWITCHSETTINGS, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 592 writel(IO_WORD_READ | SWITCHSETTINGS, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
592 if ( readw(xl_mmio + MMIO_MACDATA) & 2) { 593 if ( readw(xl_mmio + MMIO_MACDATA) & 2) {
593 printk(KERN_INFO "Default ring speed 4 mbps \n") ; 594 printk(KERN_INFO "Default ring speed 4 mbps\n");
594 } else { 595 } else {
595 printk(KERN_INFO "Default ring speed 16 mbps \n") ; 596 printk(KERN_INFO "Default ring speed 16 mbps\n");
596 } 597 }
597 printk(KERN_INFO "%s: xl_priv->srb = %04x\n",xl_priv->xl_card_name, xl_priv->srb); 598 printk(KERN_INFO "%s: xl_priv->srb = %04x\n",xl_priv->xl_card_name, xl_priv->srb);
598#endif 599#endif
@@ -650,7 +651,7 @@ static int xl_open(struct net_device *dev)
650 651
651 if (open_err != 0) { /* Something went wrong with the open command */ 652 if (open_err != 0) { /* Something went wrong with the open command */
652 if (open_err & 0x07) { /* Wrong speed, retry at different speed */ 653 if (open_err & 0x07) { /* Wrong speed, retry at different speed */
653 printk(KERN_WARNING "%s: Open Error, retrying at different ringspeed \n", dev->name) ; 654 printk(KERN_WARNING "%s: Open Error, retrying at different ringspeed\n", dev->name);
654 switchsettings = switchsettings ^ 2 ; 655 switchsettings = switchsettings ^ 2 ;
655 xl_ee_write(dev,0x08,switchsettings) ; 656 xl_ee_write(dev,0x08,switchsettings) ;
656 xl_hw_reset(dev) ; 657 xl_hw_reset(dev) ;
@@ -702,7 +703,7 @@ static int xl_open(struct net_device *dev)
702 } 703 }
703 704
704 if (i==0) { 705 if (i==0) {
705 printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers. Adapter disabled \n",dev->name) ; 706 printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers. Adapter disabled\n",dev->name);
706 free_irq(dev->irq,dev) ; 707 free_irq(dev->irq,dev) ;
707 kfree(xl_priv->xl_tx_ring); 708 kfree(xl_priv->xl_tx_ring);
708 kfree(xl_priv->xl_rx_ring); 709 kfree(xl_priv->xl_rx_ring);
@@ -852,7 +853,7 @@ static int xl_open_hw(struct net_device *dev)
852 853
853 writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 12, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 854 writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 12, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
854 xl_priv->arb = swab16(readw(xl_mmio + MMIO_MACDATA)) ; 855 xl_priv->arb = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
855 printk(", ARB: %04x \n",xl_priv->arb ) ; 856 printk(", ARB: %04x\n",xl_priv->arb );
856 writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 14, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 857 writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 14, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
857 vsoff = swab16(readw(xl_mmio + MMIO_MACDATA)) ; 858 vsoff = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
858 859
@@ -866,7 +867,7 @@ static int xl_open_hw(struct net_device *dev)
866 ver_str[i] = readb(xl_mmio + MMIO_MACDATA) ; 867 ver_str[i] = readb(xl_mmio + MMIO_MACDATA) ;
867 } 868 }
868 ver_str[i] = '\0' ; 869 ver_str[i] = '\0' ;
869 printk(KERN_INFO "%s: Microcode version String: %s \n",dev->name,ver_str); 870 printk(KERN_INFO "%s: Microcode version String: %s\n",dev->name,ver_str);
870 } 871 }
871 872
872 /* 873 /*
@@ -990,7 +991,7 @@ static void xl_rx(struct net_device *dev)
990 skb = dev_alloc_skb(xl_priv->pkt_buf_sz) ; 991 skb = dev_alloc_skb(xl_priv->pkt_buf_sz) ;
991 992
992 if (skb==NULL) { /* Still need to fix the rx ring */ 993 if (skb==NULL) { /* Still need to fix the rx ring */
993 printk(KERN_WARNING "%s: dev_alloc_skb failed in rx, single buffer \n",dev->name) ; 994 printk(KERN_WARNING "%s: dev_alloc_skb failed in rx, single buffer\n",dev->name);
994 adv_rx_ring(dev) ; 995 adv_rx_ring(dev) ;
995 dev->stats.rx_dropped++ ; 996 dev->stats.rx_dropped++ ;
996 writel(ACK_INTERRUPT | UPCOMPACK | LATCH_ACK , xl_mmio + MMIO_COMMAND) ; 997 writel(ACK_INTERRUPT | UPCOMPACK | LATCH_ACK , xl_mmio + MMIO_COMMAND) ;
@@ -1091,7 +1092,7 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id)
1091 */ 1092 */
1092 if (intstatus == 0x0001) { 1093 if (intstatus == 0x0001) {
1093 writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 1094 writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ;
1094 printk(KERN_INFO "%s: 00001 int received \n",dev->name) ; 1095 printk(KERN_INFO "%s: 00001 int received\n",dev->name);
1095 } else { 1096 } else {
1096 if (intstatus & (HOSTERRINT | SRBRINT | ARBCINT | UPCOMPINT | DNCOMPINT | HARDERRINT | (1<<8) | TXUNDERRUN | ASBFINT)) { 1097 if (intstatus & (HOSTERRINT | SRBRINT | ARBCINT | UPCOMPINT | DNCOMPINT | HARDERRINT | (1<<8) | TXUNDERRUN | ASBFINT)) {
1097 1098
@@ -1102,9 +1103,9 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id)
1102 */ 1103 */
1103 1104
1104 if (intstatus & HOSTERRINT) { 1105 if (intstatus & HOSTERRINT) {
1105 printk(KERN_WARNING "%s: Host Error, performing global reset, intstatus = %04x \n",dev->name,intstatus) ; 1106 printk(KERN_WARNING "%s: Host Error, performing global reset, intstatus = %04x\n",dev->name,intstatus);
1106 writew( GLOBAL_RESET, xl_mmio + MMIO_COMMAND ) ; 1107 writew( GLOBAL_RESET, xl_mmio + MMIO_COMMAND ) ;
1107 printk(KERN_WARNING "%s: Resetting hardware: \n", dev->name); 1108 printk(KERN_WARNING "%s: Resetting hardware:\n", dev->name);
1108 netif_stop_queue(dev) ; 1109 netif_stop_queue(dev) ;
1109 xl_freemem(dev) ; 1110 xl_freemem(dev) ;
1110 free_irq(dev->irq,dev); 1111 free_irq(dev->irq,dev);
@@ -1127,7 +1128,7 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id)
1127 Must put a timeout check here ! */ 1128 Must put a timeout check here ! */
1128 /* Empty Loop */ 1129 /* Empty Loop */
1129 } 1130 }
1130 printk(KERN_WARNING "%s: TX Underrun received \n",dev->name) ; 1131 printk(KERN_WARNING "%s: TX Underrun received\n",dev->name);
1131 writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 1132 writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ;
1132 } /* TxUnderRun */ 1133 } /* TxUnderRun */
1133 1134
@@ -1156,13 +1157,13 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id)
1156 macstatus = readw(xl_mmio + MMIO_MACDATA) ; 1157 macstatus = readw(xl_mmio + MMIO_MACDATA) ;
1157 printk(KERN_WARNING "%s: MacStatusError, details: ", dev->name); 1158 printk(KERN_WARNING "%s: MacStatusError, details: ", dev->name);
1158 if (macstatus & (1<<14)) 1159 if (macstatus & (1<<14))
1159 printk(KERN_WARNING "tchk error: Unrecoverable error \n") ; 1160 printk(KERN_WARNING "tchk error: Unrecoverable error\n");
1160 if (macstatus & (1<<3)) 1161 if (macstatus & (1<<3))
1161 printk(KERN_WARNING "eint error: Internal watchdog timer expired \n") ; 1162 printk(KERN_WARNING "eint error: Internal watchdog timer expired\n");
1162 if (macstatus & (1<<2)) 1163 if (macstatus & (1<<2))
1163 printk(KERN_WARNING "aint error: Host tried to perform invalid operation \n") ; 1164 printk(KERN_WARNING "aint error: Host tried to perform invalid operation\n");
1164 printk(KERN_WARNING "Instatus = %02x, macstatus = %02x\n",intstatus,macstatus) ; 1165 printk(KERN_WARNING "Instatus = %02x, macstatus = %02x\n",intstatus,macstatus) ;
1165 printk(KERN_WARNING "%s: Resetting hardware: \n", dev->name); 1166 printk(KERN_WARNING "%s: Resetting hardware:\n", dev->name);
1166 netif_stop_queue(dev) ; 1167 netif_stop_queue(dev) ;
1167 xl_freemem(dev) ; 1168 xl_freemem(dev) ;
1168 free_irq(dev->irq,dev); 1169 free_irq(dev->irq,dev);
@@ -1174,7 +1175,7 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id)
1174 return IRQ_HANDLED; 1175 return IRQ_HANDLED;
1175 } 1176 }
1176 } else { 1177 } else {
1177 printk(KERN_WARNING "%s: Received Unknown interrupt : %04x \n", dev->name, intstatus) ; 1178 printk(KERN_WARNING "%s: Received Unknown interrupt : %04x\n", dev->name, intstatus);
1178 writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 1179 writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ;
1179 } 1180 }
1180 } 1181 }
@@ -1349,11 +1350,11 @@ static int xl_close(struct net_device *dev)
1349 1350
1350 writel(MEM_BYTE_READ | 0xd0000 | xl_priv->srb, xl_mmio + MMIO_MAC_ACCESS_CMD); 1351 writel(MEM_BYTE_READ | 0xd0000 | xl_priv->srb, xl_mmio + MMIO_MAC_ACCESS_CMD);
1351 if (readb(xl_mmio + MMIO_MACDATA) != CLOSE_NIC) { 1352 if (readb(xl_mmio + MMIO_MACDATA) != CLOSE_NIC) {
1352 printk(KERN_INFO "%s: CLOSE_NIC did not get a CLOSE_NIC response \n",dev->name) ; 1353 printk(KERN_INFO "%s: CLOSE_NIC did not get a CLOSE_NIC response\n",dev->name);
1353 } else { 1354 } else {
1354 writel((MEM_BYTE_READ | 0xd0000 | xl_priv->srb) +2, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 1355 writel((MEM_BYTE_READ | 0xd0000 | xl_priv->srb) +2, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
1355 if (readb(xl_mmio + MMIO_MACDATA)==0) { 1356 if (readb(xl_mmio + MMIO_MACDATA)==0) {
1356 printk(KERN_INFO "%s: Adapter has been closed \n",dev->name) ; 1357 printk(KERN_INFO "%s: Adapter has been closed\n",dev->name);
1357 writew(ACK_INTERRUPT | SRBRACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 1358 writew(ACK_INTERRUPT | SRBRACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ;
1358 1359
1359 xl_freemem(dev) ; 1360 xl_freemem(dev) ;
@@ -1390,7 +1391,7 @@ static int xl_close(struct net_device *dev)
1390static void xl_set_rx_mode(struct net_device *dev) 1391static void xl_set_rx_mode(struct net_device *dev)
1391{ 1392{
1392 struct xl_private *xl_priv = netdev_priv(dev); 1393 struct xl_private *xl_priv = netdev_priv(dev);
1393 struct dev_mc_list *dmi; 1394 struct netdev_hw_addr *ha;
1394 unsigned char dev_mc_address[4] ; 1395 unsigned char dev_mc_address[4] ;
1395 u16 options ; 1396 u16 options ;
1396 1397
@@ -1407,11 +1408,11 @@ static void xl_set_rx_mode(struct net_device *dev)
1407 1408
1408 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; 1409 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ;
1409 1410
1410 netdev_for_each_mc_addr(dmi, dev) { 1411 netdev_for_each_mc_addr(ha, dev) {
1411 dev_mc_address[0] |= dmi->dmi_addr[2] ; 1412 dev_mc_address[0] |= ha->addr[2];
1412 dev_mc_address[1] |= dmi->dmi_addr[3] ; 1413 dev_mc_address[1] |= ha->addr[3];
1413 dev_mc_address[2] |= dmi->dmi_addr[4] ; 1414 dev_mc_address[2] |= ha->addr[4];
1414 dev_mc_address[3] |= dmi->dmi_addr[5] ; 1415 dev_mc_address[3] |= ha->addr[5];
1415 } 1416 }
1416 1417
1417 if (memcmp(xl_priv->xl_functional_addr,dev_mc_address,4) != 0) { /* Options have changed, run the command */ 1418 if (memcmp(xl_priv->xl_functional_addr,dev_mc_address,4) != 0) { /* Options have changed, run the command */
@@ -1446,11 +1447,11 @@ static void xl_srb_bh(struct net_device *dev)
1446 printk(KERN_INFO "%s: Command: %d - Invalid Command code\n",dev->name,srb_cmd) ; 1447 printk(KERN_INFO "%s: Command: %d - Invalid Command code\n",dev->name,srb_cmd) ;
1447 break ; 1448 break ;
1448 case 4: 1449 case 4:
1449 printk(KERN_INFO "%s: Command: %d - Adapter is closed, must be open for this command \n",dev->name,srb_cmd) ; 1450 printk(KERN_INFO "%s: Command: %d - Adapter is closed, must be open for this command\n",dev->name,srb_cmd);
1450 break ; 1451 break ;
1451 1452
1452 case 6: 1453 case 6:
1453 printk(KERN_INFO "%s: Command: %d - Options Invalid for command \n",dev->name,srb_cmd) ; 1454 printk(KERN_INFO "%s: Command: %d - Options Invalid for command\n",dev->name,srb_cmd);
1454 break ; 1455 break ;
1455 1456
1456 case 0: /* Successful command execution */ 1457 case 0: /* Successful command execution */
@@ -1471,11 +1472,11 @@ static void xl_srb_bh(struct net_device *dev)
1471 break ; 1472 break ;
1472 case SET_FUNC_ADDRESS: 1473 case SET_FUNC_ADDRESS:
1473 if(xl_priv->xl_message_level) 1474 if(xl_priv->xl_message_level)
1474 printk(KERN_INFO "%s: Functional Address Set \n",dev->name) ; 1475 printk(KERN_INFO "%s: Functional Address Set\n",dev->name);
1475 break ; 1476 break ;
1476 case CLOSE_NIC: 1477 case CLOSE_NIC:
1477 if(xl_priv->xl_message_level) 1478 if(xl_priv->xl_message_level)
1478 printk(KERN_INFO "%s: Received CLOSE_NIC interrupt in interrupt handler \n",dev->name) ; 1479 printk(KERN_INFO "%s: Received CLOSE_NIC interrupt in interrupt handler\n",dev->name);
1479 break ; 1480 break ;
1480 case SET_MULTICAST_MODE: 1481 case SET_MULTICAST_MODE:
1481 if(xl_priv->xl_message_level) 1482 if(xl_priv->xl_message_level)
@@ -1484,9 +1485,9 @@ static void xl_srb_bh(struct net_device *dev)
1484 case SET_RECEIVE_MODE: 1485 case SET_RECEIVE_MODE:
1485 if(xl_priv->xl_message_level) { 1486 if(xl_priv->xl_message_level) {
1486 if (xl_priv->xl_copy_all_options == 0x0004) 1487 if (xl_priv->xl_copy_all_options == 0x0004)
1487 printk(KERN_INFO "%s: Entering promiscuous mode \n", dev->name) ; 1488 printk(KERN_INFO "%s: Entering promiscuous mode\n", dev->name);
1488 else 1489 else
1489 printk(KERN_INFO "%s: Entering normal receive mode \n",dev->name) ; 1490 printk(KERN_INFO "%s: Entering normal receive mode\n",dev->name);
1490 } 1491 }
1491 break ; 1492 break ;
1492 1493
@@ -1556,20 +1557,20 @@ static void xl_arb_cmd(struct net_device *dev)
1556 xl_freemem(dev) ; 1557 xl_freemem(dev) ;
1557 free_irq(dev->irq,dev); 1558 free_irq(dev->irq,dev);
1558 1559
1559 printk(KERN_WARNING "%s: Adapter has been closed \n", dev->name) ; 1560 printk(KERN_WARNING "%s: Adapter has been closed\n", dev->name);
1560 } /* If serious error */ 1561 } /* If serious error */
1561 1562
1562 if (xl_priv->xl_message_level) { 1563 if (xl_priv->xl_message_level) {
1563 if (lan_status_diff & LSC_SIG_LOSS) 1564 if (lan_status_diff & LSC_SIG_LOSS)
1564 printk(KERN_WARNING "%s: No receive signal detected \n", dev->name) ; 1565 printk(KERN_WARNING "%s: No receive signal detected\n", dev->name);
1565 if (lan_status_diff & LSC_HARD_ERR) 1566 if (lan_status_diff & LSC_HARD_ERR)
1566 printk(KERN_INFO "%s: Beaconing \n",dev->name); 1567 printk(KERN_INFO "%s: Beaconing\n",dev->name);
1567 if (lan_status_diff & LSC_SOFT_ERR) 1568 if (lan_status_diff & LSC_SOFT_ERR)
1568 printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame \n",dev->name); 1569 printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n",dev->name);
1569 if (lan_status_diff & LSC_TRAN_BCN) 1570 if (lan_status_diff & LSC_TRAN_BCN)
1570 printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n",dev->name); 1571 printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n",dev->name);
1571 if (lan_status_diff & LSC_SS) 1572 if (lan_status_diff & LSC_SS)
1572 printk(KERN_INFO "%s: Single Station on the ring \n", dev->name); 1573 printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
1573 if (lan_status_diff & LSC_RING_REC) 1574 if (lan_status_diff & LSC_RING_REC)
1574 printk(KERN_INFO "%s: Ring recovery ongoing\n",dev->name); 1575 printk(KERN_INFO "%s: Ring recovery ongoing\n",dev->name);
1575 if (lan_status_diff & LSC_FDX_MODE) 1576 if (lan_status_diff & LSC_FDX_MODE)
@@ -1578,7 +1579,7 @@ static void xl_arb_cmd(struct net_device *dev)
1578 1579
1579 if (lan_status_diff & LSC_CO) { 1580 if (lan_status_diff & LSC_CO) {
1580 if (xl_priv->xl_message_level) 1581 if (xl_priv->xl_message_level)
1581 printk(KERN_INFO "%s: Counter Overflow \n", dev->name); 1582 printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
1582 /* Issue READ.LOG command */ 1583 /* Issue READ.LOG command */
1583 xl_srb_cmd(dev, READ_LOG) ; 1584 xl_srb_cmd(dev, READ_LOG) ;
1584 } 1585 }
@@ -1594,7 +1595,7 @@ static void xl_arb_cmd(struct net_device *dev)
1594 } /* Lan.change.status */ 1595 } /* Lan.change.status */
1595 else if ( arb_cmd == RECEIVE_DATA) { /* Received.Data */ 1596 else if ( arb_cmd == RECEIVE_DATA) { /* Received.Data */
1596#if XL_DEBUG 1597#if XL_DEBUG
1597 printk(KERN_INFO "Received.Data \n") ; 1598 printk(KERN_INFO "Received.Data\n");
1598#endif 1599#endif
1599 writel( ((MEM_WORD_READ | 0xD0000 | xl_priv->arb) + 6), xl_mmio + MMIO_MAC_ACCESS_CMD) ; 1600 writel( ((MEM_WORD_READ | 0xD0000 | xl_priv->arb) + 6), xl_mmio + MMIO_MAC_ACCESS_CMD) ;
1600 xl_priv->mac_buffer = swab16(readw(xl_mmio + MMIO_MACDATA)) ; 1601 xl_priv->mac_buffer = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
@@ -1629,7 +1630,7 @@ static void xl_arb_cmd(struct net_device *dev)
1629 xl_asb_cmd(dev) ; 1630 xl_asb_cmd(dev) ;
1630 1631
1631 } else { 1632 } else {
1632 printk(KERN_WARNING "%s: Received unknown arb (xl_priv) command: %02x \n",dev->name,arb_cmd) ; 1633 printk(KERN_WARNING "%s: Received unknown arb (xl_priv) command: %02x\n",dev->name,arb_cmd);
1633 } 1634 }
1634 1635
1635 /* Acknowledge the arb interrupt */ 1636 /* Acknowledge the arb interrupt */
@@ -1686,13 +1687,13 @@ static void xl_asb_bh(struct net_device *dev)
1686 ret_code = readb(xl_mmio + MMIO_MACDATA) ; 1687 ret_code = readb(xl_mmio + MMIO_MACDATA) ;
1687 switch (ret_code) { 1688 switch (ret_code) {
1688 case 0x01: 1689 case 0x01:
1689 printk(KERN_INFO "%s: ASB Command, unrecognized command code \n",dev->name) ; 1690 printk(KERN_INFO "%s: ASB Command, unrecognized command code\n",dev->name);
1690 break ; 1691 break ;
1691 case 0x26: 1692 case 0x26:
1692 printk(KERN_INFO "%s: ASB Command, unexpected receive buffer \n", dev->name) ; 1693 printk(KERN_INFO "%s: ASB Command, unexpected receive buffer\n", dev->name);
1693 break ; 1694 break ;
1694 case 0x40: 1695 case 0x40:
1695 printk(KERN_INFO "%s: ASB Command, Invalid Station ID \n", dev->name) ; 1696 printk(KERN_INFO "%s: ASB Command, Invalid Station ID\n", dev->name);
1696 break ; 1697 break ;
1697 } 1698 }
1698 xl_priv->asb_queued = 0 ; 1699 xl_priv->asb_queued = 0 ;
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 1a0967246e2f..eebdaae24328 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -986,7 +986,7 @@ static void open_sap(unsigned char type, struct net_device *dev)
986static void tok_set_multicast_list(struct net_device *dev) 986static void tok_set_multicast_list(struct net_device *dev)
987{ 987{
988 struct tok_info *ti = netdev_priv(dev); 988 struct tok_info *ti = netdev_priv(dev);
989 struct dev_mc_list *mclist; 989 struct netdev_hw_addr *ha;
990 unsigned char address[4]; 990 unsigned char address[4];
991 991
992 int i; 992 int i;
@@ -995,11 +995,11 @@ static void tok_set_multicast_list(struct net_device *dev)
995 /*BMS ifconfig tr down or hot unplug a PCMCIA card ??hownowbrowncow*/ 995 /*BMS ifconfig tr down or hot unplug a PCMCIA card ??hownowbrowncow*/
996 if (/*BMSHELPdev->start == 0 ||*/ ti->open_status != OPEN) return; 996 if (/*BMSHELPdev->start == 0 ||*/ ti->open_status != OPEN) return;
997 address[0] = address[1] = address[2] = address[3] = 0; 997 address[0] = address[1] = address[2] = address[3] = 0;
998 netdev_for_each_mc_addr(mclist, dev) { 998 netdev_for_each_mc_addr(ha, dev) {
999 address[0] |= mclist->dmi_addr[2]; 999 address[0] |= ha->addr[2];
1000 address[1] |= mclist->dmi_addr[3]; 1000 address[1] |= ha->addr[3];
1001 address[2] |= mclist->dmi_addr[4]; 1001 address[2] |= ha->addr[4];
1002 address[3] |= mclist->dmi_addr[5]; 1002 address[3] |= ha->addr[5];
1003 } 1003 }
1004 SET_PAGE(ti->srb_page); 1004 SET_PAGE(ti->srb_page);
1005 for (i = 0; i < sizeof(struct srb_set_funct_addr); i++) 1005 for (i = 0; i < sizeof(struct srb_set_funct_addr); i++)
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index dd028fee9dc2..5bd140704533 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -121,6 +121,7 @@
121#include <linux/spinlock.h> 121#include <linux/spinlock.h>
122#include <linux/bitops.h> 122#include <linux/bitops.h>
123#include <linux/jiffies.h> 123#include <linux/jiffies.h>
124#include <linux/slab.h>
124 125
125#include <net/net_namespace.h> 126#include <net/net_namespace.h>
126#include <net/checksum.h> 127#include <net/checksum.h>
@@ -357,7 +358,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
357 pcr |= PCI_COMMAND_SERR; 358 pcr |= PCI_COMMAND_SERR;
358 pci_write_config_word (pdev, PCI_COMMAND, pcr); 359 pci_write_config_word (pdev, PCI_COMMAND, pcr);
359 360
360 printk("%s \n", version); 361 printk("%s\n", version);
361 printk("%s: %s. I/O at %hx, MMIO at %p, using irq %d\n",dev->name, 362 printk("%s: %s. I/O at %hx, MMIO at %p, using irq %d\n",dev->name,
362 streamer_priv->streamer_card_name, 363 streamer_priv->streamer_card_name,
363 (unsigned int) dev->base_addr, 364 (unsigned int) dev->base_addr,
@@ -650,7 +651,7 @@ static int streamer_open(struct net_device *dev)
650#if STREAMER_DEBUG 651#if STREAMER_DEBUG
651 writew(readw(streamer_mmio + LAPWWO), 652 writew(readw(streamer_mmio + LAPWWO),
652 streamer_mmio + LAPA); 653 streamer_mmio + LAPA);
653 printk("srb open request: \n"); 654 printk("srb open request:\n");
654 for (i = 0; i < 16; i++) { 655 for (i = 0; i < 16; i++) {
655 printk("%x:", ntohs(readw(streamer_mmio + LAPDINC))); 656 printk("%x:", ntohs(readw(streamer_mmio + LAPDINC)));
656 } 657 }
@@ -700,7 +701,7 @@ static int streamer_open(struct net_device *dev)
700 if (srb_word != 0) { 701 if (srb_word != 0) {
701 if (srb_word == 0x07) { 702 if (srb_word == 0x07) {
702 if (!streamer_priv->streamer_ring_speed && open_finished) { /* Autosense , first time around */ 703 if (!streamer_priv->streamer_ring_speed && open_finished) { /* Autosense , first time around */
703 printk(KERN_WARNING "%s: Retrying at different ring speed \n", 704 printk(KERN_WARNING "%s: Retrying at different ring speed\n",
704 dev->name); 705 dev->name);
705 open_finished = 0; 706 open_finished = 0;
706 } else { 707 } else {
@@ -716,7 +717,7 @@ static int streamer_open(struct net_device *dev)
716 ((error_code & 0x0f) == 0x0d)) 717 ((error_code & 0x0f) == 0x0d))
717 { 718 {
718 printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n", dev->name); 719 printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n", dev->name);
719 printk(KERN_WARNING "%s: Please try again with a specified ring speed \n", dev->name); 720 printk(KERN_WARNING "%s: Please try again with a specified ring speed\n", dev->name);
720 free_irq(dev->irq, dev); 721 free_irq(dev->irq, dev);
721 return -EIO; 722 return -EIO;
722 } 723 }
@@ -922,7 +923,7 @@ static void streamer_rx(struct net_device *dev)
922 923
923 if (rx_desc->status & 0x7E830000) { /* errors */ 924 if (rx_desc->status & 0x7E830000) { /* errors */
924 if (streamer_priv->streamer_message_level) { 925 if (streamer_priv->streamer_message_level) {
925 printk(KERN_WARNING "%s: Rx Error %x \n", 926 printk(KERN_WARNING "%s: Rx Error %x\n",
926 dev->name, rx_desc->status); 927 dev->name, rx_desc->status);
927 } 928 }
928 } else { /* received without errors */ 929 } else { /* received without errors */
@@ -935,7 +936,7 @@ static void streamer_rx(struct net_device *dev)
935 936
936 if (skb == NULL) 937 if (skb == NULL)
937 { 938 {
938 printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers. \n", dev->name); 939 printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers.\n", dev->name);
939 dev->stats.rx_dropped++; 940 dev->stats.rx_dropped++;
940 } else { /* we allocated an skb OK */ 941 } else { /* we allocated an skb OK */
941 if (buffer_cnt == 1) { 942 if (buffer_cnt == 1) {
@@ -1266,7 +1267,7 @@ static void streamer_set_rx_mode(struct net_device *dev)
1266 netdev_priv(dev); 1267 netdev_priv(dev);
1267 __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio; 1268 __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
1268 __u8 options = 0; 1269 __u8 options = 0;
1269 struct dev_mc_list *dmi; 1270 struct netdev_hw_addr *ha;
1270 unsigned char dev_mc_address[5]; 1271 unsigned char dev_mc_address[5];
1271 1272
1272 writel(streamer_priv->srb, streamer_mmio + LAPA); 1273 writel(streamer_priv->srb, streamer_mmio + LAPA);
@@ -1302,11 +1303,11 @@ static void streamer_set_rx_mode(struct net_device *dev)
1302 writel(streamer_priv->srb,streamer_mmio+LAPA); 1303 writel(streamer_priv->srb,streamer_mmio+LAPA);
1303 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; 1304 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ;
1304 1305
1305 netdev_for_each_mc_addr(dmi, dev) { 1306 netdev_for_each_mc_addr(ha, dev) {
1306 dev_mc_address[0] |= dmi->dmi_addr[2] ; 1307 dev_mc_address[0] |= ha->addr[2];
1307 dev_mc_address[1] |= dmi->dmi_addr[3] ; 1308 dev_mc_address[1] |= ha->addr[3];
1308 dev_mc_address[2] |= dmi->dmi_addr[4] ; 1309 dev_mc_address[2] |= ha->addr[4];
1309 dev_mc_address[3] |= dmi->dmi_addr[5] ; 1310 dev_mc_address[3] |= ha->addr[5];
1310 } 1311 }
1311 1312
1312 writew(htons(SRB_SET_FUNC_ADDRESS << 8),streamer_mmio+LAPDINC); 1313 writew(htons(SRB_SET_FUNC_ADDRESS << 8),streamer_mmio+LAPDINC);
@@ -1363,7 +1364,7 @@ static void streamer_srb_bh(struct net_device *dev)
1363 case 0x00: 1364 case 0x00:
1364 break; 1365 break;
1365 case 0x01: 1366 case 0x01:
1366 printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name); 1367 printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
1367 break; 1368 break;
1368 case 0x04: 1369 case 0x04:
1369 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); 1370 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
@@ -1391,13 +1392,13 @@ static void streamer_srb_bh(struct net_device *dev)
1391 case 0x00: 1392 case 0x00:
1392 break; 1393 break;
1393 case 0x01: 1394 case 0x01:
1394 printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); 1395 printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
1395 break; 1396 break;
1396 case 0x04: 1397 case 0x04:
1397 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); 1398 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
1398 break; 1399 break;
1399 case 0x39: /* Must deal with this if individual multicast addresses used */ 1400 case 0x39: /* Must deal with this if individual multicast addresses used */
1400 printk(KERN_INFO "%s: Group address not found \n", dev->name); 1401 printk(KERN_INFO "%s: Group address not found\n", dev->name);
1401 break; 1402 break;
1402 default: 1403 default:
1403 break; 1404 break;
@@ -1413,10 +1414,10 @@ static void streamer_srb_bh(struct net_device *dev)
1413 switch (srb_word) { 1414 switch (srb_word) {
1414 case 0x00: 1415 case 0x00:
1415 if (streamer_priv->streamer_message_level) 1416 if (streamer_priv->streamer_message_level)
1416 printk(KERN_INFO "%s: Functional Address Mask Set \n", dev->name); 1417 printk(KERN_INFO "%s: Functional Address Mask Set\n", dev->name);
1417 break; 1418 break;
1418 case 0x01: 1419 case 0x01:
1419 printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); 1420 printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
1420 break; 1421 break;
1421 case 0x04: 1422 case 0x04:
1422 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); 1423 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
@@ -1447,7 +1448,7 @@ static void streamer_srb_bh(struct net_device *dev)
1447 } 1448 }
1448 break; 1449 break;
1449 case 0x01: 1450 case 0x01:
1450 printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); 1451 printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
1451 break; 1452 break;
1452 case 0x04: 1453 case 0x04:
1453 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); 1454 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
@@ -1466,7 +1467,7 @@ static void streamer_srb_bh(struct net_device *dev)
1466 printk(KERN_INFO "%s: Read Source Routing Counters issued\n", dev->name); 1467 printk(KERN_INFO "%s: Read Source Routing Counters issued\n", dev->name);
1467 break; 1468 break;
1468 case 0x01: 1469 case 0x01:
1469 printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); 1470 printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
1470 break; 1471 break;
1471 case 0x04: 1472 case 0x04:
1472 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); 1473 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
@@ -1555,7 +1556,7 @@ static void streamer_arb_cmd(struct net_device *dev)
1555 (streamer_mmio + LAPDINC))); 1556 (streamer_mmio + LAPDINC)));
1556 } 1557 }
1557 1558
1558 printk("next %04x, fs %02x, len %04x \n", next, 1559 printk("next %04x, fs %02x, len %04x\n", next,
1559 status, len); 1560 status, len);
1560 } 1561 }
1561#endif 1562#endif
@@ -1592,7 +1593,7 @@ static void streamer_arb_cmd(struct net_device *dev)
1592 1593
1593 mac_frame->protocol = tr_type_trans(mac_frame, dev); 1594 mac_frame->protocol = tr_type_trans(mac_frame, dev);
1594#if STREAMER_NETWORK_MONITOR 1595#if STREAMER_NETWORK_MONITOR
1595 printk(KERN_WARNING "%s: Received MAC Frame, details: \n", 1596 printk(KERN_WARNING "%s: Received MAC Frame, details:\n",
1596 dev->name); 1597 dev->name);
1597 mac_hdr = tr_hdr(mac_frame); 1598 mac_hdr = tr_hdr(mac_frame);
1598 printk(KERN_WARNING 1599 printk(KERN_WARNING
@@ -1668,15 +1669,15 @@ drop_frame:
1668 /* If serious error */ 1669 /* If serious error */
1669 if (streamer_priv->streamer_message_level) { 1670 if (streamer_priv->streamer_message_level) {
1670 if (lan_status_diff & LSC_SIG_LOSS) 1671 if (lan_status_diff & LSC_SIG_LOSS)
1671 printk(KERN_WARNING "%s: No receive signal detected \n", dev->name); 1672 printk(KERN_WARNING "%s: No receive signal detected\n", dev->name);
1672 if (lan_status_diff & LSC_HARD_ERR) 1673 if (lan_status_diff & LSC_HARD_ERR)
1673 printk(KERN_INFO "%s: Beaconing \n", dev->name); 1674 printk(KERN_INFO "%s: Beaconing\n", dev->name);
1674 if (lan_status_diff & LSC_SOFT_ERR) 1675 if (lan_status_diff & LSC_SOFT_ERR)
1675 printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame \n", dev->name); 1676 printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n", dev->name);
1676 if (lan_status_diff & LSC_TRAN_BCN) 1677 if (lan_status_diff & LSC_TRAN_BCN)
1677 printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n", dev->name); 1678 printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n", dev->name);
1678 if (lan_status_diff & LSC_SS) 1679 if (lan_status_diff & LSC_SS)
1679 printk(KERN_INFO "%s: Single Station on the ring \n", dev->name); 1680 printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
1680 if (lan_status_diff & LSC_RING_REC) 1681 if (lan_status_diff & LSC_RING_REC)
1681 printk(KERN_INFO "%s: Ring recovery ongoing\n", dev->name); 1682 printk(KERN_INFO "%s: Ring recovery ongoing\n", dev->name);
1682 if (lan_status_diff & LSC_FDX_MODE) 1683 if (lan_status_diff & LSC_FDX_MODE)
@@ -1685,7 +1686,7 @@ drop_frame:
1685 1686
1686 if (lan_status_diff & LSC_CO) { 1687 if (lan_status_diff & LSC_CO) {
1687 if (streamer_priv->streamer_message_level) 1688 if (streamer_priv->streamer_message_level)
1688 printk(KERN_INFO "%s: Counter Overflow \n", dev->name); 1689 printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
1689 1690
1690 /* Issue READ.LOG command */ 1691 /* Issue READ.LOG command */
1691 1692
@@ -1715,7 +1716,7 @@ drop_frame:
1715 streamer_priv->streamer_lan_status = lan_status; 1716 streamer_priv->streamer_lan_status = lan_status;
1716 } /* Lan.change.status */ 1717 } /* Lan.change.status */
1717 else 1718 else
1718 printk(KERN_WARNING "%s: Unknown arb command \n", dev->name); 1719 printk(KERN_WARNING "%s: Unknown arb command\n", dev->name);
1719} 1720}
1720 1721
1721static void streamer_asb_bh(struct net_device *dev) 1722static void streamer_asb_bh(struct net_device *dev)
@@ -1746,10 +1747,10 @@ static void streamer_asb_bh(struct net_device *dev)
1746 rc=ntohs(readw(streamer_mmio+LAPD)) >> 8; 1747 rc=ntohs(readw(streamer_mmio+LAPD)) >> 8;
1747 switch (rc) { 1748 switch (rc) {
1748 case 0x01: 1749 case 0x01:
1749 printk(KERN_WARNING "%s: Unrecognized command code \n", dev->name); 1750 printk(KERN_WARNING "%s: Unrecognized command code\n", dev->name);
1750 break; 1751 break;
1751 case 0x26: 1752 case 0x26:
1752 printk(KERN_WARNING "%s: Unrecognized buffer address \n", dev->name); 1753 printk(KERN_WARNING "%s: Unrecognized buffer address\n", dev->name);
1753 break; 1754 break;
1754 case 0xFF: 1755 case 0xFF:
1755 /* Valid response, everything should be ok again */ 1756 /* Valid response, everything should be ok again */
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 456f8bff40be..53f631ebb162 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -21,6 +21,7 @@ static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n";
21 21
22#include <linux/module.h> 22#include <linux/module.h>
23#include <linux/mca.h> 23#include <linux/mca.h>
24#include <linux/slab.h>
24#include <linux/kernel.h> 25#include <linux/kernel.h>
25#include <linux/errno.h> 26#include <linux/errno.h>
26#include <linux/init.h> 27#include <linux/init.h>
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 3a25e0434ae2..3d2fbe60b46e 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -302,7 +302,7 @@ static int olympic_init(struct net_device *dev)
302 olympic_priv=netdev_priv(dev); 302 olympic_priv=netdev_priv(dev);
303 olympic_mmio=olympic_priv->olympic_mmio; 303 olympic_mmio=olympic_priv->olympic_mmio;
304 304
305 printk("%s \n", version); 305 printk("%s\n", version);
306 printk("%s. I/O at %hx, MMIO at %p, LAP at %p, using irq %d\n", olympic_priv->olympic_card_name, (unsigned int) dev->base_addr,olympic_priv->olympic_mmio, olympic_priv->olympic_lap, dev->irq); 306 printk("%s. I/O at %hx, MMIO at %p, LAP at %p, using irq %d\n", olympic_priv->olympic_card_name, (unsigned int) dev->base_addr,olympic_priv->olympic_mmio, olympic_priv->olympic_lap, dev->irq);
307 307
308 writel(readl(olympic_mmio+BCTL) | BCTL_SOFTRESET,olympic_mmio+BCTL); 308 writel(readl(olympic_mmio+BCTL) | BCTL_SOFTRESET,olympic_mmio+BCTL);
@@ -468,7 +468,7 @@ static int olympic_open(struct net_device *dev)
468#if OLYMPIC_DEBUG 468#if OLYMPIC_DEBUG
469 printk("LAPWWO: %x, LAPA: %x\n",readw(olympic_mmio+LAPWWO), readl(olympic_mmio+LAPA)); 469 printk("LAPWWO: %x, LAPA: %x\n",readw(olympic_mmio+LAPWWO), readl(olympic_mmio+LAPA));
470 printk("SISR Mask = %04x\n", readl(olympic_mmio+SISR_MASK)); 470 printk("SISR Mask = %04x\n", readl(olympic_mmio+SISR_MASK));
471 printk("Before the open command \n"); 471 printk("Before the open command\n");
472#endif 472#endif
473 do { 473 do {
474 memset_io(init_srb,0,SRB_COMMAND_SIZE); 474 memset_io(init_srb,0,SRB_COMMAND_SIZE);
@@ -520,7 +520,7 @@ static int olympic_open(struct net_device *dev)
520 break; 520 break;
521 } 521 }
522 if (time_after(jiffies, t + 10*HZ)) { 522 if (time_after(jiffies, t + 10*HZ)) {
523 printk(KERN_WARNING "%s: SRB timed out. \n",dev->name) ; 523 printk(KERN_WARNING "%s: SRB timed out.\n",dev->name);
524 olympic_priv->srb_queued=0; 524 olympic_priv->srb_queued=0;
525 break ; 525 break ;
526 } 526 }
@@ -549,7 +549,7 @@ static int olympic_open(struct net_device *dev)
549 break; 549 break;
550 case 0x07: 550 case 0x07:
551 if (!olympic_priv->olympic_ring_speed && open_finished) { /* Autosense , first time around */ 551 if (!olympic_priv->olympic_ring_speed && open_finished) { /* Autosense , first time around */
552 printk(KERN_WARNING "%s: Retrying at different ring speed \n", dev->name); 552 printk(KERN_WARNING "%s: Retrying at different ring speed\n", dev->name);
553 open_finished = 0 ; 553 open_finished = 0 ;
554 continue; 554 continue;
555 } 555 }
@@ -558,7 +558,7 @@ static int olympic_open(struct net_device *dev)
558 558
559 if (!olympic_priv->olympic_ring_speed && ((err & 0x0f) == 0x0d)) { 559 if (!olympic_priv->olympic_ring_speed && ((err & 0x0f) == 0x0d)) {
560 printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n",dev->name); 560 printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n",dev->name);
561 printk(KERN_WARNING "%s: Please try again with a specified ring speed \n",dev->name); 561 printk(KERN_WARNING "%s: Please try again with a specified ring speed\n",dev->name);
562 } else { 562 } else {
563 printk(KERN_WARNING "%s: %s - %s\n", dev->name, 563 printk(KERN_WARNING "%s: %s - %s\n", dev->name,
564 open_maj_error[(err & 0xf0) >> 4], 564 open_maj_error[(err & 0xf0) >> 4],
@@ -759,7 +759,7 @@ static void olympic_rx(struct net_device *dev)
759 olympic_priv->rx_status_last_received++ ; 759 olympic_priv->rx_status_last_received++ ;
760 olympic_priv->rx_status_last_received &= (OLYMPIC_RX_RING_SIZE -1); 760 olympic_priv->rx_status_last_received &= (OLYMPIC_RX_RING_SIZE -1);
761#if OLYMPIC_DEBUG 761#if OLYMPIC_DEBUG
762 printk("rx status: %x rx len: %x \n", le32_to_cpu(rx_status->status_buffercnt), le32_to_cpu(rx_status->fragmentcnt_framelen)); 762 printk("rx status: %x rx len: %x\n", le32_to_cpu(rx_status->status_buffercnt), le32_to_cpu(rx_status->fragmentcnt_framelen));
763#endif 763#endif
764 length = le32_to_cpu(rx_status->fragmentcnt_framelen) & 0xffff; 764 length = le32_to_cpu(rx_status->fragmentcnt_framelen) & 0xffff;
765 buffer_cnt = le32_to_cpu(rx_status->status_buffercnt) & 0xffff; 765 buffer_cnt = le32_to_cpu(rx_status->status_buffercnt) & 0xffff;
@@ -774,15 +774,15 @@ static void olympic_rx(struct net_device *dev)
774 if (l_status_buffercnt & 0x3B000000) { 774 if (l_status_buffercnt & 0x3B000000) {
775 if (olympic_priv->olympic_message_level) { 775 if (olympic_priv->olympic_message_level) {
776 if (l_status_buffercnt & (1<<29)) /* Rx Frame Truncated */ 776 if (l_status_buffercnt & (1<<29)) /* Rx Frame Truncated */
777 printk(KERN_WARNING "%s: Rx Frame Truncated \n",dev->name); 777 printk(KERN_WARNING "%s: Rx Frame Truncated\n",dev->name);
778 if (l_status_buffercnt & (1<<28)) /*Rx receive overrun */ 778 if (l_status_buffercnt & (1<<28)) /*Rx receive overrun */
779 printk(KERN_WARNING "%s: Rx Frame Receive overrun \n",dev->name); 779 printk(KERN_WARNING "%s: Rx Frame Receive overrun\n",dev->name);
780 if (l_status_buffercnt & (1<<27)) /* No receive buffers */ 780 if (l_status_buffercnt & (1<<27)) /* No receive buffers */
781 printk(KERN_WARNING "%s: No receive buffers \n",dev->name); 781 printk(KERN_WARNING "%s: No receive buffers\n",dev->name);
782 if (l_status_buffercnt & (1<<25)) /* Receive frame error detect */ 782 if (l_status_buffercnt & (1<<25)) /* Receive frame error detect */
783 printk(KERN_WARNING "%s: Receive frame error detect \n",dev->name); 783 printk(KERN_WARNING "%s: Receive frame error detect\n",dev->name);
784 if (l_status_buffercnt & (1<<24)) /* Received Error Detect */ 784 if (l_status_buffercnt & (1<<24)) /* Received Error Detect */
785 printk(KERN_WARNING "%s: Received Error Detect \n",dev->name); 785 printk(KERN_WARNING "%s: Received Error Detect\n",dev->name);
786 } 786 }
787 olympic_priv->rx_ring_last_received += i ; 787 olympic_priv->rx_ring_last_received += i ;
788 olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1) ; 788 olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1) ;
@@ -796,7 +796,7 @@ static void olympic_rx(struct net_device *dev)
796 } 796 }
797 797
798 if (skb == NULL) { 798 if (skb == NULL) {
799 printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers. \n",dev->name) ; 799 printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers.\n",dev->name) ;
800 dev->stats.rx_dropped++; 800 dev->stats.rx_dropped++;
801 /* Update counters even though we don't transfer the frame */ 801 /* Update counters even though we don't transfer the frame */
802 olympic_priv->rx_ring_last_received += i ; 802 olympic_priv->rx_ring_last_received += i ;
@@ -1101,7 +1101,7 @@ static int olympic_close(struct net_device *dev)
1101 } 1101 }
1102 1102
1103 if (t == 0) { 1103 if (t == 0) {
1104 printk(KERN_WARNING "%s: SRB timed out. May not be fatal. \n",dev->name) ; 1104 printk(KERN_WARNING "%s: SRB timed out. May not be fatal.\n",dev->name);
1105 } 1105 }
1106 olympic_priv->srb_queued=0; 1106 olympic_priv->srb_queued=0;
1107 } 1107 }
@@ -1139,7 +1139,7 @@ static void olympic_set_rx_mode(struct net_device *dev)
1139 u8 __iomem *olympic_mmio = olympic_priv->olympic_mmio ; 1139 u8 __iomem *olympic_mmio = olympic_priv->olympic_mmio ;
1140 u8 options = 0; 1140 u8 options = 0;
1141 u8 __iomem *srb; 1141 u8 __iomem *srb;
1142 struct dev_mc_list *dmi; 1142 struct netdev_hw_addr *ha;
1143 unsigned char dev_mc_address[4] ; 1143 unsigned char dev_mc_address[4] ;
1144 1144
1145 writel(olympic_priv->srb,olympic_mmio+LAPA); 1145 writel(olympic_priv->srb,olympic_mmio+LAPA);
@@ -1177,11 +1177,11 @@ static void olympic_set_rx_mode(struct net_device *dev)
1177 1177
1178 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; 1178 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ;
1179 1179
1180 netdev_for_each_mc_addr(dmi, dev) { 1180 netdev_for_each_mc_addr(ha, dev) {
1181 dev_mc_address[0] |= dmi->dmi_addr[2] ; 1181 dev_mc_address[0] |= ha->addr[2];
1182 dev_mc_address[1] |= dmi->dmi_addr[3] ; 1182 dev_mc_address[1] |= ha->addr[3];
1183 dev_mc_address[2] |= dmi->dmi_addr[4] ; 1183 dev_mc_address[2] |= ha->addr[4];
1184 dev_mc_address[3] |= dmi->dmi_addr[5] ; 1184 dev_mc_address[3] |= ha->addr[5];
1185 } 1185 }
1186 1186
1187 writeb(SRB_SET_FUNC_ADDRESS,srb+0); 1187 writeb(SRB_SET_FUNC_ADDRESS,srb+0);
@@ -1239,7 +1239,7 @@ static void olympic_srb_bh(struct net_device *dev)
1239 case 0x00: 1239 case 0x00:
1240 break ; 1240 break ;
1241 case 0x01: 1241 case 0x01:
1242 printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 1242 printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
1243 break ; 1243 break ;
1244 case 0x04: 1244 case 0x04:
1245 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name); 1245 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name);
@@ -1266,13 +1266,13 @@ static void olympic_srb_bh(struct net_device *dev)
1266 case 0x00: 1266 case 0x00:
1267 break ; 1267 break ;
1268 case 0x01: 1268 case 0x01:
1269 printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 1269 printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
1270 break ; 1270 break ;
1271 case 0x04: 1271 case 0x04:
1272 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 1272 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ;
1273 break ; 1273 break ;
1274 case 0x39: /* Must deal with this if individual multicast addresses used */ 1274 case 0x39: /* Must deal with this if individual multicast addresses used */
1275 printk(KERN_INFO "%s: Group address not found \n",dev->name); 1275 printk(KERN_INFO "%s: Group address not found\n",dev->name);
1276 break ; 1276 break ;
1277 default: 1277 default:
1278 break ; 1278 break ;
@@ -1287,10 +1287,10 @@ static void olympic_srb_bh(struct net_device *dev)
1287 switch (readb(srb+2)) { 1287 switch (readb(srb+2)) {
1288 case 0x00: 1288 case 0x00:
1289 if (olympic_priv->olympic_message_level) 1289 if (olympic_priv->olympic_message_level)
1290 printk(KERN_INFO "%s: Functional Address Mask Set \n",dev->name) ; 1290 printk(KERN_INFO "%s: Functional Address Mask Set\n",dev->name);
1291 break ; 1291 break ;
1292 case 0x01: 1292 case 0x01:
1293 printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 1293 printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
1294 break ; 1294 break ;
1295 case 0x04: 1295 case 0x04:
1296 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 1296 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ;
@@ -1310,7 +1310,7 @@ static void olympic_srb_bh(struct net_device *dev)
1310 printk(KERN_INFO "%s: Read Log issued\n",dev->name) ; 1310 printk(KERN_INFO "%s: Read Log issued\n",dev->name) ;
1311 break ; 1311 break ;
1312 case 0x01: 1312 case 0x01:
1313 printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 1313 printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
1314 break ; 1314 break ;
1315 case 0x04: 1315 case 0x04:
1316 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 1316 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ;
@@ -1328,7 +1328,7 @@ static void olympic_srb_bh(struct net_device *dev)
1328 printk(KERN_INFO "%s: Read Source Routing Counters issued\n",dev->name) ; 1328 printk(KERN_INFO "%s: Read Source Routing Counters issued\n",dev->name) ;
1329 break ; 1329 break ;
1330 case 0x01: 1330 case 0x01:
1331 printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 1331 printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
1332 break ; 1332 break ;
1333 case 0x04: 1333 case 0x04:
1334 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 1334 printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ;
@@ -1404,7 +1404,7 @@ static void olympic_arb_cmd(struct net_device *dev)
1404 printk("Loc %d = %02x\n",i,readb(frame_data + i)); 1404 printk("Loc %d = %02x\n",i,readb(frame_data + i));
1405 } 1405 }
1406 1406
1407 printk("next %04x, fs %02x, len %04x \n",readw(buf_ptr+offsetof(struct mac_receive_buffer,next)), readb(buf_ptr+offsetof(struct mac_receive_buffer,frame_status)), readw(buf_ptr+offsetof(struct mac_receive_buffer,buffer_length))); 1407 printk("next %04x, fs %02x, len %04x\n",readw(buf_ptr+offsetof(struct mac_receive_buffer,next)), readb(buf_ptr+offsetof(struct mac_receive_buffer,frame_status)), readw(buf_ptr+offsetof(struct mac_receive_buffer,buffer_length)));
1408} 1408}
1409#endif 1409#endif
1410 mac_frame = dev_alloc_skb(frame_len) ; 1410 mac_frame = dev_alloc_skb(frame_len) ;
@@ -1426,7 +1426,7 @@ static void olympic_arb_cmd(struct net_device *dev)
1426 1426
1427 if (olympic_priv->olympic_network_monitor) { 1427 if (olympic_priv->olympic_network_monitor) {
1428 struct trh_hdr *mac_hdr; 1428 struct trh_hdr *mac_hdr;
1429 printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name); 1429 printk(KERN_WARNING "%s: Received MAC Frame, details:\n",dev->name);
1430 mac_hdr = tr_hdr(mac_frame); 1430 mac_hdr = tr_hdr(mac_frame);
1431 printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %pM\n", 1431 printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %pM\n",
1432 dev->name, mac_hdr->daddr); 1432 dev->name, mac_hdr->daddr);
@@ -1489,20 +1489,20 @@ drop_frame:
1489 writel(readl(olympic_mmio+BCTL)&~(3<<13),olympic_mmio+BCTL); 1489 writel(readl(olympic_mmio+BCTL)&~(3<<13),olympic_mmio+BCTL);
1490 netif_stop_queue(dev); 1490 netif_stop_queue(dev);
1491 olympic_priv->srb = readw(olympic_priv->olympic_lap + LAPWWO) ; 1491 olympic_priv->srb = readw(olympic_priv->olympic_lap + LAPWWO) ;
1492 printk(KERN_WARNING "%s: Adapter has been closed \n", dev->name) ; 1492 printk(KERN_WARNING "%s: Adapter has been closed\n", dev->name);
1493 } /* If serious error */ 1493 } /* If serious error */
1494 1494
1495 if (olympic_priv->olympic_message_level) { 1495 if (olympic_priv->olympic_message_level) {
1496 if (lan_status_diff & LSC_SIG_LOSS) 1496 if (lan_status_diff & LSC_SIG_LOSS)
1497 printk(KERN_WARNING "%s: No receive signal detected \n", dev->name) ; 1497 printk(KERN_WARNING "%s: No receive signal detected\n", dev->name);
1498 if (lan_status_diff & LSC_HARD_ERR) 1498 if (lan_status_diff & LSC_HARD_ERR)
1499 printk(KERN_INFO "%s: Beaconing \n",dev->name); 1499 printk(KERN_INFO "%s: Beaconing\n",dev->name);
1500 if (lan_status_diff & LSC_SOFT_ERR) 1500 if (lan_status_diff & LSC_SOFT_ERR)
1501 printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame \n",dev->name); 1501 printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n",dev->name);
1502 if (lan_status_diff & LSC_TRAN_BCN) 1502 if (lan_status_diff & LSC_TRAN_BCN)
1503 printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n",dev->name); 1503 printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n",dev->name);
1504 if (lan_status_diff & LSC_SS) 1504 if (lan_status_diff & LSC_SS)
1505 printk(KERN_INFO "%s: Single Station on the ring \n", dev->name); 1505 printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
1506 if (lan_status_diff & LSC_RING_REC) 1506 if (lan_status_diff & LSC_RING_REC)
1507 printk(KERN_INFO "%s: Ring recovery ongoing\n",dev->name); 1507 printk(KERN_INFO "%s: Ring recovery ongoing\n",dev->name);
1508 if (lan_status_diff & LSC_FDX_MODE) 1508 if (lan_status_diff & LSC_FDX_MODE)
@@ -1512,7 +1512,7 @@ drop_frame:
1512 if (lan_status_diff & LSC_CO) { 1512 if (lan_status_diff & LSC_CO) {
1513 1513
1514 if (olympic_priv->olympic_message_level) 1514 if (olympic_priv->olympic_message_level)
1515 printk(KERN_INFO "%s: Counter Overflow \n", dev->name); 1515 printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
1516 1516
1517 /* Issue READ.LOG command */ 1517 /* Issue READ.LOG command */
1518 1518
@@ -1551,7 +1551,7 @@ drop_frame:
1551 1551
1552 } /* Lan.change.status */ 1552 } /* Lan.change.status */
1553 else 1553 else
1554 printk(KERN_WARNING "%s: Unknown arb command \n", dev->name); 1554 printk(KERN_WARNING "%s: Unknown arb command\n", dev->name);
1555} 1555}
1556 1556
1557static void olympic_asb_bh(struct net_device *dev) 1557static void olympic_asb_bh(struct net_device *dev)
@@ -1578,10 +1578,10 @@ static void olympic_asb_bh(struct net_device *dev)
1578 if (olympic_priv->asb_queued == 2) { 1578 if (olympic_priv->asb_queued == 2) {
1579 switch (readb(asb_block+2)) { 1579 switch (readb(asb_block+2)) {
1580 case 0x01: 1580 case 0x01:
1581 printk(KERN_WARNING "%s: Unrecognized command code \n", dev->name); 1581 printk(KERN_WARNING "%s: Unrecognized command code\n", dev->name);
1582 break ; 1582 break ;
1583 case 0x26: 1583 case 0x26:
1584 printk(KERN_WARNING "%s: Unrecognized buffer address \n", dev->name); 1584 printk(KERN_WARNING "%s: Unrecognized buffer address\n", dev->name);
1585 break ; 1585 break ;
1586 case 0xFF: 1586 case 0xFF:
1587 /* Valid response, everything should be ok again */ 1587 /* Valid response, everything should be ok again */
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 5401d86a7be4..e40560137c46 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -36,7 +36,6 @@
36#include <linux/ptrace.h> 36#include <linux/ptrace.h>
37#include <linux/ioport.h> 37#include <linux/ioport.h>
38#include <linux/in.h> 38#include <linux/in.h>
39#include <linux/slab.h>
40#include <linux/string.h> 39#include <linux/string.h>
41#include <linux/time.h> 40#include <linux/time.h>
42#include <linux/errno.h> 41#include <linux/errno.h>
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index ee71bcfb3753..c169fd05dde0 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -85,7 +85,6 @@ static const char version[] = "tms380tr.c: v1.10 30/12/2002 by Christoph Goos, A
85#include <linux/ptrace.h> 85#include <linux/ptrace.h>
86#include <linux/ioport.h> 86#include <linux/ioport.h>
87#include <linux/in.h> 87#include <linux/in.h>
88#include <linux/slab.h>
89#include <linux/string.h> 88#include <linux/string.h>
90#include <linux/time.h> 89#include <linux/time.h>
91#include <linux/errno.h> 90#include <linux/errno.h>
@@ -1212,17 +1211,17 @@ static void tms380tr_set_multicast_list(struct net_device *dev)
1212 } 1211 }
1213 else 1212 else
1214 { 1213 {
1215 struct dev_mc_list *mclist; 1214 struct netdev_hw_addr *ha;
1216 1215
1217 netdev_for_each_mc_addr(mclist, dev) { 1216 netdev_for_each_mc_addr(ha, dev) {
1218 ((char *)(&tp->ocpl.FunctAddr))[0] |= 1217 ((char *)(&tp->ocpl.FunctAddr))[0] |=
1219 mclist->dmi_addr[2]; 1218 ha->addr[2];
1220 ((char *)(&tp->ocpl.FunctAddr))[1] |= 1219 ((char *)(&tp->ocpl.FunctAddr))[1] |=
1221 mclist->dmi_addr[3]; 1220 ha->addr[3];
1222 ((char *)(&tp->ocpl.FunctAddr))[2] |= 1221 ((char *)(&tp->ocpl.FunctAddr))[2] |=
1223 mclist->dmi_addr[4]; 1222 ha->addr[4];
1224 ((char *)(&tp->ocpl.FunctAddr))[3] |= 1223 ((char *)(&tp->ocpl.FunctAddr))[3] |=
1225 mclist->dmi_addr[5]; 1224 ha->addr[5];
1226 } 1225 }
1227 } 1226 }
1228 tms380tr_exec_cmd(dev, OC_SET_FUNCT_ADDR); 1227 tms380tr_exec_cmd(dev, OC_SET_FUNCT_ADDR);
@@ -1391,7 +1390,7 @@ static int tms380tr_bringup_diags(struct net_device *dev)
1391 Status &= STS_MASK; 1390 Status &= STS_MASK;
1392 1391
1393 if(tms380tr_debug > 3) 1392 if(tms380tr_debug > 3)
1394 printk(KERN_DEBUG " %04X \n", Status); 1393 printk(KERN_DEBUG " %04X\n", Status);
1395 /* BUD successfully completed */ 1394 /* BUD successfully completed */
1396 if(Status == STS_INITIALIZE) 1395 if(Status == STS_INITIALIZE)
1397 return (1); 1396 return (1);
@@ -1847,7 +1846,7 @@ static void tms380tr_chk_irq(struct net_device *dev)
1847 break; 1846 break;
1848 1847
1849 case DMA_WRITE_ABORT: 1848 case DMA_WRITE_ABORT:
1850 printk(KERN_INFO "%s: DMA write operation aborted: \n", 1849 printk(KERN_INFO "%s: DMA write operation aborted:\n",
1851 dev->name); 1850 dev->name);
1852 switch (AdapterCheckBlock[1]) 1851 switch (AdapterCheckBlock[1])
1853 { 1852 {
generated by cgit v1.2.2 (git 2.25.0) at 2025-10-31 11:22:20 -0400