fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / net / gianfar_sysfs.c

diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c
index 51ef181..9dd387f 100644 (file)
--- a/drivers/net/gianfar_sysfs.c
+++ b/drivers/net/gianfar_sysfs.c
@@ -19,7 +19,6 @@
  * Sysfs file creation and management
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
@@ -82,13 +81,13 @@ static ssize_t gfar_set_bd_stash(struct class_device *cdev,
        else
                return count;
 
-       spin_lock_irqsave(&priv->lock, flags);
+       spin_lock_irqsave(&priv->rxlock, flags);
 
        /* Set the new stashing value */
        priv->bd_stash_en = new_setting;
 
        temp = gfar_read(&priv->regs->attr);
-       
+
        if (new_setting)
                temp |= ATTR_BDSTASH;
        else
@@ -96,7 +95,7 @@ static ssize_t gfar_set_bd_stash(struct class_device *cdev,
 
        gfar_write(&priv->regs->attr, temp);
 
-       spin_unlock_irqrestore(&priv->lock, flags);
+       spin_unlock_irqrestore(&priv->rxlock, flags);
 
        return count;
 }
@@ -118,7 +117,7 @@ static ssize_t gfar_set_rx_stash_size(struct class_device *cdev,
        u32 temp;
        unsigned long flags;
 
-       spin_lock_irqsave(&priv->lock, flags);
+       spin_lock_irqsave(&priv->rxlock, flags);
        if (length > priv->rx_buffer_size)
                return count;
 
@@ -142,7 +141,7 @@ static ssize_t gfar_set_rx_stash_size(struct class_device *cdev,
 
        gfar_write(&priv->regs->attr, temp);
 
-       spin_unlock_irqrestore(&priv->lock, flags);
+       spin_unlock_irqrestore(&priv->rxlock, flags);
 
        return count;
 }
@@ -166,7 +165,7 @@ static ssize_t gfar_set_rx_stash_index(struct class_device *cdev,
        u32 temp;
        unsigned long flags;
 
-       spin_lock_irqsave(&priv->lock, flags);
+       spin_lock_irqsave(&priv->rxlock, flags);
        if (index > priv->rx_stash_size)
                return count;
 
@@ -180,7 +179,7 @@ static ssize_t gfar_set_rx_stash_index(struct class_device *cdev,
        temp |= ATTRELI_EI(index);
        gfar_write(&priv->regs->attreli, flags);
 
-       spin_unlock_irqrestore(&priv->lock, flags);
+       spin_unlock_irqrestore(&priv->rxlock, flags);
 
        return count;
 }
@@ -205,7 +204,7 @@ static ssize_t gfar_set_fifo_threshold(struct class_device *cdev,
        if (length > GFAR_MAX_FIFO_THRESHOLD)
                return count;
 
-       spin_lock_irqsave(&priv->lock, flags);
+       spin_lock_irqsave(&priv->txlock, flags);
 
        priv->fifo_threshold = length;
 
@@ -214,7 +213,7 @@ static ssize_t gfar_set_fifo_threshold(struct class_device *cdev,
        temp |= length;
        gfar_write(&priv->regs->fifo_tx_thr, temp);
 
-       spin_unlock_irqrestore(&priv->lock, flags);
+       spin_unlock_irqrestore(&priv->txlock, flags);
 
        return count;
 }
@@ -240,7 +239,7 @@ static ssize_t gfar_set_fifo_starve(struct class_device *cdev,
        if (num > GFAR_MAX_FIFO_STARVE)
                return count;
 
-       spin_lock_irqsave(&priv->lock, flags);
+       spin_lock_irqsave(&priv->txlock, flags);
 
        priv->fifo_starve = num;
 
@@ -249,7 +248,7 @@ static ssize_t gfar_set_fifo_starve(struct class_device *cdev,
        temp |= num;
        gfar_write(&priv->regs->fifo_tx_starve, temp);
 
-       spin_unlock_irqrestore(&priv->lock, flags);
+       spin_unlock_irqrestore(&priv->txlock, flags);
 
        return count;
 }
@@ -274,7 +273,7 @@ static ssize_t gfar_set_fifo_starve_off(struct class_device *cdev,
        if (num > GFAR_MAX_FIFO_STARVE_OFF)
                return count;
 
-       spin_lock_irqsave(&priv->lock, flags);
+       spin_lock_irqsave(&priv->txlock, flags);
 
        priv->fifo_starve_off = num;
 
@@ -283,7 +282,7 @@ static ssize_t gfar_set_fifo_starve_off(struct class_device *cdev,
        temp |= num;
        gfar_write(&priv->regs->fifo_tx_starve_shutoff, temp);
 
-       spin_unlock_irqrestore(&priv->lock, flags);
+       spin_unlock_irqrestore(&priv->txlock, flags);
 
        return count;
 }