patch-1.3.36 linux/drivers/net/eql.c

Next file: linux/drivers/net/ppp.c
Previous file: linux/drivers/net/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.35/linux/drivers/net/eql.c linux/drivers/net/eql.c
@@ -854,26 +854,26 @@
 eql_remove_slave(slave_queue_t *queue, slave_t *slave)
 {
   slave_t *prev;
-  slave_t *current;
+  slave_t *curr;
 
   cli ();
 
   prev = queue->head;
-  current = queue->head->next;
-  while (current != slave && 
-	 current->dev != 0 )
+  curr = queue->head->next;
+  while (curr != slave && 
+	 curr->dev != 0 )
     {
 /* printk ("%s: remove_slave; searching...\n", queue->master_dev->name); */
-      prev = current;
-      current = current->next;
+      prev = curr;
+      curr = curr->next;
     }
 
-  if (current == slave)
+  if (curr == slave)
     {
-      prev->next = current->next;
+      prev->next = curr->next;
       queue->num_slaves--;
       sti();
-      return current;
+      return curr;
     }
 
   sti ();
@@ -914,7 +914,7 @@
 eql_remove_slave_dev(slave_queue_t *queue, struct device *dev)
 {
   slave_t *prev;
-  slave_t *current;
+  slave_t *curr;
   slave_t *target;
 
   target = eql_find_slave_dev (queue, dev);
@@ -924,18 +924,18 @@
       cli ();
 
       prev = queue->head;
-      current = prev->next;
-      while (current != target)
+      curr = prev->next;
+      while (curr != target)
 	{
-	  prev = current;
-	  current = current->next;
+	  prev = curr;
+	  curr = curr->next;
 	}
-      prev->next = current->next;
+      prev->next = curr->next;
       queue->num_slaves--;
 
       sti ();
 
-      eql_delete_slave (current);
+      eql_delete_slave (curr);
       return 0;
     }
   return 1;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this