3 files changed, 170 insertions, 282 deletions

diff --git a/net/atm/lec.c b/net/atm/lec.c
index d2b44e91badf..eb94e94bffa9 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -806,7 +806,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
                         dev_kfree_skb(skb);
                         return;
                 }
-                if (priv->lec_arp_empty_ones) {
+                if (!hlist_empty(&priv->lec_arp_empty_ones)) {
                         lec_arp_check_empties(priv, vcc, skb);
                 }
                 skb->dev = dev;
@@ -998,29 +998,32 @@ static void lec_info(struct seq_file *seq, struct lec_arp_table *entry)
 struct lec_state {
         unsigned long flags;
         struct lec_priv *locked;
-        struct lec_arp_table *entry;
+        struct hlist_node *node;
         struct net_device *dev;
         int itf;
         int arp_table;
         int misc_table;
 };
 
-static void *lec_tbl_walk(struct lec_state *state, struct lec_arp_table *tbl,
+static void *lec_tbl_walk(struct lec_state *state, struct hlist_head *tbl,
                           loff_t *l)
 {
-        struct lec_arp_table *e = state->entry;
+        struct hlist_node *e = state->node;
+        struct lec_arp_table *tmp;
 
         if (!e)
-                e = tbl;
+                e = tbl->first;
         if (e == (void *)1) {
-                e = tbl;
+                e = tbl->first;
                 --*l;
         }
-        for (; e; e = e->next) {
+
+        hlist_for_each_entry_from(tmp, e, next) {
                 if (--*l < 0)
                         break;
         }
-        state->entry = e;
+        state->node = e;
+
         return (*l < 0) ? state : NULL;
 }
 
@@ -1031,7 +1034,7 @@ static void *lec_arp_walk(struct lec_state *state, loff_t *l,
         int p;
 
         for (p = state->arp_table; p < LEC_ARP_TABLE_SIZE; p++) {
-                v = lec_tbl_walk(state, priv->lec_arp_tables[p], l);
+                v = lec_tbl_walk(state, &priv->lec_arp_tables[p], l);
                 if (v)
                         break;
         }
@@ -1042,10 +1045,10 @@ static void *lec_arp_walk(struct lec_state *state, loff_t *l,
 static void *lec_misc_walk(struct lec_state *state, loff_t *l,
                            struct lec_priv *priv)
 {
-        struct lec_arp_table *lec_misc_tables[] = {
-                priv->lec_arp_empty_ones,
-                priv->lec_no_forward,
-                priv->mcast_fwds
+        struct hlist_head *lec_misc_tables[] = {
+                &priv->lec_arp_empty_ones,
+                &priv->lec_no_forward,
+                &priv->mcast_fwds
         };
         void *v = NULL;
         int q;
@@ -1112,7 +1115,7 @@ static void *lec_seq_start(struct seq_file *seq, loff_t *pos)
         state->locked = NULL;
         state->arp_table = 0;
         state->misc_table = 0;
-        state->entry = (void *)1;
+        state->node = (void *)1;
 
         return *pos ? lec_get_idx(state, *pos) : (void *)1;
 }
@@ -1148,9 +1151,10 @@ static int lec_seq_show(struct seq_file *seq, void *v)
         else {
                 struct lec_state *state = seq->private;
                 struct net_device *dev = state->dev;
+                struct lec_arp_table *entry = hlist_entry(state->node, struct lec_arp_table, next);
 
                 seq_printf(seq, "%s ", dev->name);
-                lec_info(seq, state->entry);
+                lec_info(seq, entry);
         }
         return 0;
 }
@@ -1455,8 +1459,11 @@ static void lec_arp_init(struct lec_priv *priv)
         unsigned short i;
 
         for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
-                priv->lec_arp_tables[i] = NULL;
+                INIT_HLIST_HEAD(&priv->lec_arp_tables[i]);
         }
+        INIT_HLIST_HEAD(&priv->lec_arp_empty_ones);
+        INIT_HLIST_HEAD(&priv->lec_no_forward);
+        INIT_HLIST_HEAD(&priv->mcast_fwds);
         spin_lock_init(&priv->lec_arp_lock);
         init_timer(&priv->lec_arp_timer);
         priv->lec_arp_timer.expires = jiffies + LEC_ARP_REFRESH_INTERVAL;
@@ -1479,7 +1486,7 @@ static void lec_arp_clear_vccs(struct lec_arp_table *entry)
                 vcc->user_back = NULL;
                 vcc->push = entry->old_push;
                 vcc_release_async(vcc, -EPIPE);
-                vcc = NULL;
+                entry->vcc = NULL;
         }
         if (entry->recv_vcc) {
                 entry->recv_vcc->push = entry->old_recv_push;
@@ -1493,27 +1500,17 @@ static void lec_arp_clear_vccs(struct lec_arp_table *entry)
  * LANE2: Add to the end of the list to satisfy 8.1.13
  */
 static inline void
-lec_arp_add(struct lec_priv *priv, struct lec_arp_table *to_add)
+lec_arp_add(struct lec_priv *priv, struct lec_arp_table *entry)
 {
-        unsigned short place;
-        struct lec_arp_table *tmp;
+        struct hlist_head *tmp;
 
-        place = HASH(to_add->mac_addr[ETH_ALEN - 1]);
-        tmp = priv->lec_arp_tables[place];
-        to_add->next = NULL;
-        if (tmp == NULL)
-                priv->lec_arp_tables[place] = to_add;
-
-        else {                  /* add to the end */
-                while (tmp->next)
-                        tmp = tmp->next;
-                tmp->next = to_add;
-        }
+        tmp = &priv->lec_arp_tables[HASH(entry->mac_addr[ETH_ALEN - 1])];
+        hlist_add_head(&entry->next, tmp);
 
         DPRINTK("LEC_ARP: Added entry:%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x\n",
-                0xff & to_add->mac_addr[0], 0xff & to_add->mac_addr[1],
-                0xff & to_add->mac_addr[2], 0xff & to_add->mac_addr[3],
-                0xff & to_add->mac_addr[4], 0xff & to_add->mac_addr[5]);
+                0xff & entry->mac_addr[0], 0xff & entry->mac_addr[1],
+                0xff & entry->mac_addr[2], 0xff & entry->mac_addr[3],
+                0xff & entry->mac_addr[4], 0xff & entry->mac_addr[5]);
 }
 
 /*
@@ -1522,40 +1519,26 @@ lec_arp_add(struct lec_priv *priv, struct lec_arp_table *to_add)
 static int
 lec_arp_remove(struct lec_priv *priv, struct lec_arp_table *to_remove)
 {
-        unsigned short place;
-        struct lec_arp_table *tmp;
-        int remove_vcc = 1;
+        struct hlist_node *node;
+        struct lec_arp_table *entry;
+        int i, remove_vcc = 1;
 
         if (!to_remove) {
                 return -1;
         }
-        place = HASH(to_remove->mac_addr[ETH_ALEN - 1]);
-        tmp = priv->lec_arp_tables[place];
-        if (tmp == to_remove) {
-                priv->lec_arp_tables[place] = tmp->next;
-        } else {
+
+        hlist_del(&to_remove->next);