diff --git a/[refs] b/[refs]
index ddeb18231b0e..e7e47fd356f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28cff50d99ce9a1db65b7d4dcdcc0f1f8d9f9309
+refs/heads/master: 5eeae35b9a2e304fc4ae3d9eed63afeea23b482c
diff --git a/trunk/drivers/net/wimax/i2400m/driver.c b/trunk/drivers/net/wimax/i2400m/driver.c
index 1f6aa2a55429..810eda7dbdba 100644
--- a/trunk/drivers/net/wimax/i2400m/driver.c
+++ b/trunk/drivers/net/wimax/i2400m/driver.c
@@ -537,6 +537,8 @@ void __i2400m_dev_stop(struct i2400m *i2400m)
 
 	d_fnstart(3, dev, "(i2400m %p)\n", i2400m);
 	wimax_state_change(wimax_dev, __WIMAX_ST_QUIESCING);
+	i2400m_msg_to_dev_cancel_wait(i2400m, -EL3RST);
+	complete(&i2400m->msg_completion);
 	i2400m_net_wake_stop(i2400m);
 	i2400m_dev_shutdown(i2400m);
 	/*