diff --git a/auto_bridge/auto_bridge.c b/auto_bridge/auto_bridge.c
index 908cbb3..acb8ffd 100644
--- a/auto_bridge/auto_bridge.c
+++ b/auto_bridge/auto_bridge.c
@@ -196,12 +196,12 @@
 	if (event == BREVENT_PORT_DOWN) {
 		struct net_device * dev = (struct net_device *) ptr;
 		int i;
-		struct list_head *entry;
+		struct list_head *entry, *tmp;
 		struct l2flowTable *table_entry;
 
 		for (i = 0; i < L2FLOW_HASH_TABLE_SIZE; i++) {
 			spin_lock_bh(&abm_lock);
-			list_for_each(entry,  &l2flow_table[i]) {
+			list_for_each_safe(entry, tmp, &l2flow_table[i]) {
 				table_entry = container_of(entry, struct l2flowTable, list);
 				if ((table_entry->state != L2FLOW_STATE_DYING)
 				&& ((table_entry->idev_ifi == dev->ifindex) || (table_entry->odev_ifi == dev->ifindex))){