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

Commit 6aa0c254 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: get rid of ctxid

parent 0f8b90f5
Loading
Loading
Loading
Loading
+0 −2
Original line number Original line Diff line number Diff line
@@ -3617,8 +3617,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)


	il->cmd_queue = IL39_CMD_QUEUE_NUM;
	il->cmd_queue = IL39_CMD_QUEUE_NUM;


	il->ctx.ctxid = 0;

	il->ctx.interface_modes =
	il->ctx.interface_modes =
	    BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
	    BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);


+0 −2
Original line number Original line Diff line number Diff line
@@ -6132,8 +6132,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
	il = hw->priv;
	il = hw->priv;
	/* At this point both hw and il are allocated. */
	/* At this point both hw and il are allocated. */


	il->ctx.ctxid = 0;

	il->ctx.always_active = true;
	il->ctx.always_active = true;
	il->ctx.is_active = true;
	il->ctx.is_active = true;
	il->ctx.ac_to_fifo = il4965_bss_ac_to_fifo;
	il->ctx.ac_to_fifo = il4965_bss_ac_to_fifo;
+0 −6
Original line number Original line Diff line number Diff line
@@ -1951,7 +1951,6 @@ il_prep_station(struct il_priv *il, struct il_rxon_context *ctx,
	station->sta.mode = 0;
	station->sta.mode = 0;
	station->sta.sta.sta_id = sta_id;
	station->sta.sta.sta_id = sta_id;
	station->sta.station_flags = ctx->station_flags;
	station->sta.station_flags = ctx->station_flags;
	station->ctxid = ctx->ctxid;


	if (sta) {
	if (sta) {
		struct il_station_priv_common *sta_priv;
		struct il_station_priv_common *sta_priv;
@@ -2191,9 +2190,6 @@ il_clear_ucode_stations(struct il_priv *il, struct il_rxon_context *ctx)


	spin_lock_irqsave(&il->sta_lock, flags_spin);
	spin_lock_irqsave(&il->sta_lock, flags_spin);
	for (i = 0; i < il->hw_params.max_stations; i++) {
	for (i = 0; i < il->hw_params.max_stations; i++) {
		if (ctx && ctx->ctxid != il->stations[i].ctxid)
			continue;

		if (il->stations[i].used & IL_STA_UCODE_ACTIVE) {
		if (il->stations[i].used & IL_STA_UCODE_ACTIVE) {
			D_INFO("Clearing ucode active for station %d\n", i);
			D_INFO("Clearing ucode active for station %d\n", i);
			il->stations[i].used &= ~IL_STA_UCODE_ACTIVE;
			il->stations[i].used &= ~IL_STA_UCODE_ACTIVE;
@@ -2234,8 +2230,6 @@ il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx)
	D_ASSOC("Restoring all known stations ... start.\n");
	D_ASSOC("Restoring all known stations ... start.\n");
	spin_lock_irqsave(&il->sta_lock, flags_spin);
	spin_lock_irqsave(&il->sta_lock, flags_spin);
	for (i = 0; i < il->hw_params.max_stations; i++) {
	for (i = 0; i < il->hw_params.max_stations; i++) {
		if (ctx->ctxid != il->stations[i].ctxid)
			continue;
		if ((il->stations[i].used & IL_STA_DRIVER_ACTIVE) &&
		if ((il->stations[i].used & IL_STA_DRIVER_ACTIVE) &&
		    !(il->stations[i].used & IL_STA_UCODE_ACTIVE)) {
		    !(il->stations[i].used & IL_STA_UCODE_ACTIVE)) {
			D_ASSOC("Restoring sta %pM\n",
			D_ASSOC("Restoring sta %pM\n",
+1 −3
Original line number Original line Diff line number Diff line
@@ -735,7 +735,7 @@ struct il_qos_info {
struct il_station_entry {
struct il_station_entry {
	struct il_addsta_cmd sta;
	struct il_addsta_cmd sta;
	struct il_tid_data tid[MAX_TID_COUNT];
	struct il_tid_data tid[MAX_TID_COUNT];
	u8 used, ctxid;
	u8 used;
	struct il_hw_key keyinfo;
	struct il_hw_key keyinfo;
	struct il_link_quality_cmd *lq;
	struct il_link_quality_cmd *lq;
};
};
@@ -1168,8 +1168,6 @@ struct il_rxon_context {


	bool ht_need_multiple_chains;
	bool ht_need_multiple_chains;


	int ctxid;

	u32 interface_modes, exclusive_interface_modes;
	u32 interface_modes, exclusive_interface_modes;


	struct il_qos_info qos_data;
	struct il_qos_info qos_data;
+0 −1
Original line number Original line Diff line number Diff line
@@ -649,7 +649,6 @@ il_dbgfs_qos_read(struct file *file, char __user *user_buf, size_t count,
	char buf[256];
	char buf[256];
	const size_t bufsz = sizeof(buf);
	const size_t bufsz = sizeof(buf);


	pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n", ctx->ctxid);
	for (i = 0; i < AC_NUM; i++) {
	for (i = 0; i < AC_NUM; i++) {
		pos +=
		pos +=
		    scnprintf(buf + pos, bufsz - pos,
		    scnprintf(buf + pos, bufsz - pos,