From 38b798020247a5c022bcb671c7dedca8ef75b6ae Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 20 Sep 2012 16:06:14 +0200 Subject: [PATCH] --- yaml --- r: 328307 b: refs/heads/master c: 513aa3b0d14be809490d5c151994cc7f047b0718 h: refs/heads/master i: 328305: 290e01a00875cc1fb48c3f65d5ee681121f3a883 328303: c2fa61c5039f1eb1ee7e2a407b0bf4be579c0d83 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/dvm/sta.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index acbd0a09e249..a67d93901de4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca42613a55aa947704a40945597c6f9b856df437 +refs/heads/master: 513aa3b0d14be809490d5c151994cc7f047b0718 diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/sta.c b/trunk/drivers/net/wireless/iwlwifi/dvm/sta.c index fe36a38f3505..cd9b6de4273e 100644 --- a/trunk/drivers/net/wireless/iwlwifi/dvm/sta.c +++ b/trunk/drivers/net/wireless/iwlwifi/dvm/sta.c @@ -128,10 +128,11 @@ int iwl_add_sta_callback(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb, struct iwl_device_cmd *cmd) { struct iwl_rx_packet *pkt = rxb_addr(rxb); - struct iwl_addsta_cmd *addsta = - (struct iwl_addsta_cmd *) cmd->payload; - return iwl_process_add_sta_resp(priv, addsta, pkt); + if (!cmd) + return 0; + + return iwl_process_add_sta_resp(priv, (void *)cmd->payload, pkt); } int iwl_send_add_sta(struct iwl_priv *priv,