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

Commit 76026660 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 317a929d e7cb4955

drivers/net/wireless/iwlwifi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-$(CONFIG_IWLAGN) += iwlagn.o 
iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o iwl-agn-led.o iwl-agn-ict.o

iwlagn-objs		+= iwl-agn-ucode.o iwl-agn-hcmd.o iwl-agn-tx.o

iwlagn-objs		+= iwl-agn-lib.o

iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o



iwlagn-$(CONFIG_IWL4965) += iwl-4965.o

iwlagn-$(CONFIG_IWL5000) += iwl-5000.o

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

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "iwl-helpers.h"

#include "iwl-agn-hw.h"

#include "iwl-agn-led.h"

#include "iwl-agn-debugfs.h"



/* Highest firmware API version supported */

#define IWL1000_UCODE_API_MAX 3
@@ -212,6 +213,11 @@ static struct iwl_lib_ops iwl1000_lib = { 
		.set_ct_kill = iwl1000_set_ct_threshold,

	 },

	.add_bcast_station = iwl_add_bcast_station,

	.debugfs_ops = {

		.rx_stats_read = iwl_ucode_rx_stats_read,

		.tx_stats_read = iwl_ucode_tx_stats_read,

		.general_stats_read = iwl_ucode_general_stats_read,

	},

	.recover_from_tx_stall = iwl_bg_monitor_recover,

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

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

+2 −0
Original line number Diff line number Diff line
@@ -2687,6 +2687,7 @@ IWL3945_UCODE_GET(boot_size); 
static struct iwl_hcmd_ops iwl3945_hcmd = {

	.rxon_assoc = iwl3945_send_rxon_assoc,

	.commit_rxon = iwl3945_commit_rxon,

	.send_bt_config = iwl_send_bt_config,

};



static struct iwl_ucode_ops iwl3945_ucode = {
@@ -2740,6 +2741,7 @@ static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = { 
	.get_hcmd_size = iwl3945_get_hcmd_size,

	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,

	.rts_tx_cmd_flag = iwlcore_rts_tx_cmd_flag,

	.request_scan = iwl3945_request_scan,

};



static const struct iwl_ops iwl3945_ops = {

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

+3 −0
Original line number Diff line number Diff line
@@ -294,6 +294,9 @@ extern const struct iwl_channel_info *iwl3945_get_channel_info( 


extern int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate);



/* scanning */

void iwl3945_request_scan(struct iwl_priv *priv);



/* Requires full declaration of iwl_priv before including */

#include "iwl-io.h"

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

+14 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "iwl-sta.h"

#include "iwl-agn-led.h"

#include "iwl-agn.h"

#include "iwl-agn-debugfs.h"



static int iwl4965_send_tx_power(struct iwl_priv *priv);

static int iwl4965_hw_get_temperature(struct iwl_priv *priv);
@@ -2143,6 +2144,7 @@ static struct iwl_hcmd_ops iwl4965_hcmd = { 
	.rxon_assoc = iwl4965_send_rxon_assoc,

	.commit_rxon = iwl_commit_rxon,

	.set_rxon_chain = iwl_set_rxon_chain,

	.send_bt_config = iwl_send_bt_config,

};



static struct iwl_ucode_ops iwl4965_ucode = {
@@ -2162,6 +2164,7 @@ static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = { 
	.gain_computation = iwl4965_gain_computation,

	.rts_tx_cmd_flag = iwlcore_rts_tx_cmd_flag,

	.calc_rssi = iwl4965_calc_rssi,

	.request_scan = iwlagn_request_scan,

};



static struct iwl_lib_ops iwl4965_lib = {
@@ -2216,6 +2219,11 @@ static struct iwl_lib_ops iwl4965_lib = { 
		.set_ct_kill = iwl4965_set_ct_threshold,

	},

	.add_bcast_station = iwl_add_bcast_station,

	.debugfs_ops = {

		.rx_stats_read = iwl_ucode_rx_stats_read,

		.tx_stats_read = iwl_ucode_tx_stats_read,

		.general_stats_read = iwl_ucode_general_stats_read,

	},

	.check_plcp_health = iwl_good_plcp_health,

};
@@ -2253,8 +2261,13 @@ struct iwl_cfg iwl4965_agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.temperature_kelvin = true,

	.off_channel_workaround = true,

	.max_event_log_size = 512,



	/*

	 * Force use of chains B and C for scan RX on 5 GHz band

	 * because the device has off-channel reception on chain A.

	 */

	.scan_antennas[IEEE80211_BAND_5GHZ] = ANT_BC,

};



/* Module firmware */