All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
	"John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
	David Spinadel <david.spinadel@intel.com>
Subject: linux-next: manual merge of the net-next tree with the wireless tree
Date: Wed, 23 Jul 2014 12:00:54 +1000	[thread overview]
Message-ID: <20140723120054.7c0e08b3@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/iwlwifi/mvm/mac80211.c between commit c6a21ff31994
("iwlwifi: mvm: fix merge damage") from the wireless tree and commit
fb98be5e9419 ("iwlwifi: mvm: add unified LMAC scan API") from the
net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 98556d03c1ed,2eb6ebee4467..000000000000
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@@ -303,6 -321,16 +321,9 @@@ int iwl_mvm_mac_setup_register(struct i
  		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
  	}
  
 -	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT &&
 -	    !iwlwifi_mod_params.uapsd_disable) {
 -		hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;
 -		hw->uapsd_queues = IWL_UAPSD_AC_INFO;
 -		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
 -	}
 -
+ 	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)
+ 		hw->flags |= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;
+ 
  	hw->sta_data_size = sizeof(struct iwl_mvm_sta);
  	hw->vif_data_size = sizeof(struct iwl_mvm_vif);
  	hw->chanctx_data_size = sizeof(u16);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org,
	"John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
	David Spinadel <david.spinadel@intel.com>
Subject: linux-next: manual merge of the net-next tree with the wireless tree
Date: Wed, 23 Jul 2014 12:00:54 +1000	[thread overview]
Message-ID: <20140723120054.7c0e08b3@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/iwlwifi/mvm/mac80211.c between commit c6a21ff31994
("iwlwifi: mvm: fix merge damage") from the wireless tree and commit
fb98be5e9419 ("iwlwifi: mvm: add unified LMAC scan API") from the
net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 98556d03c1ed,2eb6ebee4467..000000000000
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@@ -303,6 -321,16 +321,9 @@@ int iwl_mvm_mac_setup_register(struct i
  		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
  	}
  
 -	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT &&
 -	    !iwlwifi_mod_params.uapsd_disable) {
 -		hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;
 -		hw->uapsd_queues = IWL_UAPSD_AC_INFO;
 -		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
 -	}
 -
+ 	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)
+ 		hw->flags |= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;
+ 
  	hw->sta_data_size = sizeof(struct iwl_mvm_sta);
  	hw->vif_data_size = sizeof(struct iwl_mvm_vif);
  	hw->chanctx_data_size = sizeof(u16);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

             reply	other threads:[~2014-07-23  2:01 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-23  2:00 Stephen Rothwell [this message]
2014-07-23  2:00 ` linux-next: manual merge of the net-next tree with the wireless tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2023-10-24  0:24 Stephen Rothwell
2023-10-12  0:37 Stephen Rothwell
2023-10-12  8:10 ` Johannes Berg
2023-10-19 21:40   ` Jakub Kicinski
2023-10-20  5:49     ` Johannes Berg
2014-07-24  2:47 Stephen Rothwell
2014-07-24  2:47 ` Stephen Rothwell
2014-05-23  3:45 Stephen Rothwell
2014-05-23  3:45 ` Stephen Rothwell
2014-02-26  3:21 Stephen Rothwell
2014-02-26  3:21 ` Stephen Rothwell
2014-02-21  2:34 Stephen Rothwell
2014-02-21  2:34 ` Stephen Rothwell
2013-09-27  3:03 Stephen Rothwell
2013-09-27  3:03 ` Stephen Rothwell
2013-08-27  4:10 Stephen Rothwell
2013-08-27  4:10 ` Stephen Rothwell
2013-04-04  0:44 Stephen Rothwell
2013-04-04  0:44 ` Stephen Rothwell
2013-05-02  3:19 ` Stephen Rothwell
2013-05-02  3:19   ` Stephen Rothwell
2013-04-02  2:00 Stephen Rothwell
2013-04-02  2:00 ` Stephen Rothwell
2013-04-02  9:30 ` Samuel Ortiz
2013-03-26  0:51 Stephen Rothwell
2013-03-26  0:51 ` Stephen Rothwell
2013-03-26  0:48 Stephen Rothwell
2013-03-26  0:48 ` Stephen Rothwell
2012-07-03  1:44 Stephen Rothwell
2012-07-03  1:44 ` Stephen Rothwell
2012-07-03  2:33 ` John W. Linville
2012-06-14  3:12 Stephen Rothwell
2012-06-14  3:12 ` Stephen Rothwell
2012-06-14  4:50 ` Mohammed Shafi Shajakhan
2012-06-14  4:50   ` Mohammed Shafi Shajakhan
2012-06-14 12:59   ` John W. Linville
2012-05-04  3:21 Stephen Rothwell
2012-05-04  3:21 ` Stephen Rothwell
2012-05-04  4:35 ` Guy, Wey-Yi
2012-02-16  1:40 Stephen Rothwell
2012-02-16  1:40 ` Stephen Rothwell
2012-02-16  1:37 Stephen Rothwell
2012-02-16  1:37 ` Stephen Rothwell
2011-12-20  2:02 Stephen Rothwell
2011-12-20  2:02 ` Stephen Rothwell
2011-12-15  2:53 Stephen Rothwell
2011-12-15  2:53 ` Stephen Rothwell
2011-12-15  3:16 ` Stephen Rothwell
2011-12-15  3:16   ` Stephen Rothwell

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=20140723120054.7c0e08b3@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=davem@davemloft.net \
    --cc=david.spinadel@intel.com \
    --cc=emmanuel.grumbach@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=netdev@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.