Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3020741rwb; Mon, 15 Aug 2022 16:17:53 -0700 (PDT) X-Google-Smtp-Source: AA6agR6kWkqsrnQrKMIeobusrwQMpzIE+K9uxeCZ4k6jLVv4A7a2HL0H0IrrtsL9sGtdrmQwH2Ee X-Received: by 2002:aa7:df88:0:b0:43d:3ac0:a33a with SMTP id b8-20020aa7df88000000b0043d3ac0a33amr16027273edy.157.1660605473410; Mon, 15 Aug 2022 16:17:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660605473; cv=none; d=google.com; s=arc-20160816; b=DKBv1WBluvYa50G02IW/S01Xtaik7qtxH+Y/NCjELjXzbjmZIHc77K3ulMuBOT4PP7 bgxltIvvXn6NJzKPsXGjJ9Q2R6uzLV5eSp+m912Q5qNa/PB88hut/oosCSPFULZT2bJM +NE/1CKXNJLPm9kcoDo2z8okjJWNAaILeBRRkqDPu40abLvru81HrpEBQi3NE3QMkbFh 90IKWlVjsyYRh4n5aoesfj7nnZz48ZxQnoBVAxzV8FYGfQVxu9Kjm3MTVaiPOcr1v4nO y/DTYucFORXBMRU9Euw/fVIOcizhzUqSQ2UzcSB/l6eopxRdKv4Ovit0Nk+pFu3KYv62 OD/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=A/Yh+61t0jYDxbuxDzvyoix6osBaMKg1nDRh83L4xNA=; b=jXhuIMx+1qChG2cBbFA0W9U4ctP7KnjQpjeXCHh3BlTclRueQr0KJsK1dn+MwwNr2Z swL8JPmaAC7loXbrEVl/CCO6wSNQ3/Kd1cNX4S+m5k+1M7/51e8Xr4sAn72g0NH8HVCL 726un6PLpUJVCLoykhKjwCGnShimGrYEKXrZkZZmJYl9zdMtIdvUxqrgfYxhuhUT26x7 fqT9A9O42YjFdkYErQReRlPrGLOJADKFPoFKqTyRr4lx+GS5ufAl3N8b9timOV2OpWTC qqoJBryDfqij+rt9zKqgdB6YDsw/MUTSSo+9m/E05PdgXNJ7dbMT23AaPbiCicuAHTET VS2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=MTWWs3AL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ds4-20020a170907724400b007331436454esi8943165ejc.603.2022.08.15.16.17.28; Mon, 15 Aug 2022 16:17:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=MTWWs3AL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243671AbiHOU5k (ORCPT + 99 others); Mon, 15 Aug 2022 16:57:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346987AbiHOU4K (ORCPT ); Mon, 15 Aug 2022 16:56:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F07062D1E6; Mon, 15 Aug 2022 12:11:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8DCFF60ABC; Mon, 15 Aug 2022 19:11:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E9BFC433D6; Mon, 15 Aug 2022 19:11:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660590708; bh=QBGjRJFtEU+iElACBkJr5j4kRG4AHRygAmG1sCA7G9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MTWWs3AL2OrfdSCgcFodbikH1OxYLFz7pXDBX+mvrkWPMK5T6RBHCbsPbriVYoJPU pyNtqYsC0bRM8p9KDUCN8P4PXBEQxMpSV1TznWPflX23cwI7u+dGuaKTAZeZPLPfQ2 MB+BV9vFNNFCxkMM+xEeMTMH1pJoDgcE7ePApwJU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kuniyuki Iwashima , "David S. Miller" , Sasha Levin Subject: [PATCH 5.18 0346/1095] raw: Fix mixed declarations error in raw_icmp_error(). Date: Mon, 15 Aug 2022 19:55:45 +0200 Message-Id: <20220815180444.104879966@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kuniyuki Iwashima [ Upstream commit 5da39e31b1b0eb62b8ed369ad9615da850239e9e ] The trailing semicolon causes a compiler error, so let's remove it. net/ipv4/raw.c: In function ‘raw_icmp_error’: net/ipv4/raw.c:266:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] 266 | struct hlist_nulls_head *hlist; | ^~~~~~ Fixes: ba44f8182ec2 ("raw: use more conventional iterators") Signed-off-by: Kuniyuki Iwashima Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 2961421dfa68..0d534f4720c4 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -262,7 +262,7 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info) void raw_icmp_error(struct sk_buff *skb, int protocol, u32 info) { - struct net *net = dev_net(skb->dev);; + struct net *net = dev_net(skb->dev); struct hlist_nulls_head *hlist; struct hlist_nulls_node *hnode; int dif = skb->dev->ifindex; -- 2.35.1