diff --git a/auto_bridge/auto_bridge.c b/auto_bridge/auto_bridge.c
index acb8ffd..8f993aa 100644
--- a/auto_bridge/auto_bridge.c
+++ b/auto_bridge/auto_bridge.c
@@ -714,7 +714,8 @@
 	key_src_mac = abm_l2flow_hash_mac(l2flowtmp->saddr);
 	key_dst_mac = abm_l2flow_hash_mac(l2flowtmp->daddr);
 	
-	l2flow_entry = kmem_cache_alloc(l2flow_cache, GFP_KERNEL); // Can be IRQ CTX ?? Atomic ?
+	/* We must not use GFP_KERNEL because we might be in softirq context. */
+	l2flow_entry = kmem_cache_alloc(l2flow_cache, GFP_NOWAIT);
 	if(!l2flow_entry){
 		printk(KERN_ERR "Automatic bridging module error l2flow_cache OOM\n");
 		goto out;