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

Commit 63d0f0c5 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: get rid of ctx->rxon_timing_cmd 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6122d182

drivers/net/wireless/iwlegacy/3945-mac.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -3619,7 +3619,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 




	il->ctx.ctxid = 0;

	il->ctx.ctxid = 0;





	il->ctx.rxon_timing_cmd = C_RXON_TIMING;

	il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;

	il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;

	il->ctx.qos_cmd = C_QOS_PARAM;

	il->ctx.qos_cmd = C_QOS_PARAM;

	il->ctx.ap_sta_id = IL_AP_ID;

	il->ctx.ap_sta_id = IL_AP_ID;

drivers/net/wireless/iwlegacy/4965-mac.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -6135,7 +6135,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 




	il->ctx.always_active = true;

	il->ctx.always_active = true;

	il->ctx.is_active = true;

	il->ctx.is_active = true;

	il->ctx.rxon_timing_cmd = C_RXON_TIMING;

	il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;

	il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;

	il->ctx.qos_cmd = C_QOS_PARAM;

	il->ctx.qos_cmd = C_QOS_PARAM;

	il->ctx.ap_sta_id = IL_AP_ID;

	il->ctx.ap_sta_id = IL_AP_ID;

drivers/net/wireless/iwlegacy/common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3664,7 +3664,7 @@ il_send_rxon_timing(struct il_priv *il, struct il_rxon_context *ctx) 
		le32_to_cpu(il->timing.beacon_init_val),

		le32_to_cpu(il->timing.beacon_init_val),

		le16_to_cpu(il->timing.atim_win));

		le16_to_cpu(il->timing.atim_win));





	return il_send_cmd_pdu(il, il->ctx.rxon_timing_cmd, sizeof(il->timing),

	return il_send_cmd_pdu(il, C_RXON_TIMING, sizeof(il->timing),

			       &il->timing);

			       &il->timing);

}

}

EXPORT_SYMBOL(il_send_rxon_timing);

EXPORT_SYMBOL(il_send_rxon_timing);

drivers/net/wireless/iwlegacy/common.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1175,7 +1175,7 @@ struct il_rxon_context { 




	u8 bcast_sta_id, ap_sta_id;

	u8 bcast_sta_id, ap_sta_id;





	u8 rxon_assoc_cmd, rxon_timing_cmd;

	u8 rxon_assoc_cmd;

	u8 qos_cmd;

	u8 qos_cmd;

	u8 wep_key_cmd;

	u8 wep_key_cmd;