X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Feql.c;h=a53574b0e301225e6ab4691f5e9367368c56ce9c;hb=6f71f83334a552167ccbbd42fe5dd979428c89e4;hp=fd66d2722adac8f885d5cabc7265f228861a3710;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index fd66d2722..a53574b0e 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -164,12 +164,12 @@ static char version[] __initdata =
 
 static void __init eql_setup(struct net_device *dev)
 {
-	equalizer_t *eql = netdev_priv(dev);
+	equalizer_t *eql = dev->priv;
 
 	SET_MODULE_OWNER(dev);
 
 	init_timer(&eql->timer);
-	eql->timer.data     	= (unsigned long) eql;
+	eql->timer.data     	= (unsigned long) dev->priv;
 	eql->timer.expires  	= jiffies + EQL_DEFAULT_RESCHED_IVAL;
 	eql->timer.function 	= eql_timer;
 
@@ -197,7 +197,7 @@ static void __init eql_setup(struct net_device *dev)
 
 static int eql_open(struct net_device *dev)
 {
-	equalizer_t *eql = netdev_priv(dev);
+	equalizer_t *eql = dev->priv;
 
 	/* XXX We should force this off automatically for the user. */
 	printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on "
@@ -241,7 +241,7 @@ static void eql_kill_slave_queue(slave_queue_t *queue)
 
 static int eql_close(struct net_device *dev)
 {
-	equalizer_t *eql = netdev_priv(dev);
+	equalizer_t *eql = dev->priv;
 
 	/*
 	 *	The timer has to be stopped first before we start hacking away
@@ -326,7 +326,7 @@ static slave_t *__eql_schedule_slaves(slave_queue_t *queue)
 
 static int eql_slave_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-	equalizer_t *eql = netdev_priv(dev);
+	equalizer_t *eql = dev->priv;
 	slave_t *slave;
 
 	spin_lock(&eql->queue.lock);
@@ -352,7 +352,7 @@ static int eql_slave_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static struct net_device_stats * eql_get_stats(struct net_device *dev)
 {
-	equalizer_t *eql = netdev_priv(dev);
+	equalizer_t *eql = dev->priv;
 	return &eql->stats;
 }
 
@@ -378,7 +378,7 @@ static slave_t *__eql_find_slave_dev(slave_queue_t *queue, struct net_device *de
 
 static inline int eql_is_full(slave_queue_t *queue)
 {
-	equalizer_t *eql = netdev_priv(queue->master_dev);
+	equalizer_t *eql = queue->master_dev->priv;
 
 	if (queue->num_slaves >= eql->max_slaves)
 		return 1;
@@ -420,7 +420,7 @@ static int eql_enslave(struct net_device *master_dev, slaving_request_t __user *
 			if (!eql_is_master(slave_dev) &&
 			    !eql_is_slave(slave_dev)) {
 				slave_t *s = kmalloc(sizeof(*s), GFP_KERNEL);
-				equalizer_t *eql = netdev_priv(master_dev);
+				equalizer_t *eql = master_dev->priv;
 				int ret;
 
 				if (!s) {
@@ -453,7 +453,7 @@ static int eql_enslave(struct net_device *master_dev, slaving_request_t __user *
 
 static int eql_emancipate(struct net_device *master_dev, slaving_request_t __user *srqp)
 {
-	equalizer_t *eql = netdev_priv(master_dev);
+	equalizer_t *eql = master_dev->priv;
 	struct net_device *slave_dev;
 	slaving_request_t srq;
 	int ret;
@@ -485,7 +485,7 @@ static int eql_emancipate(struct net_device *master_dev, slaving_request_t __use
 
 static int eql_g_slave_cfg(struct net_device *dev, slave_config_t __user *scp)
 {
-	equalizer_t *eql = netdev_priv(dev);
+	equalizer_t *eql = dev->priv;
 	slave_t *slave;
 	struct net_device *slave_dev;
 	slave_config_t sc;
@@ -539,7 +539,7 @@ static int eql_s_slave_cfg(struct net_device *dev, slave_config_t __user *scp)
 	if (!slave_dev)
 		return ret;
 
-	eql = netdev_priv(dev);
+	eql = dev->priv;
 	spin_lock_bh(&eql->queue.lock);
 	if (eql_is_slave(slave_dev)) {
 		slave = __eql_find_slave_dev(&eql->queue, slave_dev);
@@ -561,7 +561,7 @@ static int eql_g_master_cfg(struct net_device *dev, master_config_t __user *mcp)
 	master_config_t mc;
 
 	if (eql_is_master(dev)) {
-		eql = netdev_priv(dev);
+		eql = dev->priv;
 		mc.max_slaves = eql->max_slaves;
 		mc.min_slaves = eql->min_slaves;
 		if (copy_to_user(mcp, &mc, sizeof (master_config_t)))
@@ -580,7 +580,7 @@ static int eql_s_master_cfg(struct net_device *dev, master_config_t __user *mcp)
 		return -EFAULT;
 
 	if (eql_is_master(dev)) {
-		eql = netdev_priv(dev);
+		eql = dev->priv;
 		eql->max_slaves = mc.max_slaves;
 		eql->min_slaves = mc.min_slaves;
 		return 0;