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

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

Merge branch 'wireless-next-2.6' of... 

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
parents 68dd5b7a 470058e0

drivers/net/wireless/iwlwifi/iwl-1000.c

+2 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 128,

};



struct iwl_cfg iwl1000_bg_cfg = {
@@ -282,6 +283,7 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 128,

};



MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-3945-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, 
	unsigned long flags;

	u16 rate_mask = sta ? sta->supp_rates[sband->band] : 0;

	s8 max_rate_idx = -1;

	struct iwl_priv *priv = (struct iwl_priv *)priv_r;

	struct iwl_priv *priv __maybe_unused = (struct iwl_priv *)priv_r;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



	IWL_DEBUG_RATE(priv, "enter\n");

drivers/net/wireless/iwlwifi/iwl-3945.c

+6 −4
Original line number Diff line number Diff line
@@ -191,12 +191,12 @@ static int iwl3945_hwrate_to_plcp_idx(u8 plcp) 
}



#ifdef CONFIG_IWLWIFI_DEBUG

#define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x

#define TX_STATUS_ENTRY(x) case TX_3945_STATUS_FAIL_ ## x: return #x



static const char *iwl3945_get_tx_fail_reason(u32 status)

{

	switch (status & TX_STATUS_MSK) {

	case TX_STATUS_SUCCESS:

	case TX_3945_STATUS_SUCCESS:

		return "SUCCESS";

		TX_STATUS_ENTRY(SHORT_LIMIT);

		TX_STATUS_ENTRY(LONG_LIMIT);
@@ -597,8 +597,8 @@ static void iwl3945_rx_reply_rx(struct iwl_priv *priv, 
	struct iwl3945_rx_frame_stats *rx_stats = IWL_RX_STATS(pkt);

	struct iwl3945_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);

	struct iwl3945_rx_frame_end *rx_end = IWL_RX_END(pkt);

	u16 rx_stats_sig_avg = le16_to_cpu(rx_stats->sig_avg);

	u16 rx_stats_noise_diff = le16_to_cpu(rx_stats->noise_diff);

	u16 rx_stats_sig_avg __maybe_unused = le16_to_cpu(rx_stats->sig_avg);

	u16 rx_stats_noise_diff __maybe_unused = le16_to_cpu(rx_stats->noise_diff);

	u8 network_packet;



	rx_status.flag = 0;
@@ -2770,6 +2770,7 @@ static struct iwl_cfg iwl3945_bg_cfg = { 
	.broken_powersave = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};



static struct iwl_cfg iwl3945_abg_cfg = {
@@ -2789,6 +2790,7 @@ static struct iwl_cfg iwl3945_abg_cfg = { 
	.broken_powersave = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};



DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −2
Original line number Diff line number Diff line
@@ -2054,8 +2054,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
	if (qc && likely(sta_id != IWL_INVALID_STATION))

		iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);



	if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))

		IWL_ERR(priv, "TODO:  Implement Tx ABORT REQUIRED!!!\n");

	iwl_check_abort_status(priv, tx_resp->frame_count, status);

}



static int iwl4965_calc_rssi(struct iwl_priv *priv,
@@ -2255,6 +2254,7 @@ struct iwl_cfg iwl4965_agn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.temperature_kelvin = true,

	.off_channel_workaround = true,

	.max_event_log_size = 512,

};



/* Module firmware */

drivers/net/wireless/iwlwifi/iwl-5000.c

+7 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};



struct iwl_cfg iwl5100_bgn_cfg = {
@@ -450,6 +451,7 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};



struct iwl_cfg iwl5100_abg_cfg = {
@@ -475,6 +477,7 @@ struct iwl_cfg iwl5100_abg_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};



struct iwl_cfg iwl5100_agn_cfg = {
@@ -502,6 +505,7 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};



struct iwl_cfg iwl5350_agn_cfg = {
@@ -529,6 +533,7 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};



struct iwl_cfg iwl5150_agn_cfg = {
@@ -556,6 +561,7 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};



struct iwl_cfg iwl5150_abg_cfg = {
@@ -581,6 +587,7 @@ struct iwl_cfg iwl5150_abg_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};



MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));