linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: wwguy <wey-yi.w.guy@intel.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>,
	"linville@tuxdriver.com" <linville@tuxdriver.com>,
	"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
	"ipw3945-devel@lists.sourceforge.net"
	<ipw3945-devel@lists.sourceforge.net>
Subject: [PATCH] iwlagn: fix interface combinations
Date: Thu, 02 Jun 2011 19:38:43 +0200	[thread overview]
Message-ID: <1307036323.3738.3.camel@jlt3.sipsolutions.net> (raw)
In-Reply-To: <1307033971.14344.4.camel@wwguy-ubuntu> (sfid-20110602_190304_456523_2AAB1F56)

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

My patch to advertise interface combinations
worked by pure luck in the P2P case, but all
other cases are broken. This is due to a dumb
mistake in the code that checks what should
be advertised, fix that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
Alternatively, this fixes it. Sorry.

 drivers/net/wireless/iwlwifi/iwl-agn.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-06-02 19:36:58.000000000 +0200
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-06-02 19:37:09.000000000 +0200
@@ -2533,11 +2533,11 @@ static int iwl_mac_setup_register(struct
 
 	BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
 
-	if (hw->wiphy->interface_modes & NL80211_IFTYPE_P2P_CLIENT) {
+	if (hw->wiphy->interface_modes & BIT(NL80211_IFTYPE_P2P_CLIENT)) {
 		hw->wiphy->iface_combinations = iwlagn_iface_combinations_p2p;
 		hw->wiphy->n_iface_combinations =
 			ARRAY_SIZE(iwlagn_iface_combinations_p2p);
-	} else if (hw->wiphy->interface_modes & NL80211_IFTYPE_AP) {
+	} else if (hw->wiphy->interface_modes & BIT(NL80211_IFTYPE_AP)) {
 		hw->wiphy->iface_combinations = iwlagn_iface_combinations_dualmode;
 		hw->wiphy->n_iface_combinations =
 			ARRAY_SIZE(iwlagn_iface_combinations_dualmode);




  reply	other threads:[~2011-06-02 17:38 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-27 15:40 [PATCH 00/10] update for 2.6.41 Wey-Yi Guy
2011-05-27 15:40 ` [PATCH 01/10] iwlagn: send tx power command if defer cause by RXON not match Wey-Yi Guy
2011-05-27 15:40 ` [PATCH 02/10] iwlagn: remove un-necessary tx power ops Wey-Yi Guy
2011-05-27 15:40 ` [PATCH 03/10] iwlagn: fix dual-mode RXON Wey-Yi Guy
2011-05-27 15:40 ` [PATCH 04/10] iwlagn: solve sparse warning Wey-Yi Guy
2011-05-27 15:40 ` [PATCH 05/10] iwlwifi: disambiguate invalid DMA index warnings Wey-Yi Guy
2011-05-27 15:40 ` [PATCH 06/10] iwlagn: free the ICT ISR when the request_irq failed Wey-Yi Guy
2011-05-27 15:40 ` [PATCH 07/10] iwlagn: advertise interface combinations Wey-Yi Guy
2011-06-02 16:22   ` Stanislaw Gruszka
2011-06-02 16:59     ` wwguy
2011-06-02 17:38       ` Johannes Berg [this message]
2011-06-02 19:49         ` [PATCH] iwlagn: fix " John W. Linville
2011-06-02 19:56           ` wwguy
2011-05-27 15:40 ` [PATCH 08/10] iwlagn: change the logging level for aggregation enable check Wey-Yi Guy
2011-05-27 15:40 ` [PATCH 09/10] iwlagn: change log to better represent the state of aggregation process Wey-Yi Guy
2011-05-27 15:40 ` [PATCH 10/10] iwlagn: don't advertise interface combinations on device not support dualmode Wey-Yi Guy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1307036323.3738.3.camel@jlt3.sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=ipw3945-devel@lists.sourceforge.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=sgruszka@redhat.com \
    --cc=wey-yi.w.guy@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).