From patchwork Mon Apr 15 15:36:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 162200 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3069330jan; Mon, 15 Apr 2019 08:33:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqzCSfvHHyB25vinIA0mfPqN+8BBd1cduzbQ1YlkqMWdHZ39tDe9gYWqm4BdHU/xv/aU0s/W X-Received: by 2002:a17:902:e391:: with SMTP id ch17mr77734110plb.196.1555342432752; Mon, 15 Apr 2019 08:33:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555342432; cv=none; d=google.com; s=arc-20160816; b=j/slSxzuL5+StZe0sHiZzSUNZEEwW0xjydGlYtv0yC6k67LalIWWhjnaOV/iqNYcUs ePV9k4qUWHdm0PYa+J8JTcwUw/D1QVyDGuaH3srqrBM8+fT/TpdSXl/BccseVb7ruwzy MQNle9Ce8EVZvMxubzNYJ8sutM6QPXqkcWXadeDeg7ak1v0aTEoPPH8oB09uXzamIVUa rk3J2Lt1L8G7rk6ze+o3ewm0C8v90W50RqmFtx9paNsMb2eoGSk0EDMg8cTYK0X2WWj0 wMYu/6/8HZivy9m4oGBQCHrybWiYV7lsV0aGv2HwTb+VyW0JtqBflN1stON4BqV+gr9v stXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:to :from:dkim-signature; bh=d+Wh0VTJ2VOIWi63QmcKMh7we6eeXuvCOUUqUH5lsoU=; b=RMzJhx5B7MbalslTzVfZKfUidQP5AuUOOi3GlXS8gDqKdiO2Af+1XJOuNbETD8ZvJw 2h1GXFHLTqVXX0u+zYRiQuRoZAWj264QeUjLXdIpzO+nQQunI4XrW3Vjl1ISB7yTkOEk qfFn5+bYgB8Z329VzihNh/S1s98225MBW+nuWLSyCaIO71C1kwyp31fQekWny4ehGoXb y+N0OER3ECEvFWp0r2BYN4XtqF8MXQFIvR82H4gK4hcAM0TV59Rb4EeI7VRsCc0/9b4x iJG4wEs7AYa50avniQunqPIT0mVaaIc4NxYWaPRTvr/y1c7zdu4bN5Q3dN8Psaaj2m7V VJig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=JVRn9nHg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 y15si45381203plp.357.2019.04.15.08.33.52; Mon, 15 Apr 2019 08:33:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=JVRn9nHg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1727817AbfDOPdp (ORCPT + 30 others); Mon, 15 Apr 2019 11:33:45 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:47048 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727213AbfDOPdf (ORCPT ); Mon, 15 Apr 2019 11:33:35 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id x3FFXTEr019982; Mon, 15 Apr 2019 10:33:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1555342410; bh=d+Wh0VTJ2VOIWi63QmcKMh7we6eeXuvCOUUqUH5lsoU=; h=From:To:Subject:Date; b=JVRn9nHgs3cAnHP1wRzpjCIyVUNuhYb+PymPp46zGyPP4z/j5E1Ls60D+WY1uLpED 8dgJB5MD0RHCXiximON98yNbQTSOgxnAN8UY7/jTyzA/UqUg6/E52oU1I8l5kkHil8 uoEe6IMg5DSM6XZduhhZtdShQjhJnNTk1jwJE+l0= Received: from DLEE110.ent.ti.com (dlee110.ent.ti.com [157.170.170.21]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x3FFXToW017046 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 Apr 2019 10:33:29 -0500 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Mon, 15 Apr 2019 10:33:29 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE107.ent.ti.com (157.170.170.37) 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; Mon, 15 Apr 2019 10:33:29 -0500 Received: from uda0868495.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id x3FFXTjV041063; Mon, 15 Apr 2019 10:33:29 -0500 From: Murali Karicheri To: , , , Subject: [net-next PATCH v2 0/3] net: hsr: updates from internal tree Date: Mon, 15 Apr 2019 11:36:00 -0400 Message-ID: <20190415153603.23110-1-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This series picks commit from our internal kernel tree. Patch 1/3 fixes a file name issue introduced in my previous series. History: v2: fixed patch 3/3 by moving stats update to inside hsr_forward_skb() Murali Karicheri (3): net: hsr: fix naming of file and functions net: hsr: fix debugfs path to support multiple interfaces net: hsr: add tx stats for master interface net/hsr/Makefile | 2 +- net/hsr/{hsr_prp_debugfs.c => hsr_debugfs.c} | 43 ++++++++++---------- net/hsr/hsr_device.c | 4 +- net/hsr/hsr_forward.c | 7 ++++ net/hsr/hsr_main.h | 9 ++-- 5 files changed, 36 insertions(+), 29 deletions(-) rename net/hsr/{hsr_prp_debugfs.c => hsr_debugfs.c} (69%) -- 2.17.0