From patchwork Fri Jan 25 14:41:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Wei X-Patchwork-Id: 1031132 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="MJUahM9Q"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43mMDh0sTKz9s55 for ; Sat, 26 Jan 2019 01:42:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726630AbfAYOmK (ORCPT ); Fri, 25 Jan 2019 09:42:10 -0500 Received: from m12-11.163.com ([220.181.12.11]:36746 "EHLO m12-11.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726111AbfAYOmK (ORCPT ); Fri, 25 Jan 2019 09:42:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=ZRxl8kIBx5vepvsrxK DEu6wEYbfGeHEiJpOBXn/ifC0=; b=MJUahM9QqgnpJACUuyw4HlSWJr/NJnOjqc ntl6K4/Rn5c1pRg73pfn1qJEZNpRS21VHIf1WUYVNaDmSFkgGcDRxcSzNXlaPmUo l5ouTOZI2PMNtlVrDe6RXielDwvvU8iyp2xhWzTCB4+ZCOAYn+8st/GlTrnsHBmp 2EqrDj7II= Received: from yangwei-T440.lan (unknown [171.223.99.184]) by smtp7 (Coremail) with SMTP id C8CowAB3l0swIEtcwKrpCw--.2121S3; Fri, 25 Jan 2019 22:41:53 +0800 (CST) From: Yang Wei To: netdev@vger.kernel.org Cc: davem@davemloft.net, andrew@lunn.ch, yang.wei9@zte.com.cn, Yang Wei Subject: [PATCH v2] net: ipv4: ip_input: fix blank line coding style issues Date: Fri, 25 Jan 2019 22:41:50 +0800 Message-Id: <1548427310-3553-1-git-send-email-albin_yang@163.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: C8CowAB3l0swIEtcwKrpCw--.2121S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrZrykJF48trWfuw18trW7XFb_yoWDXFb_A3 4jv3y7W34rGr1qqa1Dua1rtF9aqr4IvayS9rsrtr9rtw1UArZ8A3sxCF9xur13ua97Kr15 ZFyDKry0qr13ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU0wYFJUUUUU== X-Originating-IP: [171.223.99.184] X-CM-SenderInfo: pdoex0xb1d0wi6rwjhhfrp/1tbiHRFHolSIc7kOVQAAsk Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix blank line coding style issues, make the code cleaner. Remove a redundant blank line in ip_rcv_core(). Insert a blank line in ip_rcv() between different statement blocks. Signed-off-by: Yang Wei Reviewed-by: Andrew Lunn --- net/ipv4/ip_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 51d8efb..cd6b569 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -429,7 +429,6 @@ static struct sk_buff *ip_rcv_core(struct sk_buff *skb, struct net *net) if (skb->pkt_type == PACKET_OTHERHOST) goto drop; - __IP_UPD_PO_STATS(net, IPSTATS_MIB_IN, skb->len); skb = skb_share_check(skb, GFP_ATOMIC); @@ -521,6 +520,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, skb = ip_rcv_core(skb, net); if (skb == NULL) return NET_RX_DROP; + return NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, net, NULL, skb, dev, NULL, ip_rcv_finish);