From patchwork Mon Nov 13 16:50:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 164567 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1333022vqg; Mon, 13 Nov 2023 08:51:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/TyqtxnZAutmM65pS56SUlE2KA01MiouCevPPIxjxQ3DIs1hQUnOI+WIqD6XvGdQmkhLJ X-Received: by 2002:a05:6a21:329f:b0:186:1663:53f3 with SMTP id yt31-20020a056a21329f00b00186166353f3mr4275045pzb.33.1699894262191; Mon, 13 Nov 2023 08:51:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699894262; cv=none; d=google.com; s=arc-20160816; b=kPjETcB8z/NWL6+UdQT3OYRSiXkdPcgdmz1z7ev0KPI/dga95muqyPdD32e0l3UR0A 35gOBdsD572Zhez53wXoel9Vr7RZM+kOuCjYoqjkIFLs783g4HLnqCymOP8V3N3bP6CX +gG0GTQC430PM0zOXb7kKg1uakUp9//vxiP66TMMHe0Jf2wj9cmXtS/W/ODQpQuVUvz0 VYaz1slp+7HhXlHIVptFS6rOKL6L9HYdZQok0hMw+v4tloD9zswtdbVFF1i+xSIix92M R+SZrsLzJ5kgIS6UJm84eK3ODe9uXoCY4G3VMiTC2Ov8imInZ858OYpaFNvBea5N0H11 xJKQ== 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 :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=GwEaw6/jWvZLVdCicUMzM7MB/gHZF4+AhCU+2CxZ0Gk=; fh=VHMu3w7yJ5nU9s84HV73eritr8eoKjhEWtk9A7ywyK0=; b=K4RB3PKc+0KrqY6s0AUzz1dvpxkYmLxt+vD7+jl73GUsVQfgkIO6Ur652agIrQZS9+ DCgd7UO5enk7ruyco/mxkeiSqHK9UcVo01xWdMT4kge8QYVs/7vMjSAf2xJQF+Gveojq Gaaf/qRkxSvkCZeW+YMiPdqRB63IsdywjCSHioXJtmsrR9ZFJNGtL9lqsgQK1ljkPUVA cv9104nDoHIpaIWcdQUqBMTywvkUYazGmr8NmkpPkyR45bHUOnOzxNIfWmt1AKo1wrf8 MP4r5KGgc6c8fPwoaGhOxOBuIGeLXyyZI1WareHFgXA6z1Wf7+UuqvRIeZekg4ZoYY2h Vn6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=dkimrelay header.b=tbZSuFmy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id e3-20020a17090301c300b001b9c3498526si6383669plh.433.2023.11.13.08.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 08:51:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@broadcom.com header.s=dkimrelay header.b=tbZSuFmy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3C3BB80617F1; Mon, 13 Nov 2023 08:51:00 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230025AbjKMQur (ORCPT + 29 others); Mon, 13 Nov 2023 11:50:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229511AbjKMQuq (ORCPT ); Mon, 13 Nov 2023 11:50:46 -0500 X-Greylist: delayed 191 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 13 Nov 2023 08:50:43 PST Received: from relay.smtp-ext.broadcom.com (saphodev.broadcom.com [192.19.144.205]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25AA3D53 for ; Mon, 13 Nov 2023 08:50:42 -0800 (PST) Received: from mail-lvn-it-01.lvn.broadcom.net (mail-lvn-it-01.lvn.broadcom.net [10.36.132.253]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id E20D5C0000F8; Mon, 13 Nov 2023 08:50:41 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com E20D5C0000F8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1699894241; bh=9tYcZbeteCSzUeb5BAfg8kvTY0sU1YEKvYdln3CCNik=; h=From:To:Cc:Subject:Date:From; b=tbZSuFmytvRL6cUeBvX0cXJNotWkz40/rESxo0FWqj9EUBDiEM2lFh2GulcVak1tJ RGqKRJexXnPVvp0GsVV6SbAnelsfRJGAHpe4b0TaV6GBWYlz8sSo+LrgtxOLY5XeCG u4tUECbOFHwaBQHMtRDlozFAYBOLljjmNikPev9o= Received: from fainelli-desktop.igp.broadcom.net (fainelli-desktop.dhcp.broadcom.net [10.67.48.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail-lvn-it-01.lvn.broadcom.net (Postfix) with ESMTPSA id 8836A18041CAC4; Mon, 13 Nov 2023 08:50:40 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next] net: dsa: tag_rtl4_a: Use existing ETH_P_REALTEK constant Date: Mon, 13 Nov 2023 08:50:30 -0800 Message-Id: <20231113165030.2440083-1-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 13 Nov 2023 08:51:00 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782468325496860459 X-GMAIL-MSGID: 1782468325496860459 No functional change, uses the existing ETH_P_REALTEK constant already defined in if_ether.h. Signed-off-by: Florian Fainelli Reviewed-by: Andrew Lunn Reviewed-by: Vladimir Oltean --- net/dsa/tag_rtl4_a.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c index 4da5bad1a7aa..a019226ec6d2 100644 --- a/net/dsa/tag_rtl4_a.c +++ b/net/dsa/tag_rtl4_a.c @@ -23,7 +23,6 @@ #define RTL4_A_NAME "rtl4a" #define RTL4_A_HDR_LEN 4 -#define RTL4_A_ETHERTYPE 0x8899 #define RTL4_A_PROTOCOL_SHIFT 12 /* * 0x1 = Realtek Remote Control protocol (RRCP) @@ -54,7 +53,7 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb, /* Set Ethertype */ p = (__be16 *)tag; - *p = htons(RTL4_A_ETHERTYPE); + *p = htons(ETH_P_REALTEK); out = (RTL4_A_PROTOCOL_RTL8366RB << RTL4_A_PROTOCOL_SHIFT); /* The lower bits indicate the port number */ @@ -82,7 +81,7 @@ static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb, tag = dsa_etype_header_pos_rx(skb); p = (__be16 *)tag; etype = ntohs(*p); - if (etype != RTL4_A_ETHERTYPE) { + if (etype != ETH_P_REALTEK) { /* Not custom, just pass through */ netdev_dbg(dev, "non-realtek ethertype 0x%04x\n", etype); return skb;