Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63c66424 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents 5419575e 513aa3b0

drivers/net/wireless/iwlwifi/dvm/scan.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/iwlwifi/dvm/sta.c

+4 −3
Original line number Diff line number Diff line
@@ -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,