Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | Date | Sat, 26 Jul 2003 16:51:38 +0200 | From | Geert Uytterhoeven <> | Subject | [PATCH] Mac/m68k sonic updates |
| |
Mac/m68k sonic: Kill warning and remainings of 2.2-style flow control
--- linux-2.6.x/drivers/net/macsonic.c Mon Aug 5 12:48:53 2002 +++ linux-m68k-2.6.x/drivers/net/macsonic.c Fri Jun 6 12:22:46 2003 @@ -142,7 +142,7 @@ int __init macsonic_init(struct net_device* dev) { - struct sonic_local* lp; + struct sonic_local* lp = NULL; int i; /* Allocate the entire chunk of memory for the descriptors. --- linux-2.6.x/drivers/net/sonic.c Fri Mar 1 11:05:29 2002 +++ linux-m68k-2.6.x/drivers/net/sonic.c Mon Sep 16 14:41:46 2002 @@ -113,15 +113,6 @@ if (sonic_debug > 2) printk("sonic_send_packet: skb=%p, dev=%p\n", skb, dev); - /* - * Block a timer-based transmit from overlapping. This could better be - * done with atomic_swap(1, dev->tbusy), but set_bit() works as well. - */ - if (test_and_set_bit(0, (void *) &dev->tbusy) != 0) { - printk("%s: Transmitter access conflict.\n", dev->name); - return 1; - } - /* * Map the packet data into the logical DMA address space */ Gr{oetje,eeting}s, Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| ![\](/images/icornerr.gif) |