From: Julia Cartwright <julia@ni.com>
To: David Miller <davem@davemloft.net>
Cc: <julia.lawall@lip6.fr>, <rafalo@cadence.com>,
<nicolas.ferre@microchip.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <kbuild-all@01.org>
Subject: [PATCH v2 3/3] net: macb: change GFP_ATOMIC to GFP_KERNEL
Date: Tue, 5 Dec 2017 18:02:50 -0600 [thread overview]
Message-ID: <da389d51c2f4d8a600418143e00be40423255576.1512518311.git.julia@ni.com> (raw)
In-Reply-To: <cover.1512518311.git.julia@ni.com>
Now that the rx_fs_lock is no longer held across allocation, it's safe
to use GFP_KERNEL for allocating new entries.
This reverts commit 81da3bf6e3f88 ("net: macb: change GFP_KERNEL to
GFP_ATOMIC").
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Julia Cartwright <julia@ni.com>
---
drivers/net/ethernet/cadence/macb_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 758e8b3042b2..234667eaaa92 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -2800,7 +2800,7 @@ static int gem_add_flow_filter(struct net_device *netdev,
int ret = -EINVAL;
bool added = false;
- newfs = kmalloc(sizeof(*newfs), GFP_ATOMIC);
+ newfs = kmalloc(sizeof(*newfs), GFP_KERNEL);
if (newfs == NULL)
return -ENOMEM;
memcpy(&newfs->fs, fs, sizeof(newfs->fs));
--
2.14.2
next prev parent reply other threads:[~2017-12-06 0:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-02 7:01 [PATCH v2] net: macb: change GFP_KERNEL to GFP_ATOMIC Julia Lawall
2017-12-05 16:27 ` David Miller
2017-12-05 20:17 ` [PATCH 1/2] net: macb: reduce scope of rx_fs_lock-protected regions Julia Cartwright
2017-12-05 20:18 ` [PATCH 2/2] net: macb: kill useless use of list_empty() Julia Cartwright
2017-12-05 21:28 ` Nicolas Ferre
2017-12-05 21:26 ` [PATCH 1/2] net: macb: reduce scope of rx_fs_lock-protected regions Nicolas Ferre
2017-12-05 23:00 ` David Miller
2017-12-06 0:02 ` [PATCH v2 0/3] macb rx filter cleanups Julia Cartwright
2017-12-06 0:02 ` [PATCH v2 1/3] net: macb: kill useless use of list_empty() Julia Cartwright
2017-12-06 0:02 ` [PATCH v2 2/3] net: macb: reduce scope of rx_fs_lock-protected regions Julia Cartwright
2017-12-06 0:02 ` Julia Cartwright [this message]
2017-12-06 5:49 ` [PATCH v2 3/3] net: macb: change GFP_ATOMIC to GFP_KERNEL Julia Lawall
2017-12-06 1:08 ` [PATCH v2 0/3] macb rx filter cleanups David Miller
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=da389d51c2f4d8a600418143e00be40423255576.1512518311.git.julia@ni.com \
--to=julia@ni.com \
--cc=davem@davemloft.net \
--cc=julia.lawall@lip6.fr \
--cc=kbuild-all@01.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=rafalo@cadence.com \
/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;
as well as URLs for NNTP newsgroup(s).