1 files changed, 14 insertions, 1 deletions

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index eef1392b7f8e..fda403419ff2 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3216,11 +3216,24 @@ static int __init pg_init(void)
         register_netdevice_notifier(&pktgen_notifier_block);
 
         for_each_online_cpu(cpu) {
+                int err;
                 char buf[30];
 
                 sprintf(buf, "kpktgend_%i", cpu);
-                pktgen_create_thread(buf, cpu);
+                err = pktgen_create_thread(buf, cpu);
+                if (err)
+                        printk("pktgen: WARNING: Cannot create thread for cpu %d (%d)\n",
+                                        cpu, err);
         }
+
+        if (list_empty(&pktgen_threads)) {
+                printk("pktgen: ERROR: Initialization failed for all threads\n");
+                unregister_netdevice_notifier(&pktgen_notifier_block);
+                remove_proc_entry(PGCTRL, pg_proc_dir);
+                proc_net_remove(PG_PROC_DIR);
+                return -ENODEV;
+        }
+
         return 0;
 }