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

Commit dad48a4e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 98f672ca ad580db5

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

+5 −0
Original line number Diff line number Diff line
@@ -1598,6 +1598,7 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,

};
@@ -1622,6 +1623,7 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

};
@@ -1667,6 +1669,7 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,

};
@@ -1691,6 +1694,7 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,

};
@@ -1715,6 +1719,7 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,

};

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

+26 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Copyright(c) 2009 - 2010 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA

 *

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *****************************************************************************/



#include <linux/module.h>



/* sparse doesn't like tracepoint macros */

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

+26 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Copyright(c) 2009 - 2010 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA

 *

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *****************************************************************************/



#if !defined(__IWLWIFI_DEVICE_TRACE) || defined(TRACE_HEADER_MULTI_READ)

#define __IWLWIFI_DEVICE_TRACE

drivers/net/wireless/iwmc3200wifi/commands.c

+4 −0
Original line number Diff line number Diff line
@@ -973,6 +973,10 @@ int iwm_send_pmkid_update(struct iwm_priv *iwm, 


	memset(&update, 0, sizeof(struct iwm_umac_pmkid_update));



	update.hdr.oid = UMAC_WIFI_IF_CMD_PMKID_UPDATE;

	update.hdr.buf_size = cpu_to_le16(sizeof(struct iwm_umac_pmkid_update) -

					  sizeof(struct iwm_umac_wifi_if));



	update.command = cpu_to_le32(command);

	if (pmksa->bssid)

		memcpy(&update.bssid, pmksa->bssid, ETH_ALEN);

drivers/net/wireless/iwmc3200wifi/commands.h

+1 −0
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ struct iwm_umac_cmd_stop_resume_tx { 
#define IWM_CMD_PMKID_FLUSH 3



struct iwm_umac_pmkid_update {

	struct iwm_umac_wifi_if hdr;

	__le32 command;

	u8 bssid[ETH_ALEN];

	__le16 reserved;