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

Commit 6122d182 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: get rid of ctx->rxon_cmd 



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

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

+0 −1
Original line number 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.rxon_cmd = C_RXON;

	il->ctx.rxon_timing_cmd = C_RXON_TIMING;

	il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;

	il->ctx.qos_cmd = C_QOS_PARAM;

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

+0 −1
Original line number 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.is_active = true;

	il->ctx.rxon_cmd = C_RXON;

	il->ctx.rxon_timing_cmd = C_RXON_TIMING;

	il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;

	il->ctx.qos_cmd = C_QOS_PARAM;

drivers/net/wireless/iwlegacy/4965.c

+3 −3
Original line number Diff line number Diff line
@@ -1472,7 +1472,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx) 
		active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;



		ret =

		    il_send_cmd_pdu(il, ctx->rxon_cmd,

		    il_send_cmd_pdu(il, C_RXON,

				    sizeof(struct il_rxon_cmd), active_rxon);



		/* If the mask clearing failed then we set
@@ -1503,7 +1503,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx) 
	 */

	if (!new_assoc) {

		ret =

		    il_send_cmd_pdu(il, ctx->rxon_cmd,

		    il_send_cmd_pdu(il, C_RXON,

				    sizeof(struct il_rxon_cmd), &il->staging);

		if (ret) {

			IL_ERR("Error setting new RXON (%d)\n", ret);
@@ -1525,7 +1525,7 @@ il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx) 
		 * RXON assoc doesn't clear the station table in uCode,

		 */

		ret =

		    il_send_cmd_pdu(il, ctx->rxon_cmd,

		    il_send_cmd_pdu(il, C_RXON,

				    sizeof(struct il_rxon_cmd), &il->staging);

		if (ret) {

			IL_ERR("Error setting new RXON (%d)\n", ret);

drivers/net/wireless/iwlegacy/common.h

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


	u8 bcast_sta_id, ap_sta_id;



	u8 rxon_cmd, rxon_assoc_cmd, rxon_timing_cmd;

	u8 rxon_assoc_cmd, rxon_timing_cmd;

	u8 qos_cmd;

	u8 wep_key_cmd;