From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752274AbdLFPvF (ORCPT ); Wed, 6 Dec 2017 10:51:05 -0500 Received: from esa2.dell-outbound.iphmx.com ([68.232.149.220]:51390 "EHLO esa2.dell-outbound.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751463AbdLFPvC (ORCPT ); Wed, 6 Dec 2017 10:51:02 -0500 IronPort-PHdr: =?us-ascii?q?9a23=3A65ZA0BLnBpXcq2VqFNmcpTZWNBhigK39O0sv0rFi?= =?us-ascii?q?tYgfKfnxwZ3uMQTl6Ol3ixeRBMOAuqIC07KempujcFRI2YyGvnEGfc4EfD4+ou?= =?us-ascii?q?JSoTYdBtWYA1bwNv/gYn9yNs1DUFh44yPzahANS47xaFLIv3K98yMZFAnhOgpp?= =?us-ascii?q?POT1HZPZg9iq2+yo9ZDeZwZFiCChbb9uMR67sRjfus4KjIV4N60/0AHJonxGe+?= =?us-ascii?q?RXwWNnO1eelAvi68mz4ZBu7T1et+ou+MBcX6r6eb84TaFDAzQ9L281/szrugLd?= =?us-ascii?q?QgaJ+3ART38ZkhtMAwjC8RH6QpL8uTb0u+ZhxCWXO9D9QKsqUjq+8ahkVB7oiD?= =?us-ascii?q?8GNzEn9mHXltdwh79frB64uhBz35LYbISTOfp7f6PdZsgaRWtHXsZeSidPHJqy?= =?us-ascii?q?ZJYBD+oAI+lYq5TyrEYKoRawGQWgAeXixThUi3L4waE2zv0tHR3b0Ac9G94CrX?= =?us-ascii?q?TZoNDzOawPU+660bPIwC3DYf1IxDnz5ovGfBc6rP2QQb59a9bdxFMzGw/ZiFib?= =?us-ascii?q?tIzrPymS1uQIq2WW8epgVfiui248tgp/rDmvxsAqioLUgY8a1lDE9T94wIYuOd?= =?us-ascii?q?24T1Z7Yd66H5tKrS2VKop2QsQkQ2xzpSk11LkGuZqhcCcWz5QnwgfSZvqaeIaL?= =?us-ascii?q?+hLuTOecLDRiiH57dr+zmQy+/VWgx+DzTMW51FVHojJYntXStX0BzQLf5taaRv?= =?us-ascii?q?dn4EutxzmC2xrR5+xAJ00/iLDVJIQ7wrEqk5oeqUHDHijrl0rolKKWbUAk+vSw?= =?us-ascii?q?6+Tgf7XmuoeQN49qhQH6NaQjgtKwAf8iPQUBRWSU5Pqz1Lnn/UHgR7VKk+E2nb?= =?us-ascii?q?LesJDHI8QUu7C1DxVU0oY76xa/Cjin3M4EknkAKVJJYBOHj473NFHSOP31DPSy?= =?us-ascii?q?j06ynDpl2fzKJKDtD5XCI3TZlLrsfq5x60tGxwoyydBf6YhUCrYEIP/rRkDxtM?= =?us-ascii?q?bYDh4iMwyoxObnENV92Z0EWW6VH6CZMaTSsVmT6+0yPeaMYIsVtCzhJPgi4v7i?= =?us-ascii?q?lWU5lkMFfam1wZsXb2i1HvBnI0WffHrtjc4NEWQUsQokSuzlllmCXCVNZ3a9Qa?= =?us-ascii?q?08/Cs3CIG4AofZQICinriB0D28Hp1MaWBMEkqMHmvwd4WYR/cMbzqfIsl/nTwY?= =?us-ascii?q?SLeuVZEh2AqwtA/11bVnNPDY+i4GupL50th6+enTmQs19TxuAMTOm0+XSGQhtW?= =?us-ascii?q?MSRiR+8KF4pwQpwVeZ0LNkhORYGMYV6/JOVC82OJrYied9DoahCUr6Yt6VRQP+?= =?us-ascii?q?EZ2dCjYrQ4d0noID?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2GmAAAJEShamGKa6ERdHAEBAQQBAQoBA?= =?us-ascii?q?YURGA+OInSOCZkCghUKhTuFVj8YAQEBAQEBAQEBAQIQAQEBAQEICwsGKC+COCS?= =?us-ascii?q?CPzZSgVGFcoQxqnY6iwWFXI80gk8FkxyPYYtkiTUCghSRQwJIiXaLaAIEAgQFA?= =?us-ascii?q?hqBOh+CCDIaI0+BBAiBHYICAV+CEVqJawEBBQ?= X-IPAS-Result: =?us-ascii?q?A2GmAAAJEShamGKa6ERdHAEBAQQBAQoBAYURGA+OInSOCZk?= =?us-ascii?q?CghUKhTuFVj8YAQEBAQEBAQEBAQIQAQEBAQEICwsGKC+COCSCPzZSgVGFcoQxq?= =?us-ascii?q?nY6iwWFXI80gk8FkxyPYYtkiTUCghSRQwJIiXaLaAIEAgQFAhqBOh+CCDIaI0+?= =?us-ascii?q?BBAiBHYICAV+CEVqJawEBBQ?= X-DKIM: OpenDKIM Filter v2.4.3 mailuogwprd54.lss.emc.com vB6FotjC015221 From: Chris Dion Cc: Chris Dion , Jamal Hadi Salim , Cong Wang , Jiri Pirko , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net_sched: use macvlan real dev trans_start in dev_trans_start() Date: Wed, 6 Dec 2017 10:50:28 -0500 Message-Id: <1512575428-16377-1-git-send-email-christopher.dion@dell.com> X-Mailer: git-send-email 1.9.4 X-RSA-Classifications: Source Code, public X-Sentrion-Hostname: mailuogwprd54.lss.emc.com To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Macvlan devices are similar to vlans and do not update their own trans_start. In order for arp monitoring to work for a bond device when the slaves are macvlans, obtain its real device. Signed-off-by: Chris Dion --- net/sched/sch_generic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 3839cbb..cd1b200 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -277,6 +278,8 @@ unsigned long dev_trans_start(struct net_device *dev) if (is_vlan_dev(dev)) dev = vlan_dev_real_dev(dev); + else if (netif_is_macvlan(dev)) + dev = macvlan_dev_real_dev(dev); res = netdev_get_tx_queue(dev, 0)->trans_start; for (i = 1; i < dev->num_tx_queues; i++) { val = netdev_get_tx_queue(dev, i)->trans_start; -- 1.9.4