[PATCH] Mac/m68k sonic updates

Mac/m68k sonic: Kill warning and remainings of 2.2-style flow control

diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index 16c7160e0eb0faa237d319947b9705558aa1531a..c2d9070c815afb1278cb2704711c049a2d8c1ffe 100644 (file)
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -138,7 +138,7 @@ static inline void bit_reverse_addr(unsigned char addr[6])
 
 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.

diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index f5d794e7b73b3b1b768ba5557a48b25a1325db07..2f6e30984134c23e05027c204e618cd32fcd1ee8 100644 (file)
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -113,15 +113,6 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
        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
         */