From patchwork Tue Sep 22 22:55:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 521474 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 5202114018C for ; Wed, 23 Sep 2015 08:56:02 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=Ze+Qv6Cy; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935098AbbIVWz6 (ORCPT ); Tue, 22 Sep 2015 18:55:58 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:36784 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934972AbbIVWzf (ORCPT ); Tue, 22 Sep 2015 18:55:35 -0400 Received: by pacbt3 with SMTP id bt3so3398631pac.3 for ; Tue, 22 Sep 2015 15:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DAIYMhTpI9odKwBzJppHhqW7E+s3RvXBLoOxsHG6mkY=; b=Ze+Qv6CyqQRHaUUNE6TlMGeWatLEq0Tyr0pEjqLRKCH5LGFGVXrSljXnwjiU8Xs7N7 qEJ5VnmZakocwBYKRIsxe6S6OVht+MLTKE08mFpn/OnZi4AAW5dMdqA+dquOLEMMAgk8 jDIo9dyuK8TaBT1RJOO8ij2iuH2MbjjULug9U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DAIYMhTpI9odKwBzJppHhqW7E+s3RvXBLoOxsHG6mkY=; b=Y2pmEZoi/O3jFsSjBHxdQLfzz2wJG/nQcX8XC1sr8KZYDdumnouja+oyonW851Astx 0mhTh7pwybwA8FrF0bOVII9VVgkxG63QhxROPZgRcpE5MWVFysPGvx6VpdP95ZSjjkNk MBExndxtjRUtXd5mdFk4neCl/KUFp/zOXD4n5SyLFlmw9t/ApJsz+jGIeuRTHoU6nB62 fuOuyWGIY+ndYGImyVmUK7trC3AYLQzrUkjal9TOh3X4CtGuP4aQzLDLwbX8wI+wGWXA WHWCXHfmfjR2d91muZoFc3g6NPJjXNgObXbWmaDv/ENAdRgibwpIYnyv3xcdVhxQHOym XvUQ== X-Gm-Message-State: ALoCoQnlIlT5TgFSs+5LEllLatN+sOGv6zzMPDI6uao6IDSsSZk8Xi+25XIvYUpEQmkXxdGNcrHQ X-Received: by 10.67.6.164 with SMTP id cv4mr33793151pad.59.1442962535336; Tue, 22 Sep 2015 15:55:35 -0700 (PDT) Received: from monster-14.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id hh3sm4264611pbc.8.2015.09.22.15.55.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2015 15:55:34 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: David Ahern Subject: [PATCH net-next 5/9] net: Move martian_destination to helper Date: Tue, 22 Sep 2015 15:55:19 -0700 Message-Id: <1442962523-3974-6-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442962523-3974-1-git-send-email-dsa@cumulusnetworks.com> References: <1442962523-3974-1-git-send-email-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move stat and logging for martian_destination error into helper function similar to ip_handle_martian_source. Code move only; no functional change. Signed-off-by: David Ahern --- net/ipv4/route.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 79c4cecdb7a1..3ee37835e1f5 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1531,6 +1531,20 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr, return err; } +/* + * Do not cache martian addresses: they should be logged (RFC1812) + */ +static void ip_handle_martian_dest(struct net_device *dev, + struct in_device *in_dev, + __be32 daddr, __be32 saddr) +{ + RT_CACHE_STAT_INC(in_martian_dst); +#ifdef CONFIG_IP_ROUTE_VERBOSE + if (IN_DEV_LOG_MARTIANS(in_dev)) + net_warn_ratelimited("martian destination %pI4 from %pI4, dev %s\n", + &daddr, &saddr, dev->name); +#endif +} static void ip_handle_martian_source(struct net_device *dev, struct in_device *in_dev, @@ -1857,17 +1871,9 @@ out: return err; res.table = NULL; goto local_input; - /* - * Do not cache martian addresses: they should be logged (RFC1812) - */ martian_destination: err = -EINVAL; - RT_CACHE_STAT_INC(in_martian_dst); -#ifdef CONFIG_IP_ROUTE_VERBOSE - if (IN_DEV_LOG_MARTIANS(in_dev)) - net_warn_ratelimited("martian destination %pI4 from %pI4, dev %s\n", - &daddr, &saddr, dev->name); -#endif + ip_handle_martian_dest(dev, in_dev, daddr, saddr); goto out; martian_source: