On Thu, Jun 02, 2011 at 07:38:43PM +0200, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@xxxxxxxxx>
>
> 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@xxxxxxxxx>
I swear, I thought I had taken it out of my queue. I'm getting old... :-(
> ---
> Alternatively, this fixes it. Sorry.
I'd rather just apply this -- any objections?
>
> 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);
>
>
>
>
--
John W. Linville Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
