From patchwork Sun Oct 18 00:51:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 531894 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 860CC1402B0 for ; Sun, 18 Oct 2015 11:52:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=PI8KVZHR; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752117AbbJRAvx (ORCPT ); Sat, 17 Oct 2015 20:51:53 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:36804 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751923AbbJRAvw (ORCPT ); Sat, 17 Oct 2015 20:51:52 -0400 Received: by pacfv9 with SMTP id fv9so57426678pac.3 for ; Sat, 17 Oct 2015 17:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=6+9I/jtBrGskloBbdodpglcafAW07v8/of4oH2K6ei4=; b=PI8KVZHRY4UBHznv8kIvFhkCjx/hHYXbtlGS8k1XEzQaLppcGFv+92pdIjk4mqPiEY CMmjLaSSFYcaPLlQRUT7Z31mz6Oo+vFNRO69MMarwgOuDVrvrWmYebFemhWjE4XrrFuS 2+thdJc1MTkNAwoOotbaYzJ8yAnOwHa7sIwJ9KzKEvTb9lz38e0siBr3loC+JibV4zM1 TjovlRoGZ1Zls5lfnr45B8KrNgp4u5YuNnFdPQDcCZxvpH5mehmLVgHFIGxBmrNTiDL7 tyhAGl26pPsKRpcXaa1SJIUBmMDMcy1s3XrebWzQRCFYL77REnRV2dNtYQ0QYvUvNrwt JoCg== X-Received: by 10.68.253.66 with SMTP id zy2mr25232478pbc.50.1445129511798; Sat, 17 Oct 2015 17:51:51 -0700 (PDT) Received: from localhost.localdomain (p4a0b83.kngwnt01.ap.so-net.ne.jp. [120.74.11.131]) by smtp.gmail.com with ESMTPSA id qk7sm22971167pbb.80.2015.10.17.17.51.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 17 Oct 2015 17:51:51 -0700 (PDT) From: Masashi Honma To: netdev@vger.kernel.org Cc: Masashi Honma Subject: [PATCH] ipv6 route: Aggregate table getting code Date: Sun, 18 Oct 2015 09:51:39 +0900 Message-Id: <1445129499-2496-1-git-send-email-masashi.honma@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org These lines could be aggregated to one line because fib6_new_table() calls fib6_get_table() inside on both cases CONFIG_IPV6_MULTIPLE_TABLES is enabled or not. Signed-off-by: Masashi Honma --- net/ipv6/route.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index cb32ce2..1ff4130 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1778,16 +1778,7 @@ int ip6_route_info_create(struct fib6_config *cfg, struct rt6_info **rt_ret) cfg->fc_metric = IP6_RT_PRIO_USER; err = -ENOBUFS; - if (cfg->fc_nlinfo.nlh && - !(cfg->fc_nlinfo.nlh->nlmsg_flags & NLM_F_CREATE)) { - table = fib6_get_table(net, cfg->fc_table); - if (!table) { - pr_warn("NLM_F_CREATE should be specified when creating new route\n"); - table = fib6_new_table(net, cfg->fc_table); - } - } else { - table = fib6_new_table(net, cfg->fc_table); - } + table = fib6_new_table(net, cfg->fc_table); if (!table) goto out;