From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
James Bottomley <James.Bottomley@suse.de>,
mark gross <markgross@thegnar.org>,
Florian Mickler <florian@mickler.org>,
David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Subject: linux-next: manual merge of the suspend tree with the net tree
Date: Wed, 4 Aug 2010 13:14:11 +1000 [thread overview]
Message-ID: <20100804131411.85975b86.sfr@canb.auug.org.au> (raw)
Hi Rafael,
Today's linux-next merge of the suspend tree got a conflict in
drivers/net/e1000e/netdev.c between commit
c128ec29208d410568469bd8bb373b4cdc10912a ("e1000e: register pm_qos
request on hardware activation") from the net tree and commit
82f682514a5df89ffb3890627eebf0897b7a84ec ("pm_qos: Get rid of the
allocation in pm_qos_add_request()") from the suspend tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/e1000e/netdev.c
index 35c7dbd,9f13b66..0000000
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@@ -3525,12 -3495,6 +3525,13 @@@ static int e1000_open(struct net_devic
E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
e1000_update_mng_vlan(adapter);
+ /* DMA latency requirement to workaround early-receive/jumbo issue */
+ if (adapter->flags & FLAG_HAS_ERT)
- adapter->netdev->pm_qos_req =
- pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
- PM_QOS_DEFAULT_VALUE);
++ pm_qos_add_request(&adapter->netdev->pm_qos_req,
++ PM_QOS_CPU_DMA_LATENCY,
++ PM_QOS_DEFAULT_VALUE);
++
+
/*
* before we allocate an interrupt, we must be ready to handle it.
* Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
@@@ -3635,11 -3599,6 +3636,10 @@@ static int e1000_close(struct net_devic
if (adapter->flags & FLAG_HAS_AMT)
e1000_release_hw_control(adapter);
- if (adapter->flags & FLAG_HAS_ERT) {
- pm_qos_remove_request(adapter->netdev->pm_qos_req);
- adapter->netdev->pm_qos_req = NULL;
- }
++ if (adapter->flags & FLAG_HAS_ERT)
++ pm_qos_remove_request(&adapter->netdev->pm_qos_req);
++
+
pm_runtime_put_sync(&pdev->dev);
return 0;
next reply other threads:[~2010-08-04 3:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-04 3:14 Stephen Rothwell [this message]
2010-08-04 5:23 ` Florian Mickler
2010-08-04 6:42 ` Stephen Rothwell
2011-04-29 2:05 Stephen Rothwell
2011-04-29 20:36 ` Rafael J. Wysocki
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=20100804131411.85975b86.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=James.Bottomley@suse.de \
--cc=davem@davemloft.net \
--cc=florian@mickler.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=markgross@thegnar.org \
--cc=netdev@vger.kernel.org \
--cc=rjw@sisk.pl \
/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
all inboxes | Powered by JetHome®