[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 1/2] iwlwifi: remove unnecessary locking

[Wey-Yi Guy]

From: Johannes Berg <johannes.berg@intel.com>

This code, and the places that set the variable
is_internal_short_scan and the vif pointers are
all protected by the mutex, there's no point in
locking the spinlock here as well (any more).

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c  |    3 ---
 drivers/net/wireless/iwlwifi/iwl3945-base.c |    3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index d4ba335..3aa4864 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1395,15 +1395,12 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 		u32 extra;
 		u32 suspend_time = 100;
 		u32 scan_suspend_time = 100;
-		unsigned long flags;
 
 		IWL_DEBUG_INFO(priv, "Scanning while associated...\n");
-		spin_lock_irqsave(&priv->lock, flags);
 		if (priv->is_internal_short_scan)
 			interval = 0;
 		else
 			interval = vif->bss_conf.beacon_int;
-		spin_unlock_irqrestore(&priv->lock, flags);
 
 		scan->suspend_time = 0;
 		scan->max_out_time = cpu_to_le32(200 * 1024);
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 76fae81..adcef73 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2860,16 +2860,13 @@ int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 		u32 extra;
 		u32 suspend_time = 100;
 		u32 scan_suspend_time = 100;
-		unsigned long flags;
 
 		IWL_DEBUG_INFO(priv, "Scanning while associated...\n");
 
-		spin_lock_irqsave(&priv->lock, flags);
 		if (priv->is_internal_short_scan)
 			interval = 0;
 		else
 			interval = vif->bss_conf.beacon_int;
-		spin_unlock_irqrestore(&priv->lock, flags);
 
 		scan->suspend_time = 0;
 		scan->max_out_time = cpu_to_le32(200 * 1024);
-- 
1.7.0.4

[PATCH 2/2] iwlwifi: fix compiling error with different configuration

[Wey-Yi Guy]

When .config has different configuration, it might fail to compile
iwlwifi. fix it

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

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index a5daf64..096f8ad 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3771,7 +3771,7 @@ static void iwlagn_disable_roc(struct iwl_priv *priv)
 
 	priv->_agn.hw_roc_channel = NULL;
 
-	iwlagn_commit_rxon(priv, ctx);
+	iwlcore_commit_rxon(priv, ctx);
 
 	ctx->is_active = false;
 }
@@ -3787,6 +3787,7 @@ static void iwlagn_bg_roc_done(struct work_struct *work)
 	mutex_unlock(&priv->mutex);
 }
 
+#ifdef CONFIG_IWL5000
 static int iwl_mac_remain_on_channel(struct ieee80211_hw *hw,
 				     struct ieee80211_channel *channel,
 				     enum nl80211_channel_type channel_type,
@@ -3814,7 +3815,7 @@ static int iwl_mac_remain_on_channel(struct ieee80211_hw *hw,
 	priv->_agn.hw_roc_channel = channel;
 	priv->_agn.hw_roc_chantype = channel_type;
 	priv->_agn.hw_roc_duration = DIV_ROUND_UP(duration * 1000, 1024);
-	iwlagn_commit_rxon(priv, &priv->contexts[IWL_RXON_CTX_PAN]);
+	iwlcore_commit_rxon(priv, &priv->contexts[IWL_RXON_CTX_PAN]);
 	queue_delayed_work(priv->workqueue, &priv->_agn.hw_roc_work,
 			   msecs_to_jiffies(duration + 20));
 
@@ -3842,6 +3843,7 @@ static int iwl_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
 
 	return 0;
 }
+#endif
 
 /*****************************************************************************
  *
-- 
1.7.0.4

[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 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.