diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-25 15:55:02 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-25 15:55:02 -0400 |
| commit | 63c664242d656b8507b10d66e0088e9b640f8906 (patch) | |
| tree | fc1c0663b6daa73bfbea17d9f3483a097ce1744f | |
| parent | 5419575e838cd2cd11a1b30449eb58decdf51f9f (diff) | |
| parent | 513aa3b0d14be809490d5c151994cc7f047b0718 (diff) | |
| download | talos-op-linux-63c664242d656b8507b10d66e0088e9b640f8906.tar.gz talos-op-linux-63c664242d656b8507b10d66e0088e9b640f8906.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/scan.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/sta.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/scan.c b/drivers/net/wireless/iwlwifi/dvm/scan.c index e3467fa86899..bb9f6252d28f 100644 --- a/drivers/net/wireless/iwlwifi/dvm/scan.c +++ b/drivers/net/wireless/iwlwifi/dvm/scan.c @@ -612,9 +612,9 @@ static u16 iwl_fill_probe_req(struct ieee80211_mgmt *frame, const u8 *ta, return 0; frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ); - memcpy(frame->da, iwl_bcast_addr, ETH_ALEN); + eth_broadcast_addr(frame->da); memcpy(frame->sa, ta, ETH_ALEN); - memcpy(frame->bssid, iwl_bcast_addr, ETH_ALEN); + eth_broadcast_addr(frame->bssid); frame->seq_ctrl = 0; len += 24; diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c index fe36a38f3505..cd9b6de4273e 100644 --- a/drivers/net/wireless/iwlwifi/dvm/sta.c +++ b/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, |
