Commit 1600b875 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: merge il_lib_ops into il_ops 



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

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

+4 −4
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ il3945_tx_skb(struct il_priv *il, struct sk_buff *skb) 


	/* Add buffer containing Tx command and MAC(!) header to TFD's

	 * first entry */

	il->ops->lib->txq_attach_buf_to_tfd(il, txq, txcmd_phys, len, 1, 0);

	il->ops->txq_attach_buf_to_tfd(il, txq, txcmd_phys, len, 1, 0);



	/* Set up TFD's 2nd entry to point directly to remainder of skb,

	 * if any (802.11 null frames have no payload). */
@@ -625,7 +625,7 @@ il3945_tx_skb(struct il_priv *il, struct sk_buff *skb) 
		phys_addr =

		    pci_map_single(il->pci_dev, skb->data + hdr_len, len,

				   PCI_DMA_TODEVICE);

		il->ops->lib->txq_attach_buf_to_tfd(il, txq, phys_addr, len, 0,

		il->ops->txq_attach_buf_to_tfd(il, txq, phys_addr, len, 0,

					       U32_PAD(len));

	}
@@ -2413,7 +2413,7 @@ __il3945_up(struct il_priv *il) 
		/* load bootstrap state machine,

		 * load bootstrap program into processor's memory,

		 * prepare to load the "initialize" uCode */

		rc = il->ops->lib->load_ucode(il);

		rc = il->ops->load_ucode(il);



		if (rc) {

			IL_ERR("Unable to set up bootstrap uCode: %d\n", rc);

drivers/net/wireless/iwlegacy/3945.c

+13 −16
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ il3945_tx_queue_reclaim(struct il_priv *il, int txq_id, int idx) 
		skb = txq->skbs[txq->q.read_ptr];

		ieee80211_tx_status_irqsafe(il->hw, skb);

		txq->skbs[txq->q.read_ptr] = NULL;

		il->ops->lib->txq_free_tfd(il, txq);

		il->ops->txq_free_tfd(il, txq);

	}



	if (il_queue_space(q) > q->low_mark && txq_id >= 0 &&
@@ -1612,7 +1612,7 @@ il3945_hw_reg_comp_txpower_temp(struct il_priv *il) 
	}



	/* send Txpower command for current channel to ucode */

	return il->ops->lib->send_tx_power(il);

	return il->ops->send_tx_power(il);

}



int
@@ -2634,19 +2634,6 @@ static struct il_hcmd_ops il3945_hcmd = { 
	.commit_rxon = il3945_commit_rxon,

};



static struct il_lib_ops il3945_lib = {

	.txq_attach_buf_to_tfd = il3945_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = il3945_hw_txq_free_tfd,

	.txq_init = il3945_hw_tx_queue_init,

	.load_ucode = il3945_load_bsm,

	.dump_nic_error_log = il3945_dump_nic_error_log,

	.apm_init = il3945_apm_init,

	.send_tx_power = il3945_send_tx_power,

	.is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr,

	.eeprom_acquire_semaphore = il3945_eeprom_acquire_semaphore,

	.eeprom_release_semaphore = il3945_eeprom_release_semaphore,

};



static const struct il_legacy_ops il3945_legacy_ops = {

	.post_associate = il3945_post_associate,

	.config_ap = il3945_config_ap,
@@ -2661,7 +2648,17 @@ static struct il_hcmd_utils_ops il3945_hcmd_utils = { 
};



const struct il_ops il3945_ops = {

	.lib = &il3945_lib,

	.txq_attach_buf_to_tfd = il3945_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = il3945_hw_txq_free_tfd,

	.txq_init = il3945_hw_tx_queue_init,

	.load_ucode = il3945_load_bsm,

	.dump_nic_error_log = il3945_dump_nic_error_log,

	.apm_init = il3945_apm_init,

	.send_tx_power = il3945_send_tx_power,

	.is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr,

	.eeprom_acquire_semaphore = il3945_eeprom_acquire_semaphore,

	.eeprom_release_semaphore = il3945_eeprom_release_semaphore,



	.hcmd = &il3945_hcmd,

	.utils = &il3945_hcmd_utils,

	.led = &il3945_led_ops,

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

+2 −2
Original line number Diff line number Diff line
@@ -923,8 +923,8 @@ il4965_chain_noise_calibration(struct il_priv *il, void *stat_resp) 
	/* Some power changes may have been made during the calibration.

	 * Update and commit the RXON

	 */

	if (il->ops->lib->update_chain_flags)

		il->ops->lib->update_chain_flags(il);

	if (il->ops->update_chain_flags)

		il->ops->update_chain_flags(il);



	data->state = IL_CHAIN_NOISE_DONE;

	il_power_update_mode(il, false);

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

+11 −12
Original line number Diff line number Diff line
@@ -1811,7 +1811,7 @@ il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) 
	dma_unmap_len_set(out_meta, len, firstlen);

	/* Add buffer containing Tx command and MAC(!) header to TFD's

	 * first entry */

	il->ops->lib->txq_attach_buf_to_tfd(il, txq, txcmd_phys, firstlen, 1, 0);

	il->ops->txq_attach_buf_to_tfd(il, txq, txcmd_phys, firstlen, 1, 0);



	if (!ieee80211_has_morefrags(hdr->frame_control)) {

		txq->need_update = 1;
@@ -1827,8 +1827,8 @@ il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) 
		phys_addr =

		    pci_map_single(il->pci_dev, skb->data + hdr_len, secondlen,

				   PCI_DMA_TODEVICE);

		il->ops->lib->txq_attach_buf_to_tfd(il, txq, phys_addr,

						    secondlen, 0, 0);

		il->ops->txq_attach_buf_to_tfd(il, txq, phys_addr, secondlen,

					       0, 0);

	}



	scratch_phys =
