netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: Stephen Hemminger <shemming@brocade.com>
Cc: netdev@vger.kernel.org
Subject: [iproute PATCH v2 5/6] ipaddress: drop unnecessary check in ipaddr_list_flush_or_save()
Date: Sun,  8 Nov 2015 21:22:20 +0100	[thread overview]
Message-ID: <1447014141-3565-6-git-send-email-phil@nwl.cc> (raw)
In-Reply-To: <1447014141-3565-1-git-send-email-phil@nwl.cc>

Right after ipaddr_reset_filter(), filter.family is always AF_UNSPEC.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 ip/ipaddress.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 23e0308..ff7f2a8 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -1446,10 +1446,7 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
 
 	ipaddr_reset_filter(oneline, 0);
 	filter.showqueue = 1;
-
-	if (filter.family == AF_UNSPEC)
-		filter.family = preferred_family;
-
+	filter.family = preferred_family;
 	filter.group = -1;
 
 	if (action == IPADD_FLUSH) {
-- 
2.1.2

  parent reply	other threads:[~2015-11-08 20:22 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-08 19:21 [iproute PATCH 0/6] flush many addresses and some cleanups Phil Sutter
2015-11-08 19:21 ` [iproute PATCH 1/6] ipaddress: make flush command more error-tolerant Phil Sutter
2015-11-08 19:21 ` [iproute PATCH 2/6] ipaddress: simplify ipaddr_flush() Phil Sutter
2015-11-08 19:21 ` [iproute PATCH 3/6] libnetlink: introduce nc_flags Phil Sutter
2015-11-08 19:21 ` [iproute PATCH 4/6] ipaddress: fix ipaddr_flush for Linux >= 3.1 Phil Sutter
2015-11-08 19:21 ` [iproute PATCH 5/6] ipaddress: drop unnecessary check in ipaddr_list_flush_or_save() Phil Sutter
2015-11-08 19:21 ` [iproute PATCH 6/6] iptoken: simplify iptoken_list a bit Phil Sutter
2015-11-08 20:22 ` [iproute PATCH v2 0/6] flush many addresses and some cleanups Phil Sutter
2015-11-08 20:22   ` [iproute PATCH v2 1/6] ipaddress: make flush command more error-tolerant Phil Sutter
2015-11-24  0:31     ` Stephen Hemminger
2015-11-24 14:30       ` [iproute PATCH v3 0/5] flush many addresses and some cleanups Phil Sutter
2015-11-24 14:31         ` [iproute PATCH v3 1/5] ipaddress: simplify ipaddr_flush() Phil Sutter
2015-11-24 14:31         ` [iproute PATCH v3 2/5] libnetlink: introduce nc_flags Phil Sutter
2015-11-24 14:31         ` [iproute PATCH v3 3/5] ipaddress: fix ipaddr_flush for Linux >= 3.1 Phil Sutter
2015-11-25 13:36           ` Sergei Shtylyov
2015-11-25 14:32             ` Phil Sutter
2015-11-25 14:40               ` Sergei Shtylyov
2015-11-24 14:31         ` [iproute PATCH v3 4/5] ipaddress: drop unnecessary check in ipaddr_list_flush_or_save() Phil Sutter
2015-11-24 14:31         ` [iproute PATCH v3 5/5] iptoken: simplify iptoken_list a bit Phil Sutter
2015-11-29 19:50         ` [iproute PATCH v3 0/5] flush many addresses and some cleanups Stephen Hemminger
2015-11-08 20:22   ` [iproute PATCH v2 2/6] ipaddress: simplify ipaddr_flush() Phil Sutter
2015-11-08 20:22   ` [iproute PATCH v2 3/6] libnetlink: introduce nc_flags Phil Sutter
2015-11-08 20:22   ` [iproute PATCH v2 4/6] ipaddress: fix ipaddr_flush for Linux >= 3.1 Phil Sutter
2015-11-09 18:51     ` Sergei Shtylyov
2015-11-09 18:58       ` Sergei Shtylyov
2015-11-10 11:21         ` Phil Sutter
2015-11-08 20:22   ` Phil Sutter [this message]
2015-11-08 20:22   ` [iproute PATCH v2 6/6] iptoken: simplify iptoken_list a bit Phil Sutter
2015-11-11 11:03     ` Daniel Borkmann

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=1447014141-3565-6-git-send-email-phil@nwl.cc \
    --to=phil@nwl.cc \
    --cc=netdev@vger.kernel.org \
    --cc=shemming@brocade.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).