* [PATCH] iwlwifi: pcie: fix merge damage
@ 2013-09-30 9:02 Johannes Berg
2013-09-30 9:07 ` Johannes Berg
2013-10-02 9:41 ` Johannes Berg
0 siblings, 2 replies; 9+ messages in thread
From: Johannes Berg @ 2013-09-30 9:02 UTC (permalink / raw)
To: linux-wireless, linville; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
The merge b35c8097 seems to have lost commit eabc4ac5d,
put the code back.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
drivers/net/wireless/iwlwifi/pcie/trans.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index bad95d2..c3f904d 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1401,6 +1401,10 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
spin_lock_init(&trans_pcie->reg_lock);
init_waitqueue_head(&trans_pcie->ucode_write_waitq);
+ 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
@@ -1412,10 +1416,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
PCIE_LINK_STATE_CLKPM);
}
- err = pci_enable_device(pdev);
- if (err)
- goto out_no_pci;
-
pci_set_master(pdev);
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] iwlwifi: pcie: fix merge damage
2013-09-30 9:02 [PATCH] iwlwifi: pcie: fix merge damage Johannes Berg
@ 2013-09-30 9:07 ` Johannes Berg
2013-09-30 20:32 ` John W. Linville
2013-10-02 9:41 ` Johannes Berg
1 sibling, 1 reply; 9+ messages in thread
From: Johannes Berg @ 2013-09-30 9:07 UTC (permalink / raw)
To: linux-wireless; +Cc: linville
On Mon, 2013-09-30 at 11:02 +0200, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> The merge b35c8097 seems to have lost commit eabc4ac5d,
> put the code back.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Ah, forgot to say - John, I think you should apply this as a patch,
having it in my pull request seems odd. But if you're of another opinion
I can stick it into my next -next pull request too.
johannes
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: pcie: fix merge damage
2013-09-30 9:07 ` Johannes Berg
@ 2013-09-30 20:32 ` John W. Linville
2013-10-01 7:28 ` Johannes Berg
0 siblings, 1 reply; 9+ messages in thread
From: John W. Linville @ 2013-09-30 20:32 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless
On Mon, Sep 30, 2013 at 11:07:54AM +0200, Johannes Berg wrote:
> On Mon, 2013-09-30 at 11:02 +0200, Johannes Berg wrote:
> > From: Johannes Berg <johannes.berg@intel.com>
> >
> > The merge b35c8097 seems to have lost commit eabc4ac5d,
> > put the code back.
> >
> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>
> Ah, forgot to say - John, I think you should apply this as a patch,
> having it in my pull request seems odd. But if you're of another opinion
> I can stick it into my next -next pull request too.
OK -- does this need to be treated as a fix? Or is -next OK?
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: pcie: fix merge damage
2013-09-30 20:32 ` John W. Linville
@ 2013-10-01 7:28 ` Johannes Berg
2013-10-03 10:07 ` Sedat Dilek
0 siblings, 1 reply; 9+ messages in thread
From: Johannes Berg @ 2013-10-01 7:28 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless
On Mon, 2013-09-30 at 16:32 -0400, John W. Linville wrote:
> On Mon, Sep 30, 2013 at 11:07:54AM +0200, Johannes Berg wrote:
> > On Mon, 2013-09-30 at 11:02 +0200, Johannes Berg wrote:
> > > From: Johannes Berg <johannes.berg@intel.com>
> > >
> > > The merge b35c8097 seems to have lost commit eabc4ac5d,
> > > put the code back.
> > >
> > > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> >
> > Ah, forgot to say - John, I think you should apply this as a patch,
> > having it in my pull request seems odd. But if you're of another opinion
> > I can stick it into my next -next pull request too.
>
> OK -- does this need to be treated as a fix? Or is -next OK?
I believe the merge damage only occurred during merging wireless.git (or
one of its upstreams) into wireless-next.git.
johannes
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: pcie: fix merge damage
2013-10-01 7:28 ` Johannes Berg
@ 2013-10-03 10:07 ` Sedat Dilek
2013-10-07 11:47 ` Johannes Berg
0 siblings, 1 reply; 9+ messages in thread
From: Sedat Dilek @ 2013-10-03 10:07 UTC (permalink / raw)
To: Johannes Berg; +Cc: John W. Linville, wireless
On Tue, Oct 1, 2013 at 9:28 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
> On Mon, 2013-09-30 at 16:32 -0400, John W. Linville wrote:
>> On Mon, Sep 30, 2013 at 11:07:54AM +0200, Johannes Berg wrote:
>> > On Mon, 2013-09-30 at 11:02 +0200, Johannes Berg wrote:
>> > > From: Johannes Berg <johannes.berg@intel.com>
>> > >
>> > > The merge b35c8097 seems to have lost commit eabc4ac5d,
>> > > put the code back.
>> > >
>> > > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>> >
>> > Ah, forgot to say - John, I think you should apply this as a patch,
>> > having it in my pull request seems odd. But if you're of another opinion
>> > I can stick it into my next -next pull request too.
>>
>> OK -- does this need to be treated as a fix? Or is -next OK?
>
> I believe the merge damage only occurred during merging wireless.git (or
> one of its upstreams) into wireless-next.git.
>
Hmm, this patch applies also for Linux v3.12-rc3+, so you are sure it
is not for iwlwifi-3.12-fixes?
- Sedat -
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: pcie: fix merge damage
2013-10-03 10:07 ` Sedat Dilek
@ 2013-10-07 11:47 ` Johannes Berg
0 siblings, 0 replies; 9+ messages in thread
From: Johannes Berg @ 2013-10-07 11:47 UTC (permalink / raw)
To: sedat.dilek; +Cc: John W. Linville, wireless
On Thu, 2013-10-03 at 12:07 +0200, Sedat Dilek wrote:
> > I believe the merge damage only occurred during merging wireless.git (or
> > one of its upstreams) into wireless-next.git.
> >
>
> Hmm, this patch applies also for Linux v3.12-rc3+, so you are sure it
> is not for iwlwifi-3.12-fixes?
Ahrg, yes, so it happened in wireless-next *before* wireless-next went
into 3.12-rc1.
John, any idea what to do now? Cherry-pick the patch over to
wireless.git?
johannes
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: pcie: fix merge damage
2013-09-30 9:02 [PATCH] iwlwifi: pcie: fix merge damage Johannes Berg
2013-09-30 9:07 ` Johannes Berg
@ 2013-10-02 9:41 ` Johannes Berg
2013-10-02 18:50 ` John W. Linville
2013-10-02 18:58 ` John W. Linville
1 sibling, 2 replies; 9+ messages in thread
From: Johannes Berg @ 2013-10-02 9:41 UTC (permalink / raw)
To: linux-wireless; +Cc: linville
On Mon, 2013-09-30 at 11:02 +0200, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> The merge b35c8097 seems to have lost commit eabc4ac5d,
> put the code back.
I'm rebasing my tree on -rc1, which actually includes the merge commit,
so it still makes sense for me to include this commit - I've done that
now. Sorry for the confusion.
johannes
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: pcie: fix merge damage
2013-10-02 9:41 ` Johannes Berg
@ 2013-10-02 18:50 ` John W. Linville
2013-10-02 18:58 ` John W. Linville
1 sibling, 0 replies; 9+ messages in thread
From: John W. Linville @ 2013-10-02 18:50 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless
On Wed, Oct 02, 2013 at 11:41:44AM +0200, Johannes Berg wrote:
> On Mon, 2013-09-30 at 11:02 +0200, Johannes Berg wrote:
> > From: Johannes Berg <johannes.berg@intel.com>
> >
> > The merge b35c8097 seems to have lost commit eabc4ac5d,
> > put the code back.
>
> I'm rebasing my tree on -rc1, which actually includes the merge commit,
> so it still makes sense for me to include this commit - I've done that
> now. Sorry for the confusion.
I'm not sure I follow -- please don't base on anything I don't already
have in my tree if you want me to pull from you.
I applied the patch to wireless-next today, FWIW.
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: pcie: fix merge damage
2013-10-02 9:41 ` Johannes Berg
2013-10-02 18:50 ` John W. Linville
@ 2013-10-02 18:58 ` John W. Linville
1 sibling, 0 replies; 9+ messages in thread
From: John W. Linville @ 2013-10-02 18:58 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless
On Wed, Oct 02, 2013 at 11:41:44AM +0200, Johannes Berg wrote:
> On Mon, 2013-09-30 at 11:02 +0200, Johannes Berg wrote:
> > From: Johannes Berg <johannes.berg@intel.com>
> >
> > The merge b35c8097 seems to have lost commit eabc4ac5d,
> > put the code back.
>
> I'm rebasing my tree on -rc1, which actually includes the merge commit,
> so it still makes sense for me to include this commit - I've done that
> now. Sorry for the confusion.
I'm not sure I follow -- please don't base on anything I don't already
have in my tree if you want me to pull from you.
I applied the patch to wireless-next today, FWIW.
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-10-07 11:47 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-30 9:02 [PATCH] iwlwifi: pcie: fix merge damage Johannes Berg
2013-09-30 9:07 ` Johannes Berg
2013-09-30 20:32 ` John W. Linville
2013-10-01 7:28 ` Johannes Berg
2013-10-03 10:07 ` Sedat Dilek
2013-10-07 11:47 ` Johannes Berg
2013-10-02 9:41 ` Johannes Berg
2013-10-02 18:50 ` John W. Linville
2013-10-02 18:58 ` 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).