From: Nikolay Aleksandrov <razor@blackwall.org>
To: netdev@vger.kernel.org
Cc: dsa@cumulusnetworks.com, shm@cumulusnetworks.com,
davem@davemloft.net,
Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Subject: [PATCH net-next 3/4] vrf: don't check for dstats and rth in uninit path
Date: Tue, 18 Aug 2015 20:28:03 +0300 [thread overview]
Message-ID: <1439918884-13681-4-git-send-email-razor@blackwall.org> (raw)
In-Reply-To: <1439918884-13681-1-git-send-email-razor@blackwall.org>
From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
dstats and rth are always present because we fail the device registration
if they can't be allocated in vrf_init() (ndo_init) so drop the unnecessary
checks.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
---
drivers/net/vrf.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 3d7da0c6f827..97605eab14ae 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -265,8 +265,7 @@ static void vrf_rtable_destroy(struct net_vrf *vrf)
{
struct dst_entry *dst = (struct dst_entry *)vrf->rth;
- if (dst)
- dst_destroy(dst);
+ dst_destroy(dst);
vrf->rth = NULL;
}
@@ -455,8 +454,7 @@ static void vrf_dev_uninit(struct net_device *dev)
list_for_each_entry_safe(slave, next, head, list)
vrf_del_slave(dev, slave->dev);
- if (dev->dstats)
- free_percpu(dev->dstats);
+ free_percpu(dev->dstats);
dev->dstats = NULL;
}
--
2.4.3
next prev parent reply other threads:[~2015-08-18 19:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 17:28 [PATCH net-next 0/4] vrf: a few simplifications and cleanups Nikolay Aleksandrov
2015-08-18 17:28 ` [PATCH net-next 1/4] vrf: drop unnecessary dev refcnt changes Nikolay Aleksandrov
2015-08-18 17:28 ` [PATCH net-next 2/4] vrf: drop unused num_slaves member Nikolay Aleksandrov
2015-08-18 17:28 ` Nikolay Aleksandrov [this message]
2015-08-18 17:28 ` [PATCH net-next 4/4] vrf: simplify the netdev notifier function Nikolay Aleksandrov
2015-08-18 19:38 ` [PATCH net-next 0/4] vrf: a few simplifications and cleanups David Ahern
2015-08-19 3:17 ` 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=1439918884-13681-4-git-send-email-razor@blackwall.org \
--to=razor@blackwall.org \
--cc=davem@davemloft.net \
--cc=dsa@cumulusnetworks.com \
--cc=netdev@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=shm@cumulusnetworks.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).