linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-fw.h between commit 5ac6c72e5944
("iwlwifi: mvm: check TLV flag before trying to use hotspot firmware
commands") from the wireless tree and commit 77c5d7eff790 ("iwlwifi:
mvm: add TDLS channel switch FW APIs") from the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-fw.h
index 649fdae77383,a94d244459d7..
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@@ -155,7 -157,7 +157,8 @@@ enum iwl_ucode_tlv_api
* @IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT: supports Quiet Period requests
* @IWL_UCODE_TLV_CAPA_DQA_SUPPORT: supports dynamic queue allocation (DQA),
*which also implies support for the scheduler configuration command
+ * @IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH: supports TDLS channel switching
+ * @IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT: supports Hot Spot Command
*/
enum iwl_ucode_tlv_capa {
IWL_UCODE_TLV_CAPA_D0I3_SUPPORT = BIT(0),
@@@ -164,7 -168,7 +169,8 @@@
IWL_UCODE_TLV_CAPA_WFA_TPC_REP_IE_SUPPORT = BIT(10),
IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT = BIT(11),
IWL_UCODE_TLV_CAPA_DQA_SUPPORT = BIT(12),
+ IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH = BIT(13),
+ IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT = BIT(18),
};
/* The default calibrate table size if not specified by firmware file */
pgplRzT8FeJou.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-fw.h between commit 5ac6c72e5944
(iwlwifi: mvm: check TLV flag before trying to use hotspot firmware
commands) from the wireless tree and commit 77c5d7eff790 (iwlwifi:
mvm: add TDLS channel switch FW APIs) from the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-fw.h
index 649fdae77383,a94d244459d7..
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@@ -155,7 -157,7 +157,8 @@@ enum iwl_ucode_tlv_api
* @IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT: supports Quiet Period requests
* @IWL_UCODE_TLV_CAPA_DQA_SUPPORT: supports dynamic queue allocation (DQA),
*which also implies support for the scheduler configuration command
+ * @IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH: supports TDLS channel switching
+ * @IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT: supports Hot Spot Command
*/
enum iwl_ucode_tlv_capa {
IWL_UCODE_TLV_CAPA_D0I3_SUPPORT = BIT(0),
@@@ -164,7 -168,7 +169,8 @@@
IWL_UCODE_TLV_CAPA_WFA_TPC_REP_IE_SUPPORT = BIT(10),
IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT = BIT(11),
IWL_UCODE_TLV_CAPA_DQA_SUPPORT = BIT(12),
+ IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH = BIT(13),
+ IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT = BIT(18),
};
/* The default calibrate table size if not specified by firmware file */
pgplRzT8FeJou.pgp
Description: OpenPGP digital signature
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
>> I think the above is correct, the pre_value assignment with 1/++ and >> chsw_init moved into another function in Bob's patch. Bob? > > The quoted resolution looks right to me. But, I think the patch > in question was actually Chun-yeow's so I'm not sure my opinion > counts :) Yes, it is correct. The chsw_init is moved by ""mac80211: fix the mesh channel switch support" patch. Chun-Yeow -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
On Tue, Dec 03, 2013 at 05:09:43PM +0100, Johannes Berg wrote: > > > diff --cc net/mac80211/util.c > > > index 9f9b9bd3fd44,06265d7f8cc3.. > > > --- a/net/mac80211/util.c > > > +++ b/net/mac80211/util.c > > > @@@ -2457,9 -2481,13 +2479,8 @@@ int ieee80211_send_action_csa(struct ie > > > WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00; > > > put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason > > > Cd */ > > > pos += 2; > > > - pre_value = cpu_to_le16(ifmsh->pre_value); > > > - memcpy(pos, _value, 2); /* Precedence Value > > > */ > > > -if (!ifmsh->pre_value) > > > -ifmsh->pre_value = 1; > > > -else > > > -ifmsh->pre_value++; > > > + put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence > > > Value */ > > > pos += 2; > > > -ifmsh->chsw_init = true; > > > } > > > > > > ieee80211_tx_skb(sdata, skb); > I think the above is correct, the pre_value assignment with 1/++ and > chsw_init moved into another function in Bob's patch. Bob? The quoted resolution looks right to me. But, I think the patch in question was actually Chun-yeow's so I'm not sure my opinion counts :) -- Bob Copeland %% www.bobcopeland.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
On Tue, 2013-12-03 at 15:52 +, John W. Linville wrote:
> > Today's linux-next merge of the wireless-next tree got a conflict in
> > net/mac80211/util.c between commit 3f718fd8401d ("mac80211: fix the mesh
> > channel switch support") from the wireless tree and commit ca91dc97b8a0
> > ("mac80211: use put_unaligned_le16 for precedence value in mesh") from
> > the wireless-next tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> >
> > --
> > Cheers,
> > Stephen Rothwells...@canb.auug.org.au
> >
> > diff --cc net/mac80211/util.c
> > index 9f9b9bd3fd44,06265d7f8cc3..
> > --- a/net/mac80211/util.c
> > +++ b/net/mac80211/util.c
> > @@@ -2457,9 -2481,13 +2479,8 @@@ int ieee80211_send_action_csa(struct ie
> > WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00;
> > put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd
> > */
> > pos += 2;
> > - pre_value = cpu_to_le16(ifmsh->pre_value);
> > - memcpy(pos, _value, 2); /* Precedence Value */
> > -if (!ifmsh->pre_value)
> > -ifmsh->pre_value = 1;
> > -else
> > -ifmsh->pre_value++;
> > + put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence Value
> > */
> > pos += 2;
> > -ifmsh->chsw_init = true;
> > }
> >
> > ieee80211_tx_skb(sdata, skb);
>
> This differs from how I resolved the conflict when merging in
> wireless-testing...
>
> Johannes, could you comment on which (if either) of these options is correct?
I think the above is correct, the pre_value assignment with 1/++ and
chsw_init moved into another function in Bob's patch. Bob?
johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
On Tue, Dec 03, 2013 at 11:20:32AM +1100, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless-next tree got a conflict in
> net/mac80211/util.c between commit 3f718fd8401d ("mac80211: fix the mesh
> channel switch support") from the wireless tree and commit ca91dc97b8a0
> ("mac80211: use put_unaligned_le16 for precedence value in mesh") from
> the wireless-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc net/mac80211/util.c
> index 9f9b9bd3fd44,06265d7f8cc3..
> --- a/net/mac80211/util.c
> +++ b/net/mac80211/util.c
> @@@ -2457,9 -2481,13 +2479,8 @@@ int ieee80211_send_action_csa(struct ie
> WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00;
> put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd */
> pos += 2;
> - pre_value = cpu_to_le16(ifmsh->pre_value);
> - memcpy(pos, _value, 2); /* Precedence Value */
> -if (!ifmsh->pre_value)
> -ifmsh->pre_value = 1;
> -else
> -ifmsh->pre_value++;
> + put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence Value */
> pos += 2;
> -ifmsh->chsw_init = true;
> }
>
> ieee80211_tx_skb(sdata, skb);
This differs from how I resolved the conflict when merging in
wireless-testing...
Johannes, could you comment on which (if either) of these options is correct?
John
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
On Tue, Dec 03, 2013 at 11:20:32AM +1100, Stephen Rothwell wrote: Hi John, Today's linux-next merge of the wireless-next tree got a conflict in net/mac80211/util.c between commit 3f718fd8401d (mac80211: fix the mesh channel switch support) from the wireless tree and commit ca91dc97b8a0 (mac80211: use put_unaligned_le16 for precedence value in mesh) from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/mac80211/util.c index 9f9b9bd3fd44,06265d7f8cc3.. --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@@ -2457,9 -2481,13 +2479,8 @@@ int ieee80211_send_action_csa(struct ie WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00; put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd */ pos += 2; - pre_value = cpu_to_le16(ifmsh-pre_value); - memcpy(pos, pre_value, 2); /* Precedence Value */ -if (!ifmsh-pre_value) -ifmsh-pre_value = 1; -else -ifmsh-pre_value++; + put_unaligned_le16(ifmsh-pre_value, pos);/* Precedence Value */ pos += 2; -ifmsh-chsw_init = true; } ieee80211_tx_skb(sdata, skb); This differs from how I resolved the conflict when merging in wireless-testing... Johannes, could you comment on which (if either) of these options is correct? John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
On Tue, 2013-12-03 at 15:52 +, John W. Linville wrote: Today's linux-next merge of the wireless-next tree got a conflict in net/mac80211/util.c between commit 3f718fd8401d (mac80211: fix the mesh channel switch support) from the wireless tree and commit ca91dc97b8a0 (mac80211: use put_unaligned_le16 for precedence value in mesh) from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/mac80211/util.c index 9f9b9bd3fd44,06265d7f8cc3.. --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@@ -2457,9 -2481,13 +2479,8 @@@ int ieee80211_send_action_csa(struct ie WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00; put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd */ pos += 2; - pre_value = cpu_to_le16(ifmsh-pre_value); - memcpy(pos, pre_value, 2); /* Precedence Value */ -if (!ifmsh-pre_value) -ifmsh-pre_value = 1; -else -ifmsh-pre_value++; + put_unaligned_le16(ifmsh-pre_value, pos);/* Precedence Value */ pos += 2; -ifmsh-chsw_init = true; } ieee80211_tx_skb(sdata, skb); This differs from how I resolved the conflict when merging in wireless-testing... Johannes, could you comment on which (if either) of these options is correct? I think the above is correct, the pre_value assignment with 1/++ and chsw_init moved into another function in Bob's patch. Bob? johannes -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
On Tue, Dec 03, 2013 at 05:09:43PM +0100, Johannes Berg wrote: diff --cc net/mac80211/util.c index 9f9b9bd3fd44,06265d7f8cc3.. --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@@ -2457,9 -2481,13 +2479,8 @@@ int ieee80211_send_action_csa(struct ie WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00; put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd */ pos += 2; - pre_value = cpu_to_le16(ifmsh-pre_value); - memcpy(pos, pre_value, 2); /* Precedence Value */ -if (!ifmsh-pre_value) -ifmsh-pre_value = 1; -else -ifmsh-pre_value++; + put_unaligned_le16(ifmsh-pre_value, pos);/* Precedence Value */ pos += 2; -ifmsh-chsw_init = true; } ieee80211_tx_skb(sdata, skb); I think the above is correct, the pre_value assignment with 1/++ and chsw_init moved into another function in Bob's patch. Bob? The quoted resolution looks right to me. But, I think the patch in question was actually Chun-yeow's so I'm not sure my opinion counts :) -- Bob Copeland %% www.bobcopeland.com -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
I think the above is correct, the pre_value assignment with 1/++ and chsw_init moved into another function in Bob's patch. Bob? The quoted resolution looks right to me. But, I think the patch in question was actually Chun-yeow's so I'm not sure my opinion counts :) Yes, it is correct. The chsw_init is moved by mac80211: fix the mesh channel switch support patch. Chun-Yeow -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
net/mac80211/util.c between commit 3f718fd8401d ("mac80211: fix the mesh
channel switch support") from the wireless tree and commit ca91dc97b8a0
("mac80211: use put_unaligned_le16 for precedence value in mesh") from
the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc net/mac80211/util.c
index 9f9b9bd3fd44,06265d7f8cc3..
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@@ -2457,9 -2481,13 +2479,8 @@@ int ieee80211_send_action_csa(struct ie
WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00;
put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd */
pos += 2;
- pre_value = cpu_to_le16(ifmsh->pre_value);
- memcpy(pos, _value, 2); /* Precedence Value */
- if (!ifmsh->pre_value)
- ifmsh->pre_value = 1;
- else
- ifmsh->pre_value++;
+ put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence Value */
pos += 2;
- ifmsh->chsw_init = true;
}
ieee80211_tx_skb(sdata, skb);
pgp_Sy5wxZeNv.pgp
Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John, Today's linux-next merge of the wireless-next tree got a conflict in net/mac80211/util.c between commit 3f718fd8401d (mac80211: fix the mesh channel switch support) from the wireless tree and commit ca91dc97b8a0 (mac80211: use put_unaligned_le16 for precedence value in mesh) from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/mac80211/util.c index 9f9b9bd3fd44,06265d7f8cc3.. --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@@ -2457,9 -2481,13 +2479,8 @@@ int ieee80211_send_action_csa(struct ie WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00; put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd */ pos += 2; - pre_value = cpu_to_le16(ifmsh-pre_value); - memcpy(pos, pre_value, 2); /* Precedence Value */ - if (!ifmsh-pre_value) - ifmsh-pre_value = 1; - else - ifmsh-pre_value++; + put_unaligned_le16(ifmsh-pre_value, pos);/* Precedence Value */ pos += 2; - ifmsh-chsw_init = true; } ieee80211_tx_skb(sdata, skb); pgp_Sy5wxZeNv.pgp Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/pcie/trans.c between commit eabc4ac5d760
("iwlwifi: pcie: disable L1 Active after pci_enable_device") from the wireless
tree and commit 6965a3540a4b ("iwlwifi: pcie: don't swallow error codes in
iwl_trans_pcie_alloc()") from the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index 8c6c405,bad95d2..000
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1400,11 -1401,6 +1401,10 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
spin_lock_init(_pcie->reg_lock);
init_waitqueue_head(_pcie->ucode_write_waitq);
- if (pci_enable_device(pdev)) {
- err = -ENODEV;
++ err = pci_enable_device(pdev);
++ if (err)
+ goto out_no_pci;
- }
+
if (!cfg->base_params->pcie_l1_allowed) {
/*
* W/A - seems to solve weird behavior. We need to remove this
pgp50sL4jPdw1.pgp
Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/pcie/trans.c between commit eabc4ac5d760
(iwlwifi: pcie: disable L1 Active after pci_enable_device) from the wireless
tree and commit 6965a3540a4b (iwlwifi: pcie: don't swallow error codes in
iwl_trans_pcie_alloc()) from the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index 8c6c405,bad95d2..000
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1400,11 -1401,6 +1401,10 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
spin_lock_init(trans_pcie-reg_lock);
init_waitqueue_head(trans_pcie-ucode_write_waitq);
- if (pci_enable_device(pdev)) {
- err = -ENODEV;
++ err = pci_enable_device(pdev);
++ if (err)
+ goto out_no_pci;
- }
+
if (!cfg-base_params-pcie_l1_allowed) {
/*
* W/A - seems to solve weird behavior. We need to remove this
pgp50sL4jPdw1.pgp
Description: PGP signature
RE: linux-next: manual merge of the wireless-next tree with the wireless tree
> I think I have this slightly different in wireless-testing. Johannes, please
> review and advise...
> > Today's linux-next merge of the wireless-next tree got a conflict in
> > drivers/net/wireless/iwlwifi/pcie/trans.c between commit eabc4ac5d760
> > ("iwlwifi: pcie: disable L1 Active after pci_enable_device") from
> > thewireless tree and commit f2532b04b2ec ("iwlwifi: pcie: don't
> > disable
> > L1 for newest NICs") from the wireless-next tree.
> >
> > I fixed it up (maybe - see below) and can carry the fix as necessary
> > (no action is required).
> > diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
> > index 390e2f0,e52d1ce..000
> > --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
> > +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
> > @@@ -1502,16 -1400,22 +1400,22 @@@ struct iwl_trans
> *iwl_trans_pcie_alloc(
> > spin_lock_init(_pcie->reg_lock);
> > init_waitqueue_head(_pcie->ucode_write_waitq);
> >
> > + if (pci_enable_device(pdev)) {
> > + err = -ENODEV;
> > + goto out_no_pci;
> > + }
> > +
> > - /* W/A - seems to solve weird behavior. We need to remove this if
> we
> > -* don't want to stay in L1 all the time. This wastes a lot of power */
> > - pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S |
> PCIE_LINK_STATE_L1 |
> > - PCIE_LINK_STATE_CLKPM);
> > + if (!cfg->base_params->pcie_l1_allowed) {
> > + /*
> > +* W/A - seems to solve weird behavior. We need to remove
> this
> > +* if we don't want to stay in L1 all the time. This wastes a
> > +* lot of power.
> > +*/
> > + pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S |
> > + PCIE_LINK_STATE_L1 |
> > + PCIE_LINK_STATE_CLKPM);
> > + }
> >
> > - if (pci_enable_device(pdev)) {
> > - err = -ENODEV;
> > - goto out_no_pci;
> > - }
> > -
> > pci_set_master(pdev);
> >
> > err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
This looks fine, and it seems to be exactly what you have in
wireless-testing/master. I have yet another change pending to this which
removes the err= in favour of taking it from pci_enable_device() though.
johannes
(sorry for the outlook mess - might want to use johan...@sipsolutions.net)
--
Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen, Deutschland
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Christian Lamprechter, Hannes Schwaderer, Douglas Lusk
Registergericht: Muenchen HRB 47456
Ust.-IdNr./VAT Registration No.: DE129385895
Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
I think I have this slightly different in wireless-testing. Johannes,
please review and advise...
John
On Mon, Aug 12, 2013 at 11:53:27AM +1000, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/iwlwifi/pcie/trans.c between commit eabc4ac5d760
> ("iwlwifi: pcie: disable L1 Active after pci_enable_device") from
> thewireless tree and commit f2532b04b2ec ("iwlwifi: pcie: don't disable
> L1 for newest NICs") from the wireless-next tree.
>
> I fixed it up (maybe - see below) and can carry the fix as necessary (no
> action is required).
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
> index 390e2f0,e52d1ce..000
> --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
> +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
> @@@ -1502,16 -1400,22 +1400,22 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
> spin_lock_init(_pcie->reg_lock);
> init_waitqueue_head(_pcie->ucode_write_waitq);
>
> +if (pci_enable_device(pdev)) {
> +err = -ENODEV;
> +goto out_no_pci;
> +}
> +
> - /* W/A - seems to solve weird behavior. We need to remove this if we
> - * don't want to stay in L1 all the time. This wastes a lot of power */
> - pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
> -PCIE_LINK_STATE_CLKPM);
> + if (!cfg->base_params->pcie_l1_allowed) {
> + /*
> + * W/A - seems to solve weird behavior. We need to remove this
> + * if we don't want to stay in L1 all the time. This wastes a
> + * lot of power.
> + */
> + pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S |
> +PCIE_LINK_STATE_L1 |
> +PCIE_LINK_STATE_CLKPM);
> + }
>
> -if (pci_enable_device(pdev)) {
> -err = -ENODEV;
> -goto out_no_pci;
> -}
> -
> pci_set_master(pdev);
>
> err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
I think I have this slightly different in wireless-testing. Johannes,
please review and advise...
John
On Mon, Aug 12, 2013 at 11:53:27AM +1000, Stephen Rothwell wrote:
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/pcie/trans.c between commit eabc4ac5d760
(iwlwifi: pcie: disable L1 Active after pci_enable_device) from
thewireless tree and commit f2532b04b2ec (iwlwifi: pcie: don't disable
L1 for newest NICs) from the wireless-next tree.
I fixed it up (maybe - see below) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index 390e2f0,e52d1ce..000
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1502,16 -1400,22 +1400,22 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
spin_lock_init(trans_pcie-reg_lock);
init_waitqueue_head(trans_pcie-ucode_write_waitq);
+if (pci_enable_device(pdev)) {
+err = -ENODEV;
+goto out_no_pci;
+}
+
- /* W/A - seems to solve weird behavior. We need to remove this if we
- * don't want to stay in L1 all the time. This wastes a lot of power */
- pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
-PCIE_LINK_STATE_CLKPM);
+ if (!cfg-base_params-pcie_l1_allowed) {
+ /*
+ * W/A - seems to solve weird behavior. We need to remove this
+ * if we don't want to stay in L1 all the time. This wastes a
+ * lot of power.
+ */
+ pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S |
+PCIE_LINK_STATE_L1 |
+PCIE_LINK_STATE_CLKPM);
+ }
-if (pci_enable_device(pdev)) {
-err = -ENODEV;
-goto out_no_pci;
-}
-
pci_set_master(pdev);
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the wireless-next tree with the wireless tree
I think I have this slightly different in wireless-testing. Johannes, please
review and advise...
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/pcie/trans.c between commit eabc4ac5d760
(iwlwifi: pcie: disable L1 Active after pci_enable_device) from
thewireless tree and commit f2532b04b2ec (iwlwifi: pcie: don't
disable
L1 for newest NICs) from the wireless-next tree.
I fixed it up (maybe - see below) and can carry the fix as necessary
(no action is required).
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index 390e2f0,e52d1ce..000
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1502,16 -1400,22 +1400,22 @@@ struct iwl_trans
*iwl_trans_pcie_alloc(
spin_lock_init(trans_pcie-reg_lock);
init_waitqueue_head(trans_pcie-ucode_write_waitq);
+ if (pci_enable_device(pdev)) {
+ err = -ENODEV;
+ goto out_no_pci;
+ }
+
- /* W/A - seems to solve weird behavior. We need to remove this if
we
-* don't want to stay in L1 all the time. This wastes a lot of power */
- pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S |
PCIE_LINK_STATE_L1 |
- PCIE_LINK_STATE_CLKPM);
+ if (!cfg-base_params-pcie_l1_allowed) {
+ /*
+* W/A - seems to solve weird behavior. We need to remove
this
+* if we don't want to stay in L1 all the time. This wastes a
+* lot of power.
+*/
+ pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S |
+ PCIE_LINK_STATE_L1 |
+ PCIE_LINK_STATE_CLKPM);
+ }
- if (pci_enable_device(pdev)) {
- err = -ENODEV;
- goto out_no_pci;
- }
-
pci_set_master(pdev);
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
This looks fine, and it seems to be exactly what you have in
wireless-testing/master. I have yet another change pending to this which
removes the err= in favour of taking it from pci_enable_device() though.
johannes
(sorry for the outlook mess - might want to use johan...@sipsolutions.net)
--
Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen, Deutschland
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Christian Lamprechter, Hannes Schwaderer, Douglas Lusk
Registergericht: Muenchen HRB 47456
Ust.-IdNr./VAT Registration No.: DE129385895
Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/pcie/trans.c between commit eabc4ac5d760
("iwlwifi: pcie: disable L1 Active after pci_enable_device") from
thewireless tree and commit f2532b04b2ec ("iwlwifi: pcie: don't disable
L1 for newest NICs") from the wireless-next tree.
I fixed it up (maybe - see below) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index 390e2f0,e52d1ce..000
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1502,16 -1400,22 +1400,22 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
spin_lock_init(_pcie->reg_lock);
init_waitqueue_head(_pcie->ucode_write_waitq);
+ if (pci_enable_device(pdev)) {
+ err = -ENODEV;
+ goto out_no_pci;
+ }
+
- /* W/A - seems to solve weird behavior. We need to remove this if we
-* don't want to stay in L1 all the time. This wastes a lot of power */
- pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
- PCIE_LINK_STATE_CLKPM);
+ if (!cfg->base_params->pcie_l1_allowed) {
+ /*
+* W/A - seems to solve weird behavior. We need to remove this
+* if we don't want to stay in L1 all the time. This wastes a
+* lot of power.
+*/
+ pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S |
+ PCIE_LINK_STATE_L1 |
+ PCIE_LINK_STATE_CLKPM);
+ }
- if (pci_enable_device(pdev)) {
- err = -ENODEV;
- goto out_no_pci;
- }
-
pci_set_master(pdev);
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
pgpJzlGn6GFHO.pgp
Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/pcie/trans.c between commit eabc4ac5d760
(iwlwifi: pcie: disable L1 Active after pci_enable_device) from
thewireless tree and commit f2532b04b2ec (iwlwifi: pcie: don't disable
L1 for newest NICs) from the wireless-next tree.
I fixed it up (maybe - see below) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index 390e2f0,e52d1ce..000
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1502,16 -1400,22 +1400,22 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
spin_lock_init(trans_pcie-reg_lock);
init_waitqueue_head(trans_pcie-ucode_write_waitq);
+ if (pci_enable_device(pdev)) {
+ err = -ENODEV;
+ goto out_no_pci;
+ }
+
- /* W/A - seems to solve weird behavior. We need to remove this if we
-* don't want to stay in L1 all the time. This wastes a lot of power */
- pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
- PCIE_LINK_STATE_CLKPM);
+ if (!cfg-base_params-pcie_l1_allowed) {
+ /*
+* W/A - seems to solve weird behavior. We need to remove this
+* if we don't want to stay in L1 all the time. This wastes a
+* lot of power.
+*/
+ pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S |
+ PCIE_LINK_STATE_L1 |
+ PCIE_LINK_STATE_CLKPM);
+ }
- if (pci_enable_device(pdev)) {
- err = -ENODEV;
- goto out_no_pci;
- }
-
pci_set_master(pdev);
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
pgpJzlGn6GFHO.pgp
Description: PGP signature
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
Stephen Rothwell wrote:
> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/ath/ath9k/Kconfig between commit 8bb7f167a12a
> ("ath9k: Use minstrel rate control by default") from the wireless tree
> and commit cf657a2bc50d ("ath9k: Remove MAC_DEBUG") from the
> wireless-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks !
Sujith
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
Stephen Rothwell wrote: Today's linux-next merge of the wireless-next tree got a conflict in drivers/net/wireless/ath/ath9k/Kconfig between commit 8bb7f167a12a (ath9k: Use minstrel rate control by default) from the wireless tree and commit cf657a2bc50d (ath9k: Remove MAC_DEBUG) from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Thanks ! Sujith -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/ath/ath9k/Kconfig between commit 8bb7f167a12a
("ath9k: Use minstrel rate control by default") from the wireless tree
and commit cf657a2bc50d ("ath9k: Remove MAC_DEBUG") from the
wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/net/wireless/ath/ath9k/Kconfig
index 3c2cbc9,ec33c80..000
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@@ -84,25 -84,13 +84,17 @@@ config ATH9K_DFS_CERTIFIE
developed. At this point enabling this option won't do anything
except increase code size.
- config ATH9K_MAC_DEBUG
- bool "Atheros MAC statistics"
- depends on ATH9K_DEBUGFS
- default y
- ---help---
- This option enables collection of statistics for Rx/Tx status
- data and some other MAC related statistics
-
-config ATH9K_RATE_CONTROL
+config ATH9K_LEGACY_RATE_CONTROL
bool "Atheros ath9k rate control"
depends on ATH9K
- default y
+ default n
---help---
Say Y, if you want to use the ath9k specific rate control
-module instead of minstrel_ht.
+module instead of minstrel_ht. Be warned that there are various
+issues with the ath9k RC and minstrel is a more robust algorithm.
+Note that even if this option is selected, "ath9k_rate_control"
+has to be passed to mac80211 using the module parameter,
+ieee80211_default_rc_algo.
config ATH9K_HTC
tristate "Atheros HTC based wireless cards support"
pgpnSKS4RH7j4.pgp
Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John, Today's linux-next merge of the wireless-next tree got a conflict in drivers/net/wireless/ath/ath9k/Kconfig between commit 8bb7f167a12a (ath9k: Use minstrel rate control by default) from the wireless tree and commit cf657a2bc50d (ath9k: Remove MAC_DEBUG) from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/net/wireless/ath/ath9k/Kconfig index 3c2cbc9,ec33c80..000 --- a/drivers/net/wireless/ath/ath9k/Kconfig +++ b/drivers/net/wireless/ath/ath9k/Kconfig @@@ -84,25 -84,13 +84,17 @@@ config ATH9K_DFS_CERTIFIE developed. At this point enabling this option won't do anything except increase code size. - config ATH9K_MAC_DEBUG - bool Atheros MAC statistics - depends on ATH9K_DEBUGFS - default y - ---help--- - This option enables collection of statistics for Rx/Tx status - data and some other MAC related statistics - -config ATH9K_RATE_CONTROL +config ATH9K_LEGACY_RATE_CONTROL bool Atheros ath9k rate control depends on ATH9K - default y + default n ---help--- Say Y, if you want to use the ath9k specific rate control -module instead of minstrel_ht. +module instead of minstrel_ht. Be warned that there are various +issues with the ath9k RC and minstrel is a more robust algorithm. +Note that even if this option is selected, ath9k_rate_control +has to be passed to mac80211 using the module parameter, +ieee80211_default_rc_algo. config ATH9K_HTC tristate Atheros HTC based wireless cards support pgpnSKS4RH7j4.pgp Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
net/mac80211/sta_info.c between commit 27a737ff7cb0 ("mac80211: always
synchronize_net() during station removal") from the wireless tree and
commits 3b8d9c290364 ("mac80211: remove underscores from some key
functions") and 6d10e46be5ac ("mac80211: batch key free synchronize_net()")
from the wireless-next tree.
The latter seems to supercede the former, so I just used the latter and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpjxj7m3z9a3.pgp
Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John, Today's linux-next merge of the wireless-next tree got a conflict in net/mac80211/sta_info.c between commit 27a737ff7cb0 (mac80211: always synchronize_net() during station removal) from the wireless tree and commits 3b8d9c290364 (mac80211: remove underscores from some key functions) and 6d10e46be5ac (mac80211: batch key free synchronize_net()) from the wireless-next tree. The latter seems to supercede the former, so I just used the latter and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpjxj7m3z9a3.pgp Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
net/nfc/llcp/llcp.c between commit 3536da06db0b ("NFC: llcp: Clean local
timers and works when removing a device") from the wireless tree and
commits d9b8d8e19b07 ("NFC: llcp: Service Name Lookup netlink interface")
and 40213fa8513c ("NFC: llcp: Add cleanup support for unreplied SNL
requests") from the wireless-next tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc net/nfc/llcp/llcp.c
index b530afa,3361170..000
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@@ -188,16 -156,9 +188,19 @@@ static void local_cleanup(struct nfc_ll
cancel_work_sync(>rx_work);
cancel_work_sync(>timeout_work);
kfree_skb(local->rx_pending);
+}
+
+static void local_release(struct kref *ref)
+{
+ struct nfc_llcp_local *local;
+
+ local = container_of(ref, struct nfc_llcp_local, ref);
+
+ list_del(>list);
+ local_cleanup(local, false);
+ del_timer_sync(>sdreq_timer);
+ cancel_work_sync(>sdreq_timeout_work);
+ nfc_llcp_free_sdp_tlv_list(>pending_sdreqs);
kfree(local);
}
pgpyUAKyR181S.pgp
Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
net/nfc/llcp/llcp.c between commit 3536da06db0b (NFC: llcp: Clean local
timers and works when removing a device) from the wireless tree and
commits d9b8d8e19b07 (NFC: llcp: Service Name Lookup netlink interface)
and 40213fa8513c (NFC: llcp: Add cleanup support for unreplied SNL
requests) from the wireless-next tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc net/nfc/llcp/llcp.c
index b530afa,3361170..000
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@@ -188,16 -156,9 +188,19 @@@ static void local_cleanup(struct nfc_ll
cancel_work_sync(local-rx_work);
cancel_work_sync(local-timeout_work);
kfree_skb(local-rx_pending);
+}
+
+static void local_release(struct kref *ref)
+{
+ struct nfc_llcp_local *local;
+
+ local = container_of(ref, struct nfc_llcp_local, ref);
+
+ list_del(local-list);
+ local_cleanup(local, false);
+ del_timer_sync(local-sdreq_timer);
+ cancel_work_sync(local-sdreq_timeout_work);
+ nfc_llcp_free_sdp_tlv_list(local-pending_sdreqs);
kfree(local);
}
pgpyUAKyR181S.pgp
Description: PGP signature
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
On 11/15/2012 03:17 AM, Stephen Rothwell wrote:
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c between commit
d61f978b8f26 ("brcmfmac: fix typo in CONFIG_BRCMISCAN") from the tree
and commit f07998959d57 ("brcmfmac: remove obsolete i-scan and clean up
related code") from the wireless-next tree.
I used the latter (which removed the line that was fixed in the former)
and can carry the fix as necessary (no action is required).
Agreed. The typo fix is only needed for v3.7.
Gr. AvS
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
On 11/15/2012 03:17 AM, Stephen Rothwell wrote: Hi John, Today's linux-next merge of the wireless-next tree got a conflict in drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c between commit d61f978b8f26 (brcmfmac: fix typo in CONFIG_BRCMISCAN) from the tree and commit f07998959d57 (brcmfmac: remove obsolete i-scan and clean up related code) from the wireless-next tree. I used the latter (which removed the line that was fixed in the former) and can carry the fix as necessary (no action is required). Agreed. The typo fix is only needed for v3.7. Gr. AvS -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c between commit
d61f978b8f26 ("brcmfmac: fix typo in CONFIG_BRCMISCAN") from the tree
and commit f07998959d57 ("brcmfmac: remove obsolete i-scan and clean up
related code") from the wireless-next tree.
I used the latter (which removed the line that was fixed in the former)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp54Q96nmcqO.pgp
Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John, Today's linux-next merge of the wireless-next tree got a conflict in drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c between commit d61f978b8f26 (brcmfmac: fix typo in CONFIG_BRCMISCAN) from the tree and commit f07998959d57 (brcmfmac: remove obsolete i-scan and clean up related code) from the wireless-next tree. I used the latter (which removed the line that was fixed in the former) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp54Q96nmcqO.pgp Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
net/mac80211/mlme.c between commit 3a40414f826a ("mac80211: connect with
HT20 if HT40 is not permitted") from the wireless tree and commit
04ecd2578e71 ("mac80211: track needed RX chains for channel contexts")
from the wireless-next tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc net/mac80211/mlme.c
index 1b7eed2,469d864..000
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -3104,44 -3181,43 +3183,51 @@@ static int ieee80211_prep_channel(struc
}
}
- if (ht_oper) {
+ if (ht_oper && sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) {
+ const u8 *ht_cap_ie;
+ const struct ieee80211_ht_cap *ht_cap;
+ u8 chains = 1;
+
- channel_type = NL80211_CHAN_HT20;
+ /*
+ * cfg80211 already verified that the channel itself can
+ * be used, but it didn't check that we can do the right
+ * HT type, so do that here as well. If HT40 isn't allowed
+ * on this channel, disable 40 MHz operation.
+ */
- if (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) {
- switch (ht_oper->ht_param &
- IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
- case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
+ switch (ht_oper->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
+ case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
+ if (cbss->channel->flags & IEEE80211_CHAN_NO_HT40PLUS)
+ ifmgd->flags |= IEEE80211_STA_DISABLE_40MHZ;
+ else
channel_type = NL80211_CHAN_HT40PLUS;
- break;
- case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
+ break;
+ case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
+ if (cbss->channel->flags & IEEE80211_CHAN_NO_HT40MINUS)
+ ifmgd->flags |= IEEE80211_STA_DISABLE_40MHZ;
+ else
channel_type = NL80211_CHAN_HT40MINUS;
- break;
- }
+ break;
}
- }
- if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
- /* can only fail due to HT40+/- mismatch */
- channel_type = NL80211_CHAN_HT20;
- sdata_info(sdata,
- "disabling 40 MHz due to multi-vif mismatch\n");
- ifmgd->flags |= IEEE80211_STA_DISABLE_40MHZ;
- WARN_ON(!ieee80211_set_channel_type(local, sdata,
- channel_type));
+ ht_cap_ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY,
+cbss->information_elements,
+cbss->len_information_elements);
+ if (ht_cap_ie && ht_cap_ie[1] >= sizeof(*ht_cap)) {
+ ht_cap = (void *)(ht_cap_ie + 2);
+ chains = ieee80211_mcs_to_chains(_cap->mcs);
+ }
+ sdata->needed_rx_chains = min(chains, local->rx_chains);
+ } else {
+ sdata->needed_rx_chains = 1;
}
- local->oper_channel = cbss->channel;
- ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
+ /* will change later if needed */
+ sdata->smps_mode = IEEE80211_SMPS_OFF;
- return 0;
+ ieee80211_vif_release_channel(sdata);
+ return ieee80211_vif_use_channel(sdata, cbss->channel, channel_type,
+IEEE80211_CHANCTX_SHARED);
}
static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
pgpveEWivoqdt.pgp
Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c between commit
3e4f319dacc6 ("brcmfmac: fix end of loop check (signedness bug)") from
the wireless tree and commit 81118d165811 ("brcmfmac: Using zero instead
of NULL") from the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 411dfe7,b27e245..000
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@@ -3972,8 -3972,8 +3972,8 @@@ brcmf_set_management_ie(struct brcmf_cf
u8 *iovar_ie_buf;
u8 *curr_ie_buf;
u8 *mgmt_ie_buf = NULL;
- u32 mgmt_ie_buf_len;
+ int mgmt_ie_buf_len;
- u32 *mgmt_ie_len = 0;
+ u32 *mgmt_ie_len;
u32 del_add_ie_buf_len = 0;
u32 total_ie_buf_len = 0;
u32 parsed_ie_buf_len = 0;
pgpmo2mUmzmgr.pgp
Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John, Today's linux-next merge of the wireless-next tree got a conflict in drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c between commit 3e4f319dacc6 (brcmfmac: fix end of loop check (signedness bug)) from the wireless tree and commit 81118d165811 (brcmfmac: Using zero instead of NULL) from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index 411dfe7,b27e245..000 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c @@@ -3972,8 -3972,8 +3972,8 @@@ brcmf_set_management_ie(struct brcmf_cf u8 *iovar_ie_buf; u8 *curr_ie_buf; u8 *mgmt_ie_buf = NULL; - u32 mgmt_ie_buf_len; + int mgmt_ie_buf_len; - u32 *mgmt_ie_len = 0; + u32 *mgmt_ie_len; u32 del_add_ie_buf_len = 0; u32 total_ie_buf_len = 0; u32 parsed_ie_buf_len = 0; pgpmo2mUmzmgr.pgp Description: PGP signature
linux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
net/mac80211/mlme.c between commit 3a40414f826a (mac80211: connect with
HT20 if HT40 is not permitted) from the wireless tree and commit
04ecd2578e71 (mac80211: track needed RX chains for channel contexts)
from the wireless-next tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc net/mac80211/mlme.c
index 1b7eed2,469d864..000
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -3104,44 -3181,43 +3183,51 @@@ static int ieee80211_prep_channel(struc
}
}
- if (ht_oper) {
+ if (ht_oper sband-ht_cap.cap IEEE80211_HT_CAP_SUP_WIDTH_20_40) {
+ const u8 *ht_cap_ie;
+ const struct ieee80211_ht_cap *ht_cap;
+ u8 chains = 1;
+
- channel_type = NL80211_CHAN_HT20;
+ /*
+ * cfg80211 already verified that the channel itself can
+ * be used, but it didn't check that we can do the right
+ * HT type, so do that here as well. If HT40 isn't allowed
+ * on this channel, disable 40 MHz operation.
+ */
- if (sband-ht_cap.cap IEEE80211_HT_CAP_SUP_WIDTH_20_40) {
- switch (ht_oper-ht_param
- IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
- case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
+ switch (ht_oper-ht_param IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
+ case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
+ if (cbss-channel-flags IEEE80211_CHAN_NO_HT40PLUS)
+ ifmgd-flags |= IEEE80211_STA_DISABLE_40MHZ;
+ else
channel_type = NL80211_CHAN_HT40PLUS;
- break;
- case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
+ break;
+ case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
+ if (cbss-channel-flags IEEE80211_CHAN_NO_HT40MINUS)
+ ifmgd-flags |= IEEE80211_STA_DISABLE_40MHZ;
+ else
channel_type = NL80211_CHAN_HT40MINUS;
- break;
- }
+ break;
}
- }
- if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
- /* can only fail due to HT40+/- mismatch */
- channel_type = NL80211_CHAN_HT20;
- sdata_info(sdata,
- disabling 40 MHz due to multi-vif mismatch\n);
- ifmgd-flags |= IEEE80211_STA_DISABLE_40MHZ;
- WARN_ON(!ieee80211_set_channel_type(local, sdata,
- channel_type));
+ ht_cap_ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY,
+cbss-information_elements,
+cbss-len_information_elements);
+ if (ht_cap_ie ht_cap_ie[1] = sizeof(*ht_cap)) {
+ ht_cap = (void *)(ht_cap_ie + 2);
+ chains = ieee80211_mcs_to_chains(ht_cap-mcs);
+ }
+ sdata-needed_rx_chains = min(chains, local-rx_chains);
+ } else {
+ sdata-needed_rx_chains = 1;
}
- local-oper_channel = cbss-channel;
- ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
+ /* will change later if needed */
+ sdata-smps_mode = IEEE80211_SMPS_OFF;
- return 0;
+ ieee80211_vif_release_channel(sdata);
+ return ieee80211_vif_use_channel(sdata, cbss-channel, channel_type,
+IEEE80211_CHANCTX_SHARED);
}
static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
pgpveEWivoqdt.pgp
Description: PGP signature