@@ -1848,8 +1848,7 @@ il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) 


	/* Set up entry for this TFD in Tx byte-count array */

	if (info->flags & IEEE80211_TX_CTL_AMPDU)

		il->ops->lib->txq_update_byte_cnt_tbl(il, txq,

						      le16_to_cpu(tx_cmd->len));

		il->ops->txq_update_byte_cnt_tbl(il, txq, le16_to_cpu(tx_cmd->len));



	pci_dma_sync_single_for_device(il->pci_dev, txcmd_phys, firstlen,

				       PCI_DMA_BIDIRECTIONAL);
@@ -2470,7 +2469,7 @@ il4965_tx_queue_reclaim(struct il_priv *il, int txq_id, int idx) 
		il4965_tx_status(il, skb, txq_id >= IL4965_FIRST_AMPDU_QUEUE);



		txq->skbs[txq->q.read_ptr] = NULL;

		il->ops->lib->txq_free_tfd(il, txq);

		il->ops->txq_free_tfd(il, txq);

	}

	return nfreed;

}
@@ -5072,7 +5071,7 @@ il4965_dump_nic_error_log(struct il_priv *il) 
	else

		base = le32_to_cpu(il->card_alive.error_event_table_ptr);



	if (!il->ops->lib->is_valid_rtc_data_addr(base)) {

	if (!il->ops->is_valid_rtc_data_addr(base)) {

		IL_ERR("Not valid error log pointer 0x%08X for %s uCode\n",

		       base, (il->ucode_type == UCODE_INIT) ? "Init" : "RT");

		return;
@@ -5574,7 +5573,7 @@ __il4965_up(struct il_priv *il) 
		/* load bootstrap state machine,

		 * load bootstrap program into processor's memory,

		 * prepare to load the "initialize" uCode */

		ret = il->ops->lib->load_ucode(il);

		ret = il->ops->load_ucode(il);



		if (ret) {

			IL_ERR("Unable to set up bootstrap uCode: %d\n", ret);
@@ -5615,7 +5614,7 @@ il4965_bg_init_alive_start(struct work_struct *data) 
	if (test_bit(S_EXIT_PENDING, &il->status))

		goto out;



	il->ops->lib->init_alive_start(il);

	il->ops->init_alive_start(il);

out:

	mutex_unlock(&il->mutex);

}
@@ -6047,7 +6046,7 @@ il4965_mac_channel_switch(struct ieee80211_hw *hw, 
	if (!il_is_associated(il))

		goto out;



	if (!il->ops->lib->set_channel_switch)

	if (!il->ops->set_channel_switch)

		goto out;



	ch = channel->hw_value;
@@ -6099,7 +6098,7 @@ il4965_mac_channel_switch(struct ieee80211_hw *hw, 
	 */

	set_bit(S_CHANNEL_SWITCH_PENDING, &il->status);

	il->switch_channel = cpu_to_le16(ch);

	if (il->ops->lib->set_channel_switch(il, ch_switch)) {

	if (il->ops->set_channel_switch(il, ch_switch)) {

		clear_bit(S_CHANNEL_SWITCH_PENDING, &il->status);

		il->switch_channel = 0;

		ieee80211_chswitch_done(il->vif, false);
@@ -6182,7 +6181,7 @@ il4965_bg_txpower_work(struct work_struct *work) 
	/* Regardless of if we are associated, we must reconfigure the

	 * TX power since frames can be sent on non-radar channels while

	 * not associated */

	il->ops->lib->send_tx_power(il);

	il->ops->send_tx_power(il);



	/* Update last_temperature to keep is_calib_needed from running

	 * when it isn't needed... */

drivers/net/wireless/iwlegacy/4965.c

+8 −11
Original line number Diff line number Diff line
@@ -1889,7 +1889,14 @@ static struct il_hcmd_utils_ops il4965_hcmd_utils = { 
	.post_scan = il4965_post_scan,

};



static struct il_lib_ops il4965_lib = {

static const struct il_legacy_ops il4965_legacy_ops = {

	.post_associate = il4965_post_associate,

	.config_ap = il4965_config_ap,

	.manage_ibss_station = il4965_manage_ibss_station,

	.update_bcast_stations = il4965_update_bcast_stations,

};



const struct il_ops il4965_ops = {

	.txq_update_byte_cnt_tbl = il4965_txq_update_byte_cnt_tbl,

	.txq_attach_buf_to_tfd = il4965_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = il4965_hw_txq_free_tfd,
@@ -1905,17 +1912,7 @@ static struct il_lib_ops il4965_lib = { 
	.update_chain_flags = il4965_update_chain_flags,

	.eeprom_acquire_semaphore = il4965_eeprom_acquire_semaphore,

	.eeprom_release_semaphore = il4965_eeprom_release_semaphore,

};



static const struct il_legacy_ops il4965_legacy_ops = {

	.post_associate = il4965_post_associate,

	.config_ap = il4965_config_ap,

	.manage_ibss_station = il4965_manage_ibss_station,

	.update_bcast_stations = il4965_update_bcast_stations,

};



const struct il_ops il4965_ops = {

	.lib = &il4965_lib,

	.hcmd = &il4965_hcmd,

	.utils = &il4965_hcmd_utils,

	.led = &il4965_led_ops,