From patchwork Fri Apr 5 17:31:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 161890 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp707781jan; Fri, 5 Apr 2019 10:30:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqwBD5Ocwv629EBxyMURX1FoR6jd4cD77i5f344eBFwDVc888ns9SySJrzzvQflfrZf7/xsy X-Received: by 2002:a63:2b0d:: with SMTP id r13mr13169198pgr.400.1554485411075; Fri, 05 Apr 2019 10:30:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554485411; cv=none; d=google.com; s=arc-20160816; b=s8UWBfP5vpLzgvhq+e4tUMDi3M1Jxl+M50k3HooXV9J1kENgjsiFJ0ype6Wv4vAq2q B8jQ9KGaWiyVeboK/5J3XRgJoM1pGmMo21ZbF10Y0rw3uQhcF5UD55lZIGzn4UNV2oZY 9kf17lJs7lhhuTr9Ows02dXYn62C99FYD6kmekGdoEOkXGgo2zTAdOn6SkJphN3pj3gr KgeTN6vXy4JnaymtDVVXqPIBQ+ynT9gCBfalEwFAsYo/YW4QNey7uYz1wq7B7nryM4Dp dcRaac3Bb0XxaMOvilqMawdYCaaq4BGh6IJ2hK3dXBJ15MZpHxn38ak7KPQD9vEfp4rc uq3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=uFCOQADwaq6+SkPcWh4kCk5t+sjlrFYsqr7Zct2ZekI=; b=hthX0HQTiottju2s9fBzm9JEjhUjOyg3OHKsMtjqIPwLLUKssTrpWAX/4DeqhWU5d1 ECakS2axxDPMTN66PlIeEr/nlmq4kqotDtshzZzMgIgJmF1IU1cw5FH3THQiJIiOwub9 aHKa5/K4NzHukXxYAGy+y9M9j2lkQatnMWrBFDYUsZzsfC1vp8Ox72TWqhf6Nm0lpc1y TW1bXIEyIn+nrjSPfwCOCKrURr1TUYyx98Sf2hxXUhglk4ZyA1UZ2esznspqgnJTXR4Z +1iLr2qHzB/Nqb+YOLTZgmwdbeY63RytuvoDj/E6/4RNwP3YtA11Ejp6z9NX6m7/Sehg E5mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=JnNnH1Dh; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t1si19613537pgi.330.2019.04.05.10.30.10; Fri, 05 Apr 2019 10:30:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=JnNnH1Dh; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731849AbfDER37 (ORCPT + 9 others); Fri, 5 Apr 2019 13:29:59 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:48590 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731654AbfDER3C (ORCPT ); Fri, 5 Apr 2019 13:29:02 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x35HSxMH063310; Fri, 5 Apr 2019 12:28:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1554485339; bh=uFCOQADwaq6+SkPcWh4kCk5t+sjlrFYsqr7Zct2ZekI=; h=From:To:Subject:Date:In-Reply-To:References; b=JnNnH1DhB9rdikInOQbaO9CAzjNnFafX12gCB0WsKtDSSptI0Qzn4GaY+DyfDzU/1 3C9KgoAajnTsfu72rWgPBSDajrj8BNAeqdjpZK+SycUdLeQ+MzW0WtumD87lWsrcWR 5mIVklhxpcej6pAgTmvRkNp6BU5RREHWkiUPRrvk= Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x35HSx9A096255 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 5 Apr 2019 12:28:59 -0500 Received: from DFLE112.ent.ti.com (10.64.6.33) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 5 Apr 2019 12:28:59 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Fri, 5 Apr 2019 12:28:59 -0500 Received: from uda0868495.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x35HSsuV095744; Fri, 5 Apr 2019 12:28:59 -0500 From: Murali Karicheri To: , , , , Subject: [PATCH net 08/14] net: hsr: fix placement of logical operator in a multi-line statement Date: Fri, 5 Apr 2019 13:31:30 -0400 Message-ID: <20190405173136.18050-9-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190405173136.18050-1-m-karicheri2@ti.com> References: <20190405173136.18050-1-m-karicheri2@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In a multi-line statement exceeding 80 characters, logical operator should be at the end of a line instead of being at the start. This is seen when ran checkpatch.pl -f on files under net/hsr. The change is per suggestion from checkpatch. Signed-off-by: Murali Karicheri --- net/hsr/hsr_forward.c | 8 ++++---- net/hsr/hsr_framereg.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.17.0 diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c index 71ffbfd6d740..c4dfc2966f62 100644 --- a/net/hsr/hsr_forward.c +++ b/net/hsr/hsr_forward.c @@ -61,8 +61,8 @@ static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb) return false; /* Correct ether type?. */ - if (!(ethHdr->h_proto == htons(ETH_P_PRP) - || ethHdr->h_proto == htons(ETH_P_HSR))) + if (!(ethHdr->h_proto == htons(ETH_P_PRP) || + ethHdr->h_proto == htons(ETH_P_HSR))) return false; /* Get the supervision header from correct location. */ @@ -327,8 +327,8 @@ static int hsr_fill_frame_info(struct hsr_frame_info *frame, /* FIXME: */ WARN_ONCE(1, "HSR: VLAN not yet supported"); } - if (ethhdr->h_proto == htons(ETH_P_PRP) - || ethhdr->h_proto == htons(ETH_P_HSR)) { + if (ethhdr->h_proto == htons(ETH_P_PRP) || + ethhdr->h_proto == htons(ETH_P_HSR)) { frame->skb_std = NULL; frame->skb_hsr = skb; frame->sequence_nr = hsr_get_skb_sequence_nr(skb); diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index 1929a8dfd292..1571ac101757 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c @@ -187,8 +187,8 @@ struct hsr_node *hsr_get_node(struct hsr_port *port, struct sk_buff *skb, /* Everyone may create a node entry, connected node to a HSR device. */ - if (ethhdr->h_proto == htons(ETH_P_PRP) - || ethhdr->h_proto == htons(ETH_P_HSR)) { + if (ethhdr->h_proto == htons(ETH_P_PRP) || + ethhdr->h_proto == htons(ETH_P_HSR)) { /* Use the existing sequence_nr from the tag as starting point * for filtering duplicate frames. */ From patchwork Fri Apr 5 17:31:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 161882 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp706771jan; Fri, 5 Apr 2019 10:29:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqyarVJVhxFjeGKxzuDx6Rad2YVKaKYSRiV0jBYcp/y1CEjcr035IfGazinfuFZBD+Q7NCk6 X-Received: by 2002:a63:707:: with SMTP id 7mr12922767pgh.390.1554485352140; Fri, 05 Apr 2019 10:29:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554485352; cv=none; d=google.com; s=arc-20160816; b=t1ad560VJiPWpqSoqN9d7q/ms3PnTZGAEx/YOWtAd9h8m/76MD4yJLsesJm/BYFfHu sXyaIdd2j0zmrQJtFm/gat2Bfh1blJBSl6b1jTUcW0oJNepfD4XR1ab+xZsmHFuGIfcs R0qf+Hm0PoJtSDCR/+1oWmOIW6Vi8o+/P8B6xDBhxcgrFRmPAcb5ruaPs87oyX+TtwvN LpNCoeLN70jujsSXybvmIjBJeZhFenG7hci2b0GXgRuYlZFhq5SS0Bz62PpUUNQvIxfK NJQWWmJCLWVUmo7w79XCWQnFsIxGZ4+ssFkvFwEKdBuYoNMa81v05PEcDuIZZqX9msfq alMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=zJ/WosHMgwUHjyXBx4mSN5WtsQs5N7a25i/DYmq59yg=; b=Lk1YtjDwq/HCxsPobYUGqZKafk0g6rBslMc/BixTpbiZn+sWU/SRCl6JDqSlPhGETf 5qyt88VD6tSPecyUqXMb10DyF56Mcvj8GO0XSLiYphihmQecjrhTRCn2gxn0C5m7ZZh9 mx+bpRd3zgKq7A44nEcyOqdKEgUgv4azfWovpaxzCzpTDB4Br6cBNi7n54esIQTKWbSC 21g5lb1FKmftq3rz+OHToZo/mDw6rp6dQDcrFHq8CxWS/y4nkPXsoWIgUAv3TDIIXwwO Y0NiMkMw46lI1wJimrW51xaaSM6lfs3Jg+4MpaPrnFMfvqZx5KYHzdK0Tau74AIUMbkj 2x1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=VrI8DNhe; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p9si19145384pff.52.2019.04.05.10.29.11; Fri, 05 Apr 2019 10:29:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=VrI8DNhe; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731726AbfDER3K (ORCPT + 9 others); Fri, 5 Apr 2019 13:29:10 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:59712 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731313AbfDER3G (ORCPT ); Fri, 5 Apr 2019 13:29:06 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x35HT21E122713; Fri, 5 Apr 2019 12:29:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1554485342; bh=zJ/WosHMgwUHjyXBx4mSN5WtsQs5N7a25i/DYmq59yg=; h=From:To:Subject:Date:In-Reply-To:References; b=VrI8DNhe5GX7Jkv7GF0iPsseDyCYsUE4fc+WWviKCaGoWDnXr4ykKsyTWUc3ma2k2 OCd1fwlnHrEV6v2OS4eYJ7FUE8Cy/4ljT4IRkzORu5/aT1WDh4E1A0qG2m9CTNaZ8M p9tdmV0RqzlLnlNTZy4ypyVAr0SPvQUjnAE7yPJk= Received: from DLEE106.ent.ti.com (dlee106.ent.ti.com [157.170.170.36]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x35HT2BS096718 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 5 Apr 2019 12:29:02 -0500 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 5 Apr 2019 12:29:01 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Fri, 5 Apr 2019 12:29:01 -0500 Received: from uda0868495.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x35HSsuZ095744; Fri, 5 Apr 2019 12:29:01 -0500 From: Murali Karicheri To: , , , , Subject: [PATCH net 12/14] net: hsr: convert to SPDX identifier Date: Fri, 5 Apr 2019 13:31:34 -0400 Message-ID: <20190405173136.18050-13-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190405173136.18050-1-m-karicheri2@ti.com> References: <20190405173136.18050-1-m-karicheri2@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use SPDX-License-Identifier instead of a verbose license text. Signed-off-by: Murali Karicheri --- net/hsr/hsr_device.c | 6 +----- net/hsr/hsr_device.h | 6 +----- net/hsr/hsr_forward.c | 6 +----- net/hsr/hsr_forward.h | 6 +----- net/hsr/hsr_framereg.c | 6 +----- net/hsr/hsr_framereg.h | 6 +----- net/hsr/hsr_main.c | 6 +----- net/hsr/hsr_main.h | 6 +----- net/hsr/hsr_netlink.c | 6 +----- net/hsr/hsr_netlink.h | 6 +----- net/hsr/hsr_slave.c | 6 +----- net/hsr/hsr_slave.h | 7 +------ 12 files changed, 12 insertions(+), 61 deletions(-) -- 2.17.0 diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index 99142226622c..bb7bf2002040 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -1,9 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_device.h b/net/hsr/hsr_device.h index 9975e31bbb82..6d7759c4f5f9 100644 --- a/net/hsr/hsr_device.h +++ b/net/hsr/hsr_device.h @@ -1,9 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c index 602029c44050..0cac992192d0 100644 --- a/net/hsr/hsr_forward.c +++ b/net/hsr/hsr_forward.c @@ -1,9 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_forward.h b/net/hsr/hsr_forward.h index 5c5bc4b6b75f..51a69295566c 100644 --- a/net/hsr/hsr_forward.h +++ b/net/hsr/hsr_forward.h @@ -1,9 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index 14f816149489..22203562821f 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c @@ -1,9 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_framereg.h b/net/hsr/hsr_framereg.h index 531fd3dfcac1..5f515d4cd088 100644 --- a/net/hsr/hsr_framereg.h +++ b/net/hsr/hsr_framereg.h @@ -1,9 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_main.c b/net/hsr/hsr_main.c index 84cacf8c1b0a..b9988a662ee1 100644 --- a/net/hsr/hsr_main.c +++ b/net/hsr/hsr_main.c @@ -1,9 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index d312e8c777ae..1e49675ca186 100644 --- a/net/hsr/hsr_main.h +++ b/net/hsr/hsr_main.h @@ -1,9 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c index 15d3dba229b9..8a5259d1d59c 100644 --- a/net/hsr/hsr_netlink.c +++ b/net/hsr/hsr_netlink.c @@ -1,9 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_netlink.h b/net/hsr/hsr_netlink.h index 3f6b95b5b6b8..1121bb192a18 100644 --- a/net/hsr/hsr_netlink.h +++ b/net/hsr/hsr_netlink.h @@ -1,9 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c index 07cbc2ead64d..88b6705ded83 100644 --- a/net/hsr/hsr_slave.c +++ b/net/hsr/hsr_slave.c @@ -1,9 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 /* Copyright 2011-2014 Autronica Fire and Security AS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. * * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se diff --git a/net/hsr/hsr_slave.h b/net/hsr/hsr_slave.h index 3ccfbf71c92e..64b549529592 100644 --- a/net/hsr/hsr_slave.h +++ b/net/hsr/hsr_slave.h @@ -1,11 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2011-2014 Autronica Fire and Security AS * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * Author(s): * 2011-2014 Arvid Brodin, arvid.brodin@alten.se */