vserver 1.9.5.x5

[linux-2.6.git] / drivers / net / 3c527.c

diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index c6f1995..15550b1 100644 (file)
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -102,11 +102,11 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Procter <rnp@paradise.net.
 #include <linux/wait.h>
 #include <linux/ethtool.h>
 #include <linux/completion.h>
+#include <linux/bitops.h>
 
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
@@ -751,18 +751,15 @@ static int mc32_load_rx_ring(struct net_device *dev)
        
        rx_base=lp->rx_chain;
 
-       for(i=0; i<RX_RING_LEN; i++)
-       {
+       for(i=0; i<RX_RING_LEN; i++) {
                lp->rx_ring[i].skb=alloc_skb(1532, GFP_KERNEL);
-               skb_reserve(lp->rx_ring[i].skb, 18);  
-
-               if(lp->rx_ring[i].skb==NULL)
-               {
-                       for(;i>=0;i--)
+               if (lp->rx_ring[i].skb==NULL) {
+                       for (;i>=0;i--)
                                kfree_skb(lp->rx_ring[i].skb);
                        return -ENOBUFS;
                }
-               
+               skb_reserve(lp->rx_ring[i].skb, 18);
+
                p=isa_bus_to_virt(lp->base+rx_base);
                                
                p->control=0;