linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH][RESEND] wireless: convert !X & Y to !(X & Y) in iwl4965_is_fat_tx_allowed()
@ 2008-03-25 16:03 Roel Kluin
  2008-03-25 16:08 ` Roel Kluin
  0 siblings, 1 reply; 6+ messages in thread
From: Roel Kluin @ 2008-03-25 16:03 UTC (permalink / raw)
  To: yi.zhu, reinette.chatre; +Cc: linux-wireless, lkml

from include/linux/ieee80211.h:274:
#define IEEE80211_HT_CAP_SUP_WIDTH              0x0002
---
! has a higher priority than &

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
---
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index d727de8..6576757 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4589,7 +4589,7 @@ static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,
 
 	if (sta_ht_inf) {
 		if ((!sta_ht_inf->ht_supported) ||
-		   (!sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH))
+		   (!(sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH)))
 			return 0;
 	}
 

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH][RESEND] wireless: convert !X & Y to !(X & Y) in iwl4965_is_fat_tx_allowed()
@ 2008-03-25 16:03 Roel Kluin
  0 siblings, 0 replies; 6+ messages in thread
From: Roel Kluin @ 2008-03-25 16:03 UTC (permalink / raw)
  To: yi.zhu, reinette.chatre; +Cc: linux-wireless, lkml

from include/linux/ieee80211.h:274:
#define IEEE80211_HT_CAP_SUP_WIDTH              0x0002
---
! has a higher priority than &

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
---
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index d727de8..6576757 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4589,7 +4589,7 @@ static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,
 
 	if (sta_ht_inf) {
 		if ((!sta_ht_inf->ht_supported) ||
-		   (!sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH))
+		   (!(sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH)))
 			return 0;
 	}
 

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH][RESEND] wireless: convert !X & Y to !(X & Y) in iwl4965_is_fat_tx_allowed()
@ 2008-03-25 16:03 Roel Kluin
  2008-03-25 16:30 ` Chatre, Reinette
  0 siblings, 1 reply; 6+ messages in thread
From: Roel Kluin @ 2008-03-25 16:03 UTC (permalink / raw)
  To: yi.zhu, reinette.chatre; +Cc: linux-wireless, lkml

from include/linux/ieee80211.h:274:
#define IEEE80211_HT_CAP_SUP_WIDTH              0x0002
---
! has a higher priority than &

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
---
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index d727de8..6576757 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4589,7 +4589,7 @@ static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,
 
 	if (sta_ht_inf) {
 		if ((!sta_ht_inf->ht_supported) ||
-		   (!sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH))
+		   (!(sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH)))
 			return 0;
 	}
 

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH][RESEND] wireless: convert !X & Y to !(X & Y) in iwl4965_is_fat_tx_allowed()
  2008-03-25 16:03 [PATCH][RESEND] wireless: convert !X & Y to !(X & Y) in iwl4965_is_fat_tx_allowed() Roel Kluin
@ 2008-03-25 16:08 ` Roel Kluin
  0 siblings, 0 replies; 6+ messages in thread
From: Roel Kluin @ 2008-03-25 16:08 UTC (permalink / raw)
  To: yi.zhu, reinette.chatre; +Cc: linux-wireless, lkml

Sorry for the triple mail, it appeared to fail twice.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* RE: [PATCH][RESEND] wireless: convert !X & Y to !(X & Y) in iwl4965_is_fat_tx_allowed()
  2008-03-25 16:03 Roel Kluin
@ 2008-03-25 16:30 ` Chatre, Reinette
  2008-03-25 17:42   ` John W. Linville
  0 siblings, 1 reply; 6+ messages in thread
From: Chatre, Reinette @ 2008-03-25 16:30 UTC (permalink / raw)
  To: Roel Kluin, Zhu, Yi; +Cc: linux-wireless, lkml

On Tuesday, March 25, 2008 9:04 AM, Roel Kluin  wrote:

> from include/linux/ieee80211.h:274:
> #define IEEE80211_HT_CAP_SUP_WIDTH              0x0002 ---
> ! has a higher priority than &
> 
> Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
> ---
> diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c
> b/drivers/net/wireless/iwlwifi/iwl-4965.c
> index d727de8..6576757 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-4965.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
> @@ -4589,7 +4589,7 @@ static u8
> iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,
> 
> 	if (sta_ht_inf) {
> 		if ((!sta_ht_inf->ht_supported) ||
> -		   (!sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH))
> +		   (!(sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH)))
return 0;
> 	}

This patch has already been acked and merged into wireless-testing, and
afaik already pushed further upstream.

Reinette

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][RESEND] wireless: convert !X & Y to !(X & Y) in iwl4965_is_fat_tx_allowed()
  2008-03-25 16:30 ` Chatre, Reinette
@ 2008-03-25 17:42   ` John W. Linville
  0 siblings, 0 replies; 6+ messages in thread
From: John W. Linville @ 2008-03-25 17:42 UTC (permalink / raw)
  To: Chatre, Reinette; +Cc: Roel Kluin, Zhu, Yi, linux-wireless, lkml

On Tue, Mar 25, 2008 at 09:30:58AM -0700, Chatre, Reinette wrote:
> On Tuesday, March 25, 2008 9:04 AM, Roel Kluin  wrote:
> 
> > from include/linux/ieee80211.h:274:
> > #define IEEE80211_HT_CAP_SUP_WIDTH              0x0002 ---
> > ! has a higher priority than &
> > 
> > Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
> > ---
> > diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c
> > b/drivers/net/wireless/iwlwifi/iwl-4965.c
> > index d727de8..6576757 100644
> > --- a/drivers/net/wireless/iwlwifi/iwl-4965.c
> > +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
> > @@ -4589,7 +4589,7 @@ static u8
> > iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,
> > 
> > 	if (sta_ht_inf) {
> > 		if ((!sta_ht_inf->ht_supported) ||
> > -		   (!sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH))
> > +		   (!(sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH)))
> return 0;
> > 	}
> 
> This patch has already been acked and merged into wireless-testing, and
> afaik already pushed further upstream.

Yes, but FWIW the problem exists in the 2.6.25 stream as well.
I've been holding-back a patch to fix it there, trying to decide if it
is worth creating the merge conflict to fix it there.  I'm inclined
to think it is better to let things lay as they are and send that
patch for the -stable series once 2.6.25 ships.

Any thoughts on that?

John
-- 
John W. Linville
linville@tuxdriver.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-03-25 18:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-25 16:03 [PATCH][RESEND] wireless: convert !X & Y to !(X & Y) in iwl4965_is_fat_tx_allowed() Roel Kluin
2008-03-25 16:08 ` Roel Kluin
  -- strict thread matches above, loose matches on Subject: below --
2008-03-25 16:03 Roel Kluin
2008-03-25 16:03 Roel Kluin
2008-03-25 16:30 ` Chatre, Reinette
2008-03-25 17:42   ` John W. Linville

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).