[PATCH 0/2] update for 2.6.39

[PATCH 0/2] update for 2.6.39

[Wey-Yi Guy]

We remove unnecessary spin-lock
We also fix compiler error cause by Kconfig setting

Johannes Berg (1):
  iwlwifi: remove unnecessary locking

Wey-Yi Guy (1):
  iwlwifi: fix compiling error with different configuration

these patches are also available from wireless-next-2.6 branch on
 git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git

 drivers/net/wireless/iwlwifi/iwl-agn-lib.c  |    3 ---
 drivers/net/wireless/iwlwifi/iwl-agn.c      |    6 ++++--
 drivers/net/wireless/iwlwifi/iwl3945-base.c |    3 ---
 3 files changed, 4 insertions(+), 8 deletions(-)

[PATCH 0/2] update for 2.6.39

[Wey-Yi Guy]

We fix a system hung issue by not setup the proper function pointer
for 2000 series devices

Wey-Yi Guy (2):
  iwlagn: donot process bt update when bt coex disable
  iwlagn: handle bt defer work in 2000 series

these patches are also available from wireless-next-2.6 branch on
 git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git

 drivers/net/wireless/iwlwifi/iwl-2000.c    |    3 ++-
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c |   12 +++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

[PATCH 1/2] iwlagn: donot process bt update when bt coex disable

[Wey-Yi Guy]

If bt coex is disabled, do not process any bt related information
from uCode even received.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 3aa4864..325ff5c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1832,7 +1832,7 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)
 	 * IBSS mode (no proper uCode support for coex then).
 	 */
 	if (!bt_coex_active || priv->iw_mode == NL80211_IFTYPE_ADHOC) {
-		bt_cmd.flags = 0;
+		bt_cmd.flags = IWLAGN_BT_FLAG_COEX_MODE_DISABLED;
 	} else {
 		bt_cmd.flags = IWLAGN_BT_FLAG_COEX_MODE_3W <<
 					IWLAGN_BT_FLAG_COEX_MODE_SHIFT;
@@ -1869,6 +1869,11 @@ static void iwlagn_bt_traffic_change_work(struct work_struct *work)
 	struct iwl_rxon_context *ctx;
 	int smps_request = -1;
 
+	if (priv->bt_enable_flag == IWLAGN_BT_FLAG_COEX_MODE_DISABLED) {
+		/* bt coex disabled */
+		return;
+	}
+
 	/*
 	 * Note: bt_traffic_load can be overridden by scan complete and
 	 * coex profile notifications. Ignore that since only bad consequence
@@ -2022,6 +2027,11 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,
 	struct iwl_bt_coex_profile_notif *coex = &pkt->u.bt_coex_profile_notif;
 	struct iwl_bt_uart_msg *uart_msg = &coex->last_bt_uart_msg;
 
+	if (priv->bt_enable_flag == IWLAGN_BT_FLAG_COEX_MODE_DISABLED) {
+		/* bt coex disabled */
+		return;
+	}
+
 	IWL_DEBUG_NOTIF(priv, "BT Coex notification:\n");
 	IWL_DEBUG_NOTIF(priv, "    status: %d\n", coex->bt_status);
 	IWL_DEBUG_NOTIF(priv, "    traffic load: %d\n", coex->bt_traffic_load);
-- 
1.7.0.4

[PATCH 2/2] iwlagn: handle bt defer work in 2000 series

[Wey-Yi Guy]

For 2000 series, need to handle bt traffic changes when
receive notification from uCode

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
 drivers/net/wireless/iwlwifi/iwl-2000.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 3c5dd36..30483e2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -265,7 +265,8 @@ static struct iwl_lib_ops iwl2000_lib = {
 	.txq_free_tfd = iwl_hw_txq_free_tfd,
 	.txq_init = iwl_hw_tx_queue_init,
 	.rx_handler_setup = iwlagn_rx_handler_setup,
-	.setup_deferred_work = iwlagn_setup_deferred_work,
+	.setup_deferred_work = iwlagn_bt_setup_deferred_work,
+	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,
 	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
 	.load_ucode = iwlagn_load_ucode,
 	.dump_nic_event_log = iwl_dump_nic_event_log,
-- 
1.7.0.4

[PATCH 0/2] update for 2.6.39

[Wey-Yi Guy]

We add off-channel tx support for P2P

Johannes Berg (2):
  iwlagn: support off-channel TX
  iwlagn: fix offchannel TX bug

these patches are also available from wireless-next-2.6 branch on
 git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git

 drivers/net/wireless/iwlwifi/iwl-agn-lib.c  |  135 ++++++++++++++++++++-------
 drivers/net/wireless/iwlwifi/iwl-agn.c      |   87 +++++++++++++++++
 drivers/net/wireless/iwlwifi/iwl-commands.h |    8 ++-
 drivers/net/wireless/iwlwifi/iwl-core.h     |    6 +
 drivers/net/wireless/iwlwifi/iwl-dev.h      |   12 ++-
 drivers/net/wireless/iwlwifi/iwl-scan.c     |   41 +++++----
 6 files changed, 238 insertions(+), 51 deletions(-)

Re: [PATCH 0/2] update for 2.6.39

[Guy, Wey-Yi]

On Fri, 2011-03-11 at 01:02 -0800, Johannes Berg wrote:
> On Thu, 2011-03-10 at 20:13 -0800, Wey-Yi Guy wrote:
> > We add off-channel tx support for P2P
> > 
> > Johannes Berg (2):
> >   iwlagn: support off-channel TX
> >   iwlagn: fix offchannel TX bug
> 
> Can't we just squash these into one patch? :)
> 
my bad, I did it without thinking :-(
John, would you like me to resubmit or you can squash these two?

Wey
> 

Re: [PATCH 0/2] update for 2.6.39

[Johannes Berg]

On Thu, 2011-03-10 at 20:13 -0800, Wey-Yi Guy wrote:
> We add off-channel tx support for P2P
> 
> Johannes Berg (2):
>   iwlagn: support off-channel TX
>   iwlagn: fix offchannel TX bug

Can't we just squash these into one patch? :)

johannes

Re: [PATCH 0/2] update for 2.6.39

[John W. Linville]

On Fri, Mar 11, 2011 at 12:51:15AM -0800, Guy, Wey-Yi wrote:
> On Fri, 2011-03-11 at 01:02 -0800, Johannes Berg wrote:
> > On Thu, 2011-03-10 at 20:13 -0800, Wey-Yi Guy wrote:
> > > We add off-channel tx support for P2P
> > > 
> > > Johannes Berg (2):
> > >   iwlagn: support off-channel TX
> > >   iwlagn: fix offchannel TX bug
> > 
> > Can't we just squash these into one patch? :)
> > 
> my bad, I did it without thinking :-(
> John, would you like me to resubmit or you can squash these two?

I'll squash them.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.